From 385ff7616bec8e6c31e0eaaa0c89d0d9b8146f44 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Sat, 3 Oct 2020 13:28:21 +0300 Subject: Generify getAdapter methods. Change-Id: I3536e7dd29d33d7e0536aa354a901b94bc9e0f63 Signed-off-by: Alexander Kurtakov --- .../org/eclipse/ecf/filetransfer/FileTransferInfo.java | 2 +- .../src/org/eclipse/ecf/core/AbstractContainer.java | 6 +++--- .../ecf/core/AbstractContainerAdapterFactory.java | 6 +++--- .../src/org/eclipse/ecf/core/IContainer.java | 2 +- .../src/org/eclipse/ecf/core/user/User.java | 6 +++--- .../httpclient45/HttpClientRetrieveFileTransfer.java | 4 ++-- .../filetransfer/browse/AbstractFileSystemBrowser.java | 4 ++-- .../provider/filetransfer/browse/LocalRemoteFile.java | 4 ++-- .../browse/MultiProtocolFileSystemBrowserAdapter.java | 4 ++-- .../MultiProtocolFileSystemBrowserAdapterFactory.java | 4 ++-- .../ecf/provider/filetransfer/browse/URLRemoteFile.java | 6 +++--- .../outgoing/MultiProtocolOutgoingAdapter.java | 4 ++-- .../outgoing/MultiProtocolOutgoingAdapterFactory.java | 2 +- .../retrieve/AbstractRetrieveFileTransfer.java | 6 +++--- .../retrieve/MultiProtocolRetrieveAdapter.java | 4 ++-- .../retrieve/MultiProtocolRetrieveAdapterFactory.java | 2 +- .../retrieve/UrlConnectionRetrieveFileTransfer.java | 4 ++-- .../ecf/tests/filetransfer/AbstractBrowseTestCase.java | 2 +- .../ecf/tests/filetransfer/AbstractRetrieveTestCase.java | 2 +- .../ecf/tests/filetransfer/AbstractSendTestCase.java | 2 +- .../ecf/tests/filetransfer/FileIDFactoryTest.java | 4 ++-- .../filetransfer/RemoteFileSystemBrowserFactory.java | 2 +- .../ecf/tests/filetransfer/SocketEventTestUtil.java | 16 ++++++---------- .../filetransfer/URIProtocolFactoryRetrieveTest.java | 2 +- .../ecf/tests/filetransfer/URLPartialRetrieveTest.java | 2 +- .../tests/filetransfer/URLRetrievePauseResumeTest.java | 2 +- 26 files changed, 50 insertions(+), 54 deletions(-) diff --git a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java index c4fc222b3..c3cc88e73 100644 --- a/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java +++ b/framework/bundles/org.eclipse.ecf.filetransfer/src/org/eclipse/ecf/filetransfer/FileTransferInfo.java @@ -89,7 +89,7 @@ public class FileTransferInfo implements IFileTransferInfo, Serializable { * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return null; } diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java index 7e68f15b4..21e06d2bb 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainer.java @@ -65,17 +65,17 @@ public abstract class AbstractContainer implements IContainer { } } - public Object getAdapter(Class serviceType) { + public T getAdapter(Class serviceType) { if (serviceType == null) return null; if (serviceType.isInstance(this)) { - return this; + return serviceType.cast(this); } ECFPlugin plugin = ECFPlugin.getDefault(); if (plugin == null) return null; IAdapterManager adapterManager = plugin.getAdapterManager(); - return (adapterManager == null) ? null : adapterManager.loadAdapter(this, serviceType.getName()); + return (T) ((adapterManager == null) ? null : adapterManager.loadAdapter(this, serviceType.getName())); } protected String getPasswordFromConnectContext(IConnectContext connectContext) throws ContainerConnectException { diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java index c425a2349..d5b0f86c6 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/AbstractContainerAdapterFactory.java @@ -27,11 +27,11 @@ public abstract class AbstractContainerAdapterFactory implements IAdapterFactory * @see org.eclipse.core.runtime.IAdapterFactory#getAdapter(java.lang.Object, * java.lang.Class) */ - public Object getAdapter(Object adaptableObject, Class adapterType) { + public T getAdapter(Object adaptableObject, Class adapterType) { if (adaptableObject == null || adapterType == null) return null; if (IContainer.class.isInstance(adaptableObject)) - return getContainerAdapter((IContainer) adaptableObject, adapterType); + return adapterType.cast(getContainerAdapter((IContainer) adaptableObject, adapterType)); return null; } @@ -51,6 +51,6 @@ public abstract class AbstractContainerAdapterFactory implements IAdapterFactory * * @see org.eclipse.core.runtime.IAdapterFactory#getAdapterList() */ - public abstract Class[] getAdapterList(); + public abstract Class[] getAdapterList(); } diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java index d6c146689..5b5618a46 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/IContainer.java @@ -160,7 +160,7 @@ public interface IContainer extends IAdaptable, IIdentifiable { * null if this container does not support the given * service */ - public Object getAdapter(Class serviceType); + public T getAdapter(Class serviceType); /** * Dispose this IContainer instance. The container instance will be made diff --git a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java index a6d82caa3..7330432c7 100644 --- a/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java +++ b/framework/bundles/org.eclipse.ecf/src/org/eclipse/ecf/core/user/User.java @@ -90,14 +90,14 @@ public class User implements IUser { this.nickname = nickname; } - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter.isInstance(this)) { - return this; + return adapter.cast(this); } IAdapterManager adapterManager = ECFPlugin.getDefault().getAdapterManager(); if (adapterManager == null) return null; - return adapterManager.loadAdapter(this, adapter.getName()); + return (T) adapterManager.loadAdapter(this, adapter.getName()); } public String toString() { diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/provider/filetransfer/httpclient45/HttpClientRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/provider/filetransfer/httpclient45/HttpClientRetrieveFileTransfer.java index 446ec2067..ec02d4336 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/provider/filetransfer/httpclient45/HttpClientRetrieveFileTransfer.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer.httpclient45/src/org/eclipse/ecf/provider/filetransfer/httpclient45/HttpClientRetrieveFileTransfer.java @@ -891,11 +891,11 @@ public class HttpClientRetrieveFileTransfer extends AbstractRetrieveFileTransfer * @see org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFileTransfer#getAdapter(java.lang.Class) */ @Override - public Object getAdapter(@SuppressWarnings("rawtypes") Class adapter) { + public T getAdapter(Class adapter) { if (adapter == null) return null; if (adapter.equals(IFileTransferPausable.class) && isHTTP11()) - return this; + return adapter.cast(this); return super.getAdapter(adapter); } diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/AbstractFileSystemBrowser.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/AbstractFileSystemBrowser.java index 600713b52..18fdf70f3 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/AbstractFileSystemBrowser.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/AbstractFileSystemBrowser.java @@ -154,12 +154,12 @@ public abstract class AbstractFileSystemBrowser { protected IRemoteFileSystemRequest createRemoteFileSystemRequest() { return new RemoteFileSystemRequest() { - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter == null) { return null; } if (adapter.isInstance(this)) { - return this; + return adapter.cast(this); } return null; } diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/LocalRemoteFile.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/LocalRemoteFile.java index 706742d6a..7d6423630 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/LocalRemoteFile.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/LocalRemoteFile.java @@ -100,11 +100,11 @@ public class LocalRemoteFile implements IRemoteFile { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { IAdapterManager adapterManager = Activator.getDefault().getAdapterManager(); if (adapterManager == null) return null; - return adapterManager.loadAdapter(this, adapter.getName()); + return (T) adapterManager.loadAdapter(this, adapter.getName()); } public String toString() { diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/MultiProtocolFileSystemBrowserAdapter.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/MultiProtocolFileSystemBrowserAdapter.java index 4274d6096..3cef08611 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/MultiProtocolFileSystemBrowserAdapter.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/MultiProtocolFileSystemBrowserAdapter.java @@ -100,13 +100,13 @@ public class MultiProtocolFileSystemBrowserAdapter implements IRemoteFileSystemB /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter == null) return null; final IAdapterManager adapterManager = Activator.getDefault().getAdapterManager(); if (adapterManager == null) return null; - return adapterManager.loadAdapter(this, adapter.getName()); + return (T) adapterManager.loadAdapter(this, adapter.getName()); } } diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/MultiProtocolFileSystemBrowserAdapterFactory.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/MultiProtocolFileSystemBrowserAdapterFactory.java index d758d33ee..50a6da5ac 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/MultiProtocolFileSystemBrowserAdapterFactory.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/MultiProtocolFileSystemBrowserAdapterFactory.java @@ -27,8 +27,8 @@ public class MultiProtocolFileSystemBrowserAdapterFactory extends AbstractContai * * @see org.eclipse.ecf.core.sharedobject.AbstractSharedObjectContainerAdapterFactory#getAdapterList() */ - public Class[] getAdapterList() { - return new Class[] {IRemoteFileSystemBrowserContainerAdapter.class}; + public Class[] getAdapterList() { + return new Class[] {IRemoteFileSystemBrowserContainerAdapter.class}; } /* diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/URLRemoteFile.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/URLRemoteFile.java index 5a87b5c94..5059bdea4 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/URLRemoteFile.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/browse/URLRemoteFile.java @@ -108,15 +108,15 @@ public class URLRemoteFile implements IRemoteFile { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter == null) return null; if (adapter.isInstance(this)) - return this; + return adapter.cast(this); IAdapterManager adapterManager = Activator.getDefault().getAdapterManager(); if (adapterManager == null) return null; - return adapterManager.loadAdapter(this, adapter.getName()); + return (T) adapterManager.loadAdapter(this, adapter.getName()); } /* (non-Javadoc) diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapter.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapter.java index 4e3b5402a..0b0effc56 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapter.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapter.java @@ -153,13 +153,13 @@ public class MultiProtocolOutgoingAdapter implements ISendFileTransfer { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter == null) return null; final IAdapterManager adapterManager = Activator.getDefault().getAdapterManager(); if (adapterManager == null) return null; - return adapterManager.loadAdapter(this, adapter.getName()); + return (T) adapterManager.loadAdapter(this, adapter.getName()); } } diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapterFactory.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapterFactory.java index 431365e53..1b49ce176 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapterFactory.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/outgoing/MultiProtocolOutgoingAdapterFactory.java @@ -27,7 +27,7 @@ public class MultiProtocolOutgoingAdapterFactory extends AbstractContainerAdapte * * @see org.eclipse.ecf.core.sharedobject.AbstractSharedObjectContainerAdapterFactory#getAdapterList() */ - public Class[] getAdapterList() { + public Class[] getAdapterList() { return new Class[] {ISendFileTransferContainerAdapter.class}; } diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java index 67af4eb05..fd34c9985 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/AbstractRetrieveFileTransfer.java @@ -546,14 +546,14 @@ public abstract class AbstractRetrieveFileTransfer implements IIncomingFileTrans * * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter == null) return null; if (adapter.isInstance(this)) { - return this; + return adapter.cast(this); } final IAdapterManager adapterManager = Activator.getDefault().getAdapterManager(); - return (adapterManager == null) ? null : adapterManager.loadAdapter(this, adapter.getName()); + return (T) ((adapterManager == null) ? null : adapterManager.loadAdapter(this, adapter.getName())); } /** diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapter.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapter.java index 6b9d3fda6..8bf777f99 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapter.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapter.java @@ -152,13 +152,13 @@ public class MultiProtocolRetrieveAdapter implements IRetrieveFileTransfer { /* (non-Javadoc) * @see org.eclipse.core.runtime.IAdaptable#getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter == null) return null; final IAdapterManager adapterManager = Activator.getDefault().getAdapterManager(); if (adapterManager == null) return null; - return adapterManager.loadAdapter(this, adapter.getName()); + return (T) adapterManager.loadAdapter(this, adapter.getName()); } } diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapterFactory.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapterFactory.java index 54794be6c..fba1a32bc 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapterFactory.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/MultiProtocolRetrieveAdapterFactory.java @@ -27,7 +27,7 @@ public class MultiProtocolRetrieveAdapterFactory extends AbstractContainerAdapte * * @see org.eclipse.ecf.core.sharedobject.AbstractSharedObjectContainerAdapterFactory#getAdapterList() */ - public Class[] getAdapterList() { + public Class[] getAdapterList() { return new Class[] {IRetrieveFileTransferContainerAdapter.class}; } diff --git a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/UrlConnectionRetrieveFileTransfer.java b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/UrlConnectionRetrieveFileTransfer.java index 7ecf0b461..dd5082530 100644 --- a/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/UrlConnectionRetrieveFileTransfer.java +++ b/providers/bundles/org.eclipse.ecf.provider.filetransfer/src/org/eclipse/ecf/provider/filetransfer/retrieve/UrlConnectionRetrieveFileTransfer.java @@ -424,11 +424,11 @@ public class UrlConnectionRetrieveFileTransfer extends AbstractRetrieveFileTrans * org.eclipse.ecf.provider.filetransfer.retrieve.AbstractRetrieveFileTransfer * #getAdapter(java.lang.Class) */ - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { if (adapter == null) return null; if (adapter.equals(IFileTransferPausable.class) && isHTTP11()) - return this; + return adapter.cast(this); return super.getAdapter(adapter); } diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractBrowseTestCase.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractBrowseTestCase.java index fd777445d..1c50c9c89 100755 --- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractBrowseTestCase.java +++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractBrowseTestCase.java @@ -53,7 +53,7 @@ public abstract class AbstractBrowseTestCase extends AbstractFileTransferTestCas protected void setUp() throws Exception { super.setUp(); final IContainer container = ContainerFactory.getDefault().createContainer(); - adapter = (IRemoteFileSystemBrowserContainerAdapter) container.getAdapter(IRemoteFileSystemBrowserContainerAdapter.class); + adapter = container.getAdapter(IRemoteFileSystemBrowserContainerAdapter.class); } /* (non-Javadoc) diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractRetrieveTestCase.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractRetrieveTestCase.java index 4e972ad28..81a459b33 100755 --- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractRetrieveTestCase.java +++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractRetrieveTestCase.java @@ -57,7 +57,7 @@ public abstract class AbstractRetrieveTestCase extends AbstractFileTransferTestC Object lock = new Object(); protected IRetrieveFileTransferContainerAdapter getRetrieveAdapter() throws Exception { - return (IRetrieveFileTransferContainerAdapter) ContainerFactory.getDefault().createContainer().getAdapter(IRetrieveFileTransferContainerAdapter.class); + return ContainerFactory.getDefault().createContainer().getAdapter(IRetrieveFileTransferContainerAdapter.class); } protected IFileID createFileID(URL url) throws Exception { diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractSendTestCase.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractSendTestCase.java index c6045bcde..1d9bc2c40 100755 --- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractSendTestCase.java +++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/AbstractSendTestCase.java @@ -56,7 +56,7 @@ public abstract class AbstractSendTestCase extends TestCase { } protected ISendFileTransferContainerAdapter getSendAdapter() throws Exception { - return (ISendFileTransferContainerAdapter) ContainerFactory.getDefault().createContainer().getAdapter(ISendFileTransferContainerAdapter.class); + return ContainerFactory.getDefault().createContainer().getAdapter(ISendFileTransferContainerAdapter.class); } protected IFileID createFileID(URL url) throws Exception { diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/FileIDFactoryTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/FileIDFactoryTest.java index f77487d8c..1e1ef0ce4 100755 --- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/FileIDFactoryTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/FileIDFactoryTest.java @@ -32,11 +32,11 @@ public class FileIDFactoryTest extends TestCase { protected FileIDFactory factory; protected IRetrieveFileTransferContainerAdapter getRetrieveAdapter() throws Exception { - return (IRetrieveFileTransferContainerAdapter) ContainerFactory.getDefault().createContainer().getAdapter(IRetrieveFileTransferContainerAdapter.class); + return ContainerFactory.getDefault().createContainer().getAdapter(IRetrieveFileTransferContainerAdapter.class); } protected ISendFileTransferContainerAdapter getSendAdapter() throws Exception { - return (ISendFileTransferContainerAdapter) ContainerFactory.getDefault().createContainer().getAdapter(ISendFileTransferContainerAdapter.class); + return ContainerFactory.getDefault().createContainer().getAdapter(ISendFileTransferContainerAdapter.class); } /* (non-Javadoc) diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RemoteFileSystemBrowserFactory.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RemoteFileSystemBrowserFactory.java index d92bd3039..bf294c785 100755 --- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RemoteFileSystemBrowserFactory.java +++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/RemoteFileSystemBrowserFactory.java @@ -31,7 +31,7 @@ public class RemoteFileSystemBrowserFactory implements IRemoteFileSystemBrowserF return fsb.sendBrowseRequest(); } - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return null; } diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/SocketEventTestUtil.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/SocketEventTestUtil.java index 9479d34d6..00b38f203 100644 --- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/SocketEventTestUtil.java +++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/SocketEventTestUtil.java @@ -95,19 +95,16 @@ public class SocketEventTestUtil { } private Object canAdaptTo(ISocketEventSource source) { - IRetrieveFileTransferContainerAdapter receive = (IRetrieveFileTransferContainerAdapter) source + IRetrieveFileTransferContainerAdapter receive = source .getAdapter(IRetrieveFileTransferContainerAdapter.class); if (receive != null) { - canAdaptTo(source, receive, new Class[] { - IRetrieveFileTransfer.class, - IIncomingFileTransfer.class, IFileTransfer.class }); + canAdaptTo(source, receive, + new Class[] { IRetrieveFileTransfer.class, IIncomingFileTransfer.class, IFileTransfer.class }); return receive; } - ISendFileTransferContainerAdapter send = (ISendFileTransferContainerAdapter) source - .getAdapter(ISendFileTransferContainerAdapter.class); + ISendFileTransferContainerAdapter send = source.getAdapter(ISendFileTransferContainerAdapter.class); if (send != null) { - canAdaptTo(source, send, new Class[] { - IIncomingFileTransfer.class, IFileTransfer.class }); + canAdaptTo(source, send, new Class[] { IIncomingFileTransfer.class, IFileTransfer.class }); return send; } fail("Should be adapable to IRetrieveFileTransferContainerAdapter or ISendFileTransferContainerAdapter"); @@ -127,8 +124,7 @@ public class SocketEventTestUtil { public static TrackSocketEvents observeSocketEvents( IFileTransferConnectStartEvent event) { - ISocketEventSource socketSource = (ISocketEventSource) event - .getAdapter(ISocketEventSource.class); + ISocketEventSource socketSource = event.getAdapter(ISocketEventSource.class); return new TrackSocketEvents(socketSource); } diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URIProtocolFactoryRetrieveTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URIProtocolFactoryRetrieveTest.java index 0926d4075..2cb2bd9eb 100644 --- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URIProtocolFactoryRetrieveTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URIProtocolFactoryRetrieveTest.java @@ -121,7 +121,7 @@ public class URIProtocolFactoryRetrieveTest extends AbstractRetrieveTestCase { public void setProxy(Proxy proxy) { } - public Object getAdapter(Class adapter) { + public T getAdapter(Class adapter) { return null; }}; }}; diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLPartialRetrieveTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLPartialRetrieveTest.java index f871e66fb..39e6d5d1c 100755 --- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLPartialRetrieveTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLPartialRetrieveTest.java @@ -105,7 +105,7 @@ public class URLPartialRetrieveTest extends AbstractRetrieveTestCase { try { outs = new FileOutputStream(FILENAME); session = rse.receive(outs); - pausable = (IFileTransferPausable) session.getAdapter(IFileTransferPausable.class); + pausable = session.getAdapter(IFileTransferPausable.class); if (pausable == null) fail("pausable is null"); } catch (final IOException e) { diff --git a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrievePauseResumeTest.java b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrievePauseResumeTest.java index 8b3c61533..24ef7012b 100644 --- a/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrievePauseResumeTest.java +++ b/tests/bundles/org.eclipse.ecf.tests.filetransfer/src/org/eclipse/ecf/tests/filetransfer/URLRetrievePauseResumeTest.java @@ -120,7 +120,7 @@ public class URLRetrievePauseResumeTest extends ContainerAbstractTestCase { incomingFile = new File(FILENAME); outs = new FileOutputStream(incomingFile); session = rse.receive(outs); - pausable = (IFileTransferPausable) session.getAdapter(IFileTransferPausable.class); + pausable = session.getAdapter(IFileTransferPausable.class); assertNotNull("pausable is null", pausable); } catch (IOException e) { fail(e.getLocalizedMessage()); -- cgit v1.2.3