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.ui | |
| 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.ui')
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF | 12 | ||||
| -rw-r--r-- | plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF index c57612c2c0..39c814ca8d 100644 --- a/plugins/org.eclipse.emf.cdo.transfer.ui/META-INF/MANIFEST.MF +++ b/plugins/org.eclipse.emf.cdo.transfer.ui/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.ui;singleton:=true -Bundle-Version: 4.2.200.qualifier +Bundle-Version: 4.2.300.qualifier Bundle-ClassPath: . Bundle-Vendor: %providerName Bundle-Localization: plugin @@ -15,11 +15,11 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)", org.eclipse.emf.cdo.ui.shared;bundle-version="[4.1.0,5.0.0)", org.eclipse.emf.cdo.transfer;bundle-version="[4.2.0,5.0.0)";visibility:=reexport, org.eclipse.emf.cdo.transfer.workspace;bundle-version="[4.2.0,5.0.0)";resolution:=optional -Export-Package: org.eclipse.emf.cdo.transfer.internal.ui;version="4.2.200";x-internal:=true, - org.eclipse.emf.cdo.transfer.internal.ui.bundle;version="4.2.200";x-internal:=true, - org.eclipse.emf.cdo.transfer.spi.ui;version="4.2.200", - org.eclipse.emf.cdo.transfer.ui;version="4.2.200", - org.eclipse.emf.cdo.transfer.ui.swt;version="4.2.200", +Export-Package: org.eclipse.emf.cdo.transfer.internal.ui;version="4.2.300";x-internal:=true, + org.eclipse.emf.cdo.transfer.internal.ui.bundle;version="4.2.300";x-internal:=true, + org.eclipse.emf.cdo.transfer.spi.ui;version="4.2.300", + org.eclipse.emf.cdo.transfer.ui;version="4.2.300", + org.eclipse.emf.cdo.transfer.ui.swt;version="4.2.300", org.eclipse.wb.swt;version="4.2.100";x-internal:=true Bundle-ActivationPolicy: lazy Bundle-Activator: org.eclipse.emf.cdo.transfer.internal.ui.bundle.OM$Activator diff --git a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java index 065bd73117..edeb5ed80d 100644 --- a/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java +++ b/plugins/org.eclipse.emf.cdo.transfer.ui/src/org/eclipse/emf/cdo/transfer/ui/TransferDialog.java @@ -20,7 +20,7 @@ import org.eclipse.net4j.util.ui.UIUtil; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.OperationCanceledException; -import org.eclipse.core.runtime.SubProgressMonitor; +import org.eclipse.net4j.util.om.monitor.SubProgressMonitor; import org.eclipse.jface.dialogs.IDialogConstants; import org.eclipse.jface.dialogs.TitleAreaDialog; import org.eclipse.jface.operation.IRunnableWithProgress; |