[545476] Remove all uses of IPluginDescriptor and IPlatformRunnable

17 files changed, 19 insertions, 49 deletions

diff --git a/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF b/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF
index 2d11d0a3b..b67a05743 100644
--- a/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF
+++ b/examples/org.eclipse.emf.java/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Export-Package: org.eclipse.emf.java,
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)";visibility:=reexport,
  org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen;bundle-version="[2.15.0,3.0.0)"
+ org.eclipse.emf.codegen;bundle-version="[2.16.0,3.0.0)"
 Eclipse-LazyStart: true
 Bundle-ActivationPolicy: lazy
 Automatic-Module-Name: org.eclipse.emf.java
diff --git a/features/org.eclipse.emf.base-feature/feature.xml b/features/org.eclipse.emf.base-feature/feature.xml
index d7f1692cb..86d539198 100644
--- a/features/org.eclipse.emf.base-feature/feature.xml
+++ b/features/org.eclipse.emf.base-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.base"
       label="%featureName"
-      version="2.17.0.qualifier"
+      version="2.18.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.10.0">
diff --git a/features/org.eclipse.emf.base-feature/pom.xml b/features/org.eclipse.emf.base-feature/pom.xml
index 890215ecf..6043ff34d 100644
--- a/features/org.eclipse.emf.base-feature/pom.xml
+++ b/features/org.eclipse.emf.base-feature/pom.xml
@@ -11,7 +11,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.base</artifactId>
-  <version>2.17.0-SNAPSHOT</version>
+  <version>2.18.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.codegen-feature/feature.xml b/features/org.eclipse.emf.codegen-feature/feature.xml
index 9cabb45b9..2b5fb4887 100644
--- a/features/org.eclipse.emf.codegen-feature/feature.xml
+++ b/features/org.eclipse.emf.codegen-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.codegen"
       label="%featureName"
-      version="2.15.0.qualifier"
+      version="2.16.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.10.0">
diff --git a/features/org.eclipse.emf.codegen-feature/pom.xml b/features/org.eclipse.emf.codegen-feature/pom.xml
index 38ad9093a..e777b7ac0 100644
--- a/features/org.eclipse.emf.codegen-feature/pom.xml
+++ b/features/org.eclipse.emf.codegen-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.codegen</artifactId>
-  <version>2.15.0-SNAPSHOT</version>
+  <version>2.16.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
 </project>
diff --git a/features/org.eclipse.emf.common-feature/feature.xml b/features/org.eclipse.emf.common-feature/feature.xml
index 823a45222..32debe149 100644
--- a/features/org.eclipse.emf.common-feature/feature.xml
+++ b/features/org.eclipse.emf.common-feature/feature.xml
@@ -2,7 +2,7 @@
 <feature
       id="org.eclipse.emf.common"
       label="%featureName"
-      version="2.15.0.qualifier"
+      version="2.16.0.qualifier"
       provider-name="%providerName"
       license-feature="org.eclipse.emf.license"
       license-feature-version="2.10.0">
diff --git a/features/org.eclipse.emf.common-feature/pom.xml b/features/org.eclipse.emf.common-feature/pom.xml
index d1035c423..639d6e0d8 100644
--- a/features/org.eclipse.emf.common-feature/pom.xml
+++ b/features/org.eclipse.emf.common-feature/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf.features</groupId>
   <artifactId>org.eclipse.emf.common</artifactId>
-  <version>2.15.0-SNAPSHOT</version>
+  <version>2.16.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
index 4441e6027..2ad28be4d 100644
--- 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.6.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.5.0,4.0.0)",
  org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)";visibility:=reexport,
- org.eclipse.emf.codegen;bundle-version="[2.15.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.codegen;bundle-version="[2.16.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.15.0,3.0.0)",
  org.eclipse.text;bundle-version="[3.5.0,4.0.0)"
 Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/Generator.java b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/Generator.java
index a3dc4809e..98129c12d 100644
--- a/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/Generator.java
+++ b/plugins/org.eclipse.emf.codegen.ecore/src/org/eclipse/emf/codegen/ecore/Generator.java
@@ -112,7 +112,7 @@ public class Generator extends CodeGen
     return PlatformRunnable.run(this, object);
   }
 
-  public static class PlatformRunnable extends Generator implements IApplication, DeprecatedPlatformRunnable
+  public static class PlatformRunnable extends Generator implements IApplication
   {
     public Object start(IApplicationContext context) throws Exception
     {
@@ -1100,9 +1100,3 @@ public class Generator extends CodeGen
     }
   }
 }
-
-@SuppressWarnings("deprecation")
-interface DeprecatedPlatformRunnable extends org.eclipse.core.runtime.IPlatformRunnable
-{
-  // Empty extension to limit the effect of suppressing the deprecation warning.
-}
diff --git a/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF
index 4f440a70c..99f16ed57 100644
--- a/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.codegen/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.codegen; singleton:=true
-Bundle-Version: 2.15.0.qualifier
+Bundle-Version: 2.16.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.codegen.CodeGenPlugin$Implementation
 Bundle-Vendor: %providerName
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.emf.codegen,
  org.eclipse.emf.codegen.merge.properties,
  org.eclipse.emf.codegen.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)",
- org.eclipse.emf.common;bundle-version="[2.15.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.common;bundle-version="[2.16.0,3.0.0)";visibility:=reexport,
  org.eclipse.core.resources;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.jdt.core;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.jdt.launching;bundle-version="[3.5.0,4.0.0)",
diff --git a/plugins/org.eclipse.emf.codegen/pom.xml b/plugins/org.eclipse.emf.codegen/pom.xml
index aff3949b5..c171a1c8d 100644
--- a/plugins/org.eclipse.emf.codegen/pom.xml
+++ b/plugins/org.eclipse.emf.codegen/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.codegen</artifactId>
-  <version>2.15.0-SNAPSHOT</version>
+  <version>2.16.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/CodeGen.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/CodeGen.java
index 8d3613353..463df11a6 100644
--- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/CodeGen.java
+++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/CodeGen.java
@@ -117,7 +117,7 @@ public class CodeGen
     return PlatformRunnable.runHelper(object);
   }
 
-  public static class PlatformRunnable implements IApplication, DeprecatedPlatformRunnable
+  public static class PlatformRunnable implements IApplication
   {
     /**
      * This is called with the command line arguments of a headless workbench invocation.
@@ -241,10 +241,4 @@ public class CodeGen
       }
     }
   }
-}
-
-@SuppressWarnings("deprecation")
-interface DeprecatedPlatformRunnable extends org.eclipse.core.runtime.IPlatformRunnable
-{
-  // Empty extension to limit the effect of suppressing the deprecation warning.
-}
+}
\ No newline at end of file
diff --git a/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF
index 9183c11dc..7659bd4ee 100644
--- a/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.common/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.emf.common;singleton:=true
-Bundle-Version: 2.15.0.qualifier
+Bundle-Version: 2.16.0.qualifier
 Bundle-ClassPath: .
 Bundle-Activator: org.eclipse.emf.common.CommonPlugin$Implementation$Activator
 Bundle-Vendor: %providerName
diff --git a/plugins/org.eclipse.emf.common/pom.xml b/plugins/org.eclipse.emf.common/pom.xml
index ed400d4fd..6aba3b98f 100644
--- a/plugins/org.eclipse.emf.common/pom.xml
+++ b/plugins/org.eclipse.emf.common/pom.xml
@@ -12,7 +12,7 @@
 
   <groupId>org.eclipse.emf</groupId>
   <artifactId>org.eclipse.emf.common</artifactId>
-  <version>2.15.0-SNAPSHOT</version>
+  <version>2.16.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
 </project>
diff --git a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/EMFPlugin.java b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/EMFPlugin.java
index cb6bb9528..a3e71f07b 100644
--- a/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/EMFPlugin.java
+++ b/plugins/org.eclipse.emf.common/src/org/eclipse/emf/common/EMFPlugin.java
@@ -233,18 +233,6 @@ public abstract class EMFPlugin extends DelegatingResourceLocator implements Res
     }
 
     /**
-     * Creates an instance.
-     * @param descriptor the description of the plugin.
-     * @deprecated
-     */
-    @Deprecated
-    public EclipsePlugin(org.eclipse.core.runtime.IPluginDescriptor descriptor)
-    {
-      super(descriptor);
-      helper = new InternalHelper(this);
-    }
-
-    /**
      * Return the plugin ID.
      */
     public String getSymbolicName()
diff --git a/plugins/org.eclipse.emf.edit/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.edit/META-INF/MANIFEST.MF
index f800a4b43..16b6436f8 100644
--- a/plugins/org.eclipse.emf.edit/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.edit/META-INF/MANIFEST.MF
@@ -18,7 +18,7 @@ Export-Package: org.eclipse.emf.edit,
  org.eclipse.emf.edit.tree.provider,
  org.eclipse.emf.edit.tree.util
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)";resolution:=optional;x-installation:=greedy,
- org.eclipse.emf.common;bundle-version="[2.15.0,3.0.0)";visibility:=reexport,
+ org.eclipse.emf.common;bundle-version="[2.16.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore;bundle-version="[2.17.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.change;bundle-version="[2.13.0,3.0.0)";resolution:=optional;visibility:=reexport;x-installation:=greedy
 Import-Package: org.osgi.framework;version="[1.5.0,2.0.0)"
diff --git a/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ModelImporterApplication.java b/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ModelImporterApplication.java
index 2c6f97ab7..f4a69b6b4 100644
--- a/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ModelImporterApplication.java
+++ b/plugins/org.eclipse.emf.importer/src/org/eclipse/emf/importer/ModelImporterApplication.java
@@ -55,7 +55,7 @@ import org.eclipse.equinox.app.IApplicationContext;
 /**
  * @since 2.1.0
  */
-public abstract class ModelImporterApplication implements IApplication, DeprecatedPlatformRunnable
+public abstract class ModelImporterApplication implements IApplication
 {
   protected ModelImporter modelImporter;
 
@@ -690,10 +690,4 @@ public abstract class ModelImporterApplication implements IApplication, Deprecat
       }
     }    
   }
-}
-
-@SuppressWarnings("deprecation")
-interface DeprecatedPlatformRunnable extends org.eclipse.core.runtime.IPlatformRunnable
-{
-  // Empty extension to limit the effect of suppressing the deprecation warning.
-}
+}
\ No newline at end of file