[releng] Eliminate the latest deprecation warnings.R2_20_0

5 files changed, 8 insertions, 7 deletions

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));