diff options
author | Ed Merks | 2019-10-28 09:05:14 +0000 |
---|---|---|
committer | Ed Merks | 2019-10-28 09:05:14 +0000 |
commit | a7ba562016ddb958e4844ac73f8a80f480e7dbd6 (patch) | |
tree | e6150c28df3732463d789d8e72578e3f5fa49e02 | |
parent | e04839bdd528a1be07f7bf5a058991647c4f3bde (diff) | |
download | org.eclipse.emf-a7ba562016ddb958e4844ac73f8a80f480e7dbd6.tar.gz org.eclipse.emf-a7ba562016ddb958e4844ac73f8a80f480e7dbd6.tar.xz org.eclipse.emf-a7ba562016ddb958e4844ac73f8a80f480e7dbd6.zip |
[releng] Eliminate the latest deprecation warnings.R2_20_0
12 files changed, 18 insertions, 16 deletions
diff --git a/doc/org.eclipse.emf.examples.jet.article2/META-INF/MANIFEST.MF b/doc/org.eclipse.emf.examples.jet.article2/META-INF/MANIFEST.MF index 5fbc4294b..32ba041e4 100644 --- a/doc/org.eclipse.emf.examples.jet.article2/META-INF/MANIFEST.MF +++ b/doc/org.eclipse.emf.examples.jet.article2/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.examples.jet.article2; singleton:=true -Bundle-Version: 2.7.0.qualifier +Bundle-Version: 2.8.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.examples.jet.article2.TypesafeEnumPlugin Bundle-Vendor: %providerName @@ -20,8 +20,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.6.0,4.0.0)", org.eclipse.jdt.ui;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.codegen;bundle-version="[2.13.0,3.0.0)";visibility:=reexport, - org.eclipse.emf.common.ui;bundle-version="[2.13.0,3.0.0)" + org.eclipse.emf.codegen;bundle-version="[2.19.0,3.0.0)";visibility:=reexport, + org.eclipse.emf.common.ui;bundle-version="[2.18.0,3.0.0)" Eclipse-LazyStart: true Bundle-ActivationPolicy: lazy Automatic-Module-Name: org.eclipse.emf.examples.jet.article2 diff --git a/doc/org.eclipse.emf.examples.jet.article2/pom.xml b/doc/org.eclipse.emf.examples.jet.article2/pom.xml index 61e0d29f7..34743591a 100644 --- a/doc/org.eclipse.emf.examples.jet.article2/pom.xml +++ b/doc/org.eclipse.emf.examples.jet.article2/pom.xml @@ -12,7 +12,7 @@ <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.examples.jet.article2</artifactId> - <version>2.7.0-SNAPSHOT</version> + <version>2.8.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/doc/org.eclipse.emf.examples.jet.article2/src/org/eclipse/emf/examples/jet/article2/TypesafeEnumPlugin.java b/doc/org.eclipse.emf.examples.jet.article2/src/org/eclipse/emf/examples/jet/article2/TypesafeEnumPlugin.java index 8a8082864..180ff343d 100644 --- a/doc/org.eclipse.emf.examples.jet.article2/src/org/eclipse/emf/examples/jet/article2/TypesafeEnumPlugin.java +++ b/doc/org.eclipse.emf.examples.jet.article2/src/org/eclipse/emf/examples/jet/article2/TypesafeEnumPlugin.java @@ -10,6 +10,7 @@ import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.IWorkbenchWindow; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; import org.eclipse.emf.common.util.BasicDiagnostic; @@ -78,7 +79,7 @@ public class TypesafeEnumPlugin extends AbstractUIPlugin { return null; } - IWorkbench workBench = sPlugin.getWorkbench(); + IWorkbench workBench = PlatformUI.getWorkbench(); if (workBench == null) { return null; diff --git a/examples/org.eclipse.emf.examples-feature/feature.xml b/examples/org.eclipse.emf.examples-feature/feature.xml index 166a7bdac..c879aa8cf 100644 --- a/examples/org.eclipse.emf.examples-feature/feature.xml +++ b/examples/org.eclipse.emf.examples-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.emf.examples" label="%featureName" - version="2.16.0.qualifier" + version="2.17.0.qualifier" provider-name="%providerName" license-feature="org.eclipse.emf.license" license-feature-version="2.11.0"> diff --git a/examples/org.eclipse.emf.examples-feature/pom.xml b/examples/org.eclipse.emf.examples-feature/pom.xml index 55f9b821d..2a775f49b 100644 --- a/examples/org.eclipse.emf.examples-feature/pom.xml +++ b/examples/org.eclipse.emf.examples-feature/pom.xml @@ -12,7 +12,7 @@ <groupId>org.eclipse.emf.features</groupId> <artifactId>org.eclipse.emf.examples</artifactId> - <version>2.16.0-SNAPSHOT</version> + <version>2.17.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/features/org.eclipse.emf.codegen.ui-feature/feature.xml b/features/org.eclipse.emf.codegen.ui-feature/feature.xml index f8c62ab5b..23c3ea0b5 100644 --- a/features/org.eclipse.emf.codegen.ui-feature/feature.xml +++ b/features/org.eclipse.emf.codegen.ui-feature/feature.xml @@ -2,7 +2,7 @@ <feature id="org.eclipse.emf.codegen.ui" 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.codegen.ui-feature/pom.xml b/features/org.eclipse.emf.codegen.ui-feature/pom.xml index 201767847..42ed7aad1 100644 --- a/features/org.eclipse.emf.codegen.ui-feature/pom.xml +++ b/features/org.eclipse.emf.codegen.ui-feature/pom.xml @@ -12,7 +12,7 @@ <groupId>org.eclipse.emf.features</groupId> <artifactId>org.eclipse.emf.codegen.ui</artifactId> - <version>2.19.0-SNAPSHOT</version> + <version>2.20.0-SNAPSHOT</version> <packaging>eclipse-feature</packaging> </project> diff --git a/plugins/org.eclipse.emf.codegen.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.codegen.ui/META-INF/MANIFEST.MF index 1cb0dd301..72fd52d26 100644 --- a/plugins/org.eclipse.emf.codegen.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.codegen.ui/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.codegen.ui; singleton:=true -Bundle-Version: 2.19.0.qualifier +Bundle-Version: 2.20.0.qualifier Bundle-ClassPath: . Bundle-Activator: org.eclipse.emf.codegen.presentation.CodeGenUIPlugin Bundle-Vendor: %providerName diff --git a/plugins/org.eclipse.emf.codegen.ui/pom.xml b/plugins/org.eclipse.emf.codegen.ui/pom.xml index 86e7b2635..7f538496a 100644 --- a/plugins/org.eclipse.emf.codegen.ui/pom.xml +++ b/plugins/org.eclipse.emf.codegen.ui/pom.xml @@ -12,7 +12,7 @@ <groupId>org.eclipse.emf</groupId> <artifactId>org.eclipse.emf.codegen.ui</artifactId> - <version>2.19.0-SNAPSHOT</version> + <version>2.20.0-SNAPSHOT</version> <packaging>eclipse-plugin</packaging> </project> diff --git a/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/action/AddJETNatureAction.java b/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/action/AddJETNatureAction.java index 70a887105..c03d86bf4 100644 --- a/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/action/AddJETNatureAction.java +++ b/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/action/AddJETNatureAction.java @@ -24,7 +24,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IActionDelegate; - +import org.eclipse.ui.PlatformUI; import org.eclipse.emf.codegen.jet.JETAddNatureOperation; import org.eclipse.emf.codegen.presentation.CodeGenUIPlugin; @@ -63,7 +63,7 @@ public class AddJETNatureAction implements IActionDelegate try { ProgressMonitorDialog dialog = - new ProgressMonitorDialog(CodeGenUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell()); + new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); dialog.run(false, true, op); } catch (Exception e) diff --git a/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/action/CompileTemplateAction.java b/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/action/CompileTemplateAction.java index 2d1ce7be6..3b970543f 100644 --- a/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/action/CompileTemplateAction.java +++ b/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/action/CompileTemplateAction.java @@ -23,7 +23,7 @@ import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.ISelection; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.IActionDelegate; - +import org.eclipse.ui.PlatformUI; import org.eclipse.emf.codegen.jet.JETCompileTemplateOperation; import org.eclipse.emf.codegen.jet.JETNature; import org.eclipse.emf.codegen.presentation.CodeGenUIPlugin; @@ -69,7 +69,7 @@ public class CompileTemplateAction implements IActionDelegate try { ProgressMonitorDialog dialog = - new ProgressMonitorDialog(CodeGenUIPlugin.getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell()); + new ProgressMonitorDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell()); dialog.run(false, true, op); } catch (Exception e) diff --git a/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/presentation/CodeGenUIPlugin.java b/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/presentation/CodeGenUIPlugin.java index 8c079b503..bb768d690 100644 --- a/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/presentation/CodeGenUIPlugin.java +++ b/plugins/org.eclipse.emf.codegen.ui/src/org/eclipse/emf/codegen/presentation/CodeGenUIPlugin.java @@ -27,6 +27,7 @@ import org.eclipse.jface.dialogs.IDialogSettings; import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.swt.graphics.Image; import org.eclipse.swt.widgets.Display; +import org.eclipse.ui.PlatformUI; import org.eclipse.ui.plugin.AbstractUIPlugin; @@ -190,7 +191,7 @@ public class CodeGenUIPlugin extends AbstractUIPlugin public static void write(Exception exception) { DiagnosticDialog.open( - getPlugin().getWorkbench().getActiveWorkbenchWindow().getShell(), + PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), getPlugin().getString("_UI_JETProblem_title"), exception instanceof JETException ? getPlugin().getString("_UI_JETCompileProblem_message") : null, BasicDiagnostic.toDiagnostic(exception)); |