diff options
| author | Ed Merks | 2018-11-20 21:56:51 +0000 |
|---|---|---|
| committer | Ed Merks | 2018-11-20 21:56:51 +0000 |
| commit | 91b343d69dcd0c3520daf492d65d1fdd93742619 (patch) | |
| tree | d295212ad1f5249a45fda6f87c04a022b361be1f | |
| parent | f15d8efa9c69fdaffdc8c440e255928d0b3fb4ff (diff) | |
| download | org.eclipse.emf-91b343d69dcd0c3520daf492d65d1fdd93742619.tar.gz org.eclipse.emf-91b343d69dcd0c3520daf492d65d1fdd93742619.tar.xz org.eclipse.emf-91b343d69dcd0c3520daf492d65d1fdd93742619.zip | |
[531159] Accommodate IPlatformRunnable removal
3 files changed, 3 insertions, 8 deletions
diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jmerge/JMerger.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jmerge/JMerger.java index d195ac70f..269d23ad2 100644 --- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jmerge/JMerger.java +++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jmerge/JMerger.java @@ -29,7 +29,6 @@ import java.util.StringTokenizer; import java.util.regex.Matcher; import java.util.regex.Pattern; -import org.eclipse.core.runtime.IPlatformRunnable; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.jdt.core.JavaCore; @@ -1154,8 +1153,7 @@ public class JMerger * @deprecated */ @Deprecated - public static class PlatformRunnable extends PropertyMerger implements IPlatformRunnable + public static class PlatformRunnable extends PropertyMerger { - // Empty } } diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jmerge/PropertyMerger.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jmerge/PropertyMerger.java index f6542d981..498a882ff 100644 --- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jmerge/PropertyMerger.java +++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/jmerge/PropertyMerger.java @@ -11,9 +11,6 @@ package org.eclipse.emf.codegen.jmerge; -import org.eclipse.core.runtime.IPlatformRunnable; - - /** * This implements the method {@link #run(Object)}, * which is called just like main during headless workbench invocation. @@ -22,7 +19,7 @@ import org.eclipse.core.runtime.IPlatformRunnable; @Deprecated public class PropertyMerger extends org.eclipse.emf.codegen.merge.properties.PropertyMerger { - public static class PlatformRunnable extends PropertyMerger implements IPlatformRunnable + public static class PlatformRunnable extends PropertyMerger { // Empty } diff --git a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/properties/PropertyMerger.java b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/properties/PropertyMerger.java index ceccd0706..d50911d12 100644 --- a/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/properties/PropertyMerger.java +++ b/plugins/org.eclipse.emf.codegen/src/org/eclipse/emf/codegen/merge/properties/PropertyMerger.java @@ -279,7 +279,7 @@ public class PropertyMerger ///////////////////////////////// HEADLESS INVOCATION ///////////////////////////////////// @Deprecated - public static class PlatformRunnable extends PropertyMerger implements org.eclipse.core.runtime.IPlatformRunnable + public static class PlatformRunnable extends PropertyMerger { // Empty } |