Use this.yield to call methods named yield

merks · merks · commit 32a0d98a6cd5 · 2025-10-25T11:46:53.000+02:00
Fixes #89
diff --git a/features/org.eclipse.emf.ecore-feature/feature.xml b/features/org.eclipse.emf.ecore-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.ecore"
       label="%featureName"
-      version="2.41.0.qualifier"
+      version="2.42.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.ecore-feature/pom.xml b/features/org.eclipse.emf.ecore-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.ecore</artifactId>
-  <version>2.41.0-SNAPSHOT</version>
+  <version>2.42.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.gwt-feature/feature.xml b/features/org.eclipse.emf.gwt-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.gwt"
       label="%featureName"
-      version="2.22.0.qualifier"
+      version="2.23.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.gwt-feature/pom.xml b/features/org.eclipse.emf.gwt-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.gwt</artifactId>
-  <version>2.22.0-SNAPSHOT</version>
+  <version>2.23.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.gwt.common-feature/feature.xml b/features/org.eclipse.emf.gwt.common-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.gwt.common"
       label="%featureName"
-      version="2.19.0.qualifier"
+      version="2.20.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.gwt.common-feature/pom.xml b/features/org.eclipse.emf.gwt.common-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.gwt.common</artifactId>
-  <version>2.19.0-SNAPSHOT</version>
+  <version>2.20.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.gwt.ecore-feature/feature.xml b/features/org.eclipse.emf.gwt.ecore-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.gwt.ecore"
       label="%featureName"
-      version="2.20.0.qualifier"
+      version="2.21.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.11.0">
diff --git a/features/org.eclipse.emf.gwt.ecore-feature/pom.xml b/features/org.eclipse.emf.gwt.ecore-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.gwt.ecore</artifactId>
-  <version>2.20.0-SNAPSHOT</version>
+  <version>2.21.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen.ecore/META-INF/MANIFEST.MF
@@ -23,7 +23,7 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)",
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.26.0,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.5.0,4.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.40.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.41.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.codegen;bundle-version="[2.27.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.39.0,3.0.0)",
  org.eclipse.text;bundle-version="[3.5.0,4.0.0)"
diff --git a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/archive/ArchiveURLConnection.java b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/archive/ArchiveURLConnection.java
@@ -299,7 +299,7 @@ else if (entry.equals(zipEntry.getName()))
       throw new IOException("Archive entry not found " + urlString);
     }
 
-    return yield(inputZipEntry, inputStream);
+    return this.yield(inputZipEntry, inputStream);
   }
 
   protected InputStream yield(ZipEntry zipEntry, InputStream inputStream) throws IOException
@@ -571,7 +571,7 @@ public void write(byte[] b, int off, int len) throws IOException
             out.write(b, off, len);
           }
         };
-      return outputZipEntry == null ? result : yield(outputZipEntry, result);
+      return outputZipEntry == null ? result : this.yield(outputZipEntry, result);
     }
     finally
     {
diff --git a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/BasicEMap.java b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/util/BasicEMap.java
@@ -1351,7 +1351,7 @@ public U next()
 
       scan();
       @SuppressWarnings("unchecked") Entry<K, V> result = (Entry<K, V>)BasicEMap.this.entryData[lastCursor].data[lastEntryCursor];
-      return yield(result);
+      return this.yield(result);
     }
 
     /**
diff --git a/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore.xcore/META-INF/MANIFEST.MF
@@ -9,7 +9,7 @@ Bundle-SymbolicName: org.eclipse.emf.ecore.xcore;singleton:=true
 Bundle-Activator: org.eclipse.emf.ecore.xcore.XcorePlugin$Implementation
 Bundle-ActivationPolicy: lazy
 Require-Bundle: org.eclipse.xtext;bundle-version="[2.13.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.ecore;bundle-version="[2.40.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.ecore;bundle-version="[2.41.0,3.0.0)";visibility:=reexport,
  org.eclipse.xtext.util;bundle-version="[2.18.0,3.0.0)",
  org.antlr.runtime;bundle-version="[3.2.0,3.2.1)",
  org.eclipse.xtext.xbase;bundle-version="[2.18.0,3.0.0)";visibility:=reexport,
diff --git a/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.ecore/META-INF/MANIFEST.MF
@@ -2,27 +2,27 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.ecore;singleton:=true
-Bundle-Version: 2.40.0.qualifier
+Bundle-Version: 2.41.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.ecore.plugin.EcorePlugin$Implementation$Activator
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.emf.ecore;version="2.40.0",
- org.eclipse.emf.ecore.impl;version="2.40.0",
- org.eclipse.emf.ecore.plugin;version="2.40.0",
- org.eclipse.emf.ecore.resource;version="2.40.0",
- org.eclipse.emf.ecore.resource.impl;version="2.40.0",
- org.eclipse.emf.ecore.util;version="2.40.0",
- org.eclipse.emf.ecore.xml.namespace;version="2.40.0",
- org.eclipse.emf.ecore.xml.namespace.impl;version="2.40.0",
- org.eclipse.emf.ecore.xml.namespace.util;version="2.40.0",
- org.eclipse.emf.ecore.xml.type;version="2.40.0",
- org.eclipse.emf.ecore.xml.type.impl;version="2.40.0",
- org.eclipse.emf.ecore.xml.type.internal;version="2.40.0",
- org.eclipse.emf.ecore.xml.type.util;version="2.40.0"
+Export-Package: org.eclipse.emf.ecore;version="2.41.0",
+ org.eclipse.emf.ecore.impl;version="2.41.0",
+ org.eclipse.emf.ecore.plugin;version="2.41.0",
+ org.eclipse.emf.ecore.resource;version="2.41.0",
+ org.eclipse.emf.ecore.resource.impl;version="2.41.0",
+ org.eclipse.emf.ecore.util;version="2.41.0",
+ org.eclipse.emf.ecore.xml.namespace;version="2.41.0",
+ org.eclipse.emf.ecore.xml.namespace.impl;version="2.41.0",
+ org.eclipse.emf.ecore.xml.namespace.util;version="2.41.0",
+ org.eclipse.emf.ecore.xml.type;version="2.41.0",
+ org.eclipse.emf.ecore.xml.type.impl;version="2.41.0",
+ org.eclipse.emf.ecore.xml.type.internal;version="2.41.0",
+ org.eclipse.emf.ecore.xml.type.util;version="2.41.0"
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.9.0,4.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.common;bundle-version="[2.43.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.common;bundle-version="[2.44.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.8.0,4.0.0)";resolution:=optional
 Provide-Capability: org.eclipse.emf.ecore.generated_package;uri="http://www.eclipse.org/emf/2002/Ecore";class=org.eclipse.emf.ecore.EcorePackage;genModel="model/Ecore.genmodel",
  org.eclipse.emf.ecore.generated_package;uri="http://www.w3.org/XML/1998/namespace";class=org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;genModel="model/XMLNamespace.genmodel",
diff --git a/plugins/org.eclipse.emf.ecore/pom.xml b/plugins/org.eclipse.emf.ecore/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.ecore</artifactId>
-  <version>2.40.0-SNAPSHOT</version>
+  <version>2.41.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreUtil.java b/plugins/org.eclipse.emf.ecore/src/org/eclipse/emf/ecore/util/EcoreUtil.java
@@ -2163,7 +2163,7 @@ public E next()
     {
       if (hasNext())
       {
-        E result = yield(preparedResult);
+        E result = this.yield(preparedResult);
         preparedResult = null;
         return result;
       }
diff --git a/plugins/org.eclipse.emf.example.installer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.example.installer/META-INF/MANIFEST.MF
@@ -6,5 +6,5 @@ Bundle-Version: 1.14.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Require-Bundle: org.eclipse.emf.common.ui;bundle-version="[2.25.0,3.0.0)",
- org.eclipse.emf.ecore;bundle-version="[2.40.0,3.0.0)"
+ org.eclipse.emf.ecore;bundle-version="[2.41.0,3.0.0)"
 Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.emf.gwt.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.gwt.common/META-INF/MANIFEST.MF
@@ -2,15 +2,15 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.gwt.common;singleton:=true
-Bundle-Version: 2.17.0.qualifier
+Bundle-Version: 2.18.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.emf.common;version="2.17.0",
- org.eclipse.emf.common.command;version="2.17.0",
- org.eclipse.emf.common.notify;version="2.17.0",
- org.eclipse.emf.common.notify.impl;version="2.17.0",
- org.eclipse.emf.common.util;version="2.17.0"
+Export-Package: org.eclipse.emf.common;version="2.18.0",
+ org.eclipse.emf.common.command;version="2.18.0",
+ org.eclipse.emf.common.notify;version="2.18.0",
+ org.eclipse.emf.common.notify.impl;version="2.18.0",
+ org.eclipse.emf.common.util;version="2.18.0"
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.gwt.common
diff --git a/plugins/org.eclipse.emf.gwt.common/pom.xml b/plugins/org.eclipse.emf.gwt.common/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.gwt.common</artifactId>
-  <version>2.17.0-SNAPSHOT</version>
+  <version>2.18.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.gwt.common/src/org/eclipse/emf/common/util/BasicEMap.java b/plugins/org.eclipse.emf.gwt.common/src/org/eclipse/emf/common/util/BasicEMap.java
@@ -1225,7 +1225,7 @@ public U next()
 
       scan();
       @SuppressWarnings("unchecked") Entry<K, V> result = (Entry<K, V>)BasicEMap.this.entryData[lastCursor].data[lastEntryCursor];
-      return yield(result);
+      return this.yield(result);
     }
 
     /**
diff --git a/plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.gwt.ecore/META-INF/MANIFEST.MF
@@ -2,26 +2,26 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.gwt.ecore;singleton:=true
-Bundle-Version: 2.18.0.qualifier
+Bundle-Version: 2.19.0.qualifier
 Bundle-ClassPath: .
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
-Export-Package: org.eclipse.emf.ecore;version="2.18.0",
- org.eclipse.emf.ecore.impl;version="2.18.0",
- org.eclipse.emf.ecore.plugin;version="2.18.0",
- org.eclipse.emf.ecore.resource;version="2.18.0",
- org.eclipse.emf.ecore.resource.impl;version="2.18.0",
- org.eclipse.emf.ecore.util;version="2.18.0",
- org.eclipse.emf.ecore.xml.namespace;version="2.18.0",
- org.eclipse.emf.ecore.xml.namespace.impl;version="2.18.0",
- org.eclipse.emf.ecore.xml.namespace.util;version="2.18.0",
- org.eclipse.emf.ecore.xml.type;version="2.18.0",
- org.eclipse.emf.ecore.xml.type.impl;version="2.18.0",
- org.eclipse.emf.ecore.xml.type.internal;version="2.18.0",
- org.eclipse.emf.ecore.xml.type.util;version="2.18.0",
- org.eclipse.emf.server.ecore.resource;version="2.18.0"
-Require-Bundle: org.eclipse.emf.gwt.common;bundle-version="[2.16.0,3.0.0)";visibility:=reexport
+Export-Package: org.eclipse.emf.ecore;version="2.19.0",
+ org.eclipse.emf.ecore.impl;version="2.19.0",
+ org.eclipse.emf.ecore.plugin;version="2.19.0",
+ org.eclipse.emf.ecore.resource;version="2.19.0",
+ org.eclipse.emf.ecore.resource.impl;version="2.19.0",
+ org.eclipse.emf.ecore.util;version="2.19.0",
+ org.eclipse.emf.ecore.xml.namespace;version="2.19.0",
+ org.eclipse.emf.ecore.xml.namespace.impl;version="2.19.0",
+ org.eclipse.emf.ecore.xml.namespace.util;version="2.19.0",
+ org.eclipse.emf.ecore.xml.type;version="2.19.0",
+ org.eclipse.emf.ecore.xml.type.impl;version="2.19.0",
+ org.eclipse.emf.ecore.xml.type.internal;version="2.19.0",
+ org.eclipse.emf.ecore.xml.type.util;version="2.19.0",
+ org.eclipse.emf.server.ecore.resource;version="2.19.0"
+Require-Bundle: org.eclipse.emf.gwt.common;bundle-version="[2.18.0,3.0.0)";visibility:=reexport
 Eclipse-BuddyPolicy: dependent
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.gwt.ecore
diff --git a/plugins/org.eclipse.emf.gwt.ecore/pom.xml b/plugins/org.eclipse.emf.gwt.ecore/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.gwt.ecore</artifactId>
-  <version>2.18.0-SNAPSHOT</version>
+  <version>2.19.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreUtil.java b/plugins/org.eclipse.emf.gwt.ecore/src/org/eclipse/emf/ecore/util/EcoreUtil.java
@@ -2095,7 +2095,7 @@ public E next()
     {
       if (hasNext())
       {
-        E result = yield(preparedResult);
+        E result = this.yield(preparedResult);
         preparedResult = null;
         return result;
       }
diff --git a/releng/org.eclipse.emf.site/pom.xml b/releng/org.eclipse.emf.site/pom.xml
@@ -22,6 +22,7 @@
         <artifactId>tycho-p2-repository-plugin</artifactId>
         <configuration>
           <xzCompress>false</xzCompress>
+          <skipArchive>true</skipArchive>
           <includeAllDependencies>false</includeAllDependencies>
           <includeAllSources>true</includeAllSources>
         </configuration>

Original file line number	Diff line number	Diff line change
`@@ -299,7 +299,7 @@ else if (entry.equals(zipEntry.getName()))`
`299`	`299`	`throw new IOException("Archive entry not found " + urlString);`
`300`	`300`	`}`
`301`	`301`
`302`		`- return yield(inputZipEntry, inputStream);`
	`302`	`+ return this.yield(inputZipEntry, inputStream);`
`303`	`303`	`}`
`304`	`304`
`305`	`305`	`protected InputStream yield(ZipEntry zipEntry, InputStream inputStream) throws IOException`
`@@ -571,7 +571,7 @@ public void write(byte[] b, int off, int len) throws IOException`
`571`	`571`	`out.write(b, off, len);`
`572`	`572`	`}`
`573`	`573`	`};`
`574`		`- return outputZipEntry == null ? result : yield(outputZipEntry, result);`
	`574`	`+ return outputZipEntry == null ? result : this.yield(outputZipEntry, result);`
`575`	`575`	`}`
`576`	`576`	`finally`
`577`	`577`	`{`