diff options
| author | Eike Stepper | 2015-09-11 11:20:57 +0000 |
|---|---|---|
| committer | Eike Stepper | 2015-09-11 11:20:57 +0000 |
| commit | fc424c0b899deb1184452177e2476af7f6fbd6c0 (patch) | |
| tree | afa88a0db41ea40315cbc9be87c30f725dc86941 /plugins/org.eclipse.emf.cdo.transfer | |
| parent | f825a7616abd157df6f28baf927c08948488c1f0 (diff) | |
| download | cdo-fc424c0b899deb1184452177e2476af7f6fbd6c0.tar.gz cdo-fc424c0b899deb1184452177e2476af7f6fbd6c0.tar.xz cdo-fc424c0b899deb1184452177e2476af7f6fbd6c0.zip | |
[Releng] Cope with deprecated SubProgressMonitor
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.transfer')
3 files changed, 6 insertions, 6 deletions
diff --git a/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF index 850b9631f8..c004cc4e1c 100644 --- a/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.transfer/META-INF/MANIFEST.MF @@ -2,7 +2,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: %pluginName Bundle-SymbolicName: org.eclipse.emf.cdo.transfer;singleton:=true -Bundle-Version: 4.2.200.qualifier +Bundle-Version: 4.2.300.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -11,8 +11,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.net4j.util;bundle-version="[3.0.0,4.0.0)";visibility:=reexport, org.eclipse.emf.ecore;bundle-version="[2.5.0,3.0.0)";visibility:=reexport, org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)" -Export-Package: org.eclipse.emf.cdo.internal.transfer.bundle;version="4.2.200";x-internal:=true, - org.eclipse.emf.cdo.spi.transfer;version="4.2.200", - org.eclipse.emf.cdo.transfer;version="4.2.200" +Export-Package: org.eclipse.emf.cdo.internal.transfer.bundle;version="4.2.300";x-internal:=true, + org.eclipse.emf.cdo.spi.transfer;version="4.2.300", + org.eclipse.emf.cdo.transfer;version="4.2.300" Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.emf.cdo.internal.transfer.bundle.OM$Activator diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java index cd9bb96419..2e01897e87 100644 --- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java +++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransfer.java @@ -36,7 +36,7 @@ import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.NullProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.net4j.util.om.monitor.SubProgressMonitor; import java.io.InputStream; import java.util.Collection; diff --git a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java index 1cf2356dd7..57abc33b9b 100644 --- a/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java +++ b/plugins/org.eclipse.emf.cdo.transfer/src/org/eclipse/emf/cdo/transfer/CDOTransferMappingImpl.java @@ -15,7 +15,7 @@ import org.eclipse.net4j.util.ObjectUtil; import org.eclipse.core.runtime.IPath; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.Path; -import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.net4j.util.om.monitor.SubProgressMonitor; import java.util.ArrayList; import java.util.Arrays; |