Target Explorer: Rework delete handler contributions

2 files changed, 7 insertions, 14 deletions

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/tcf/filesystem/adapters/DeleteHandlerDelegateTest.java b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/tcf/filesystem/adapters/DeleteHandlerDelegateTest.java
index 0c4aa5104..247185454 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/tcf/filesystem/adapters/DeleteHandlerDelegateTest.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/tcf/filesystem/adapters/DeleteHandlerDelegateTest.java
@@ -9,20 +9,18 @@
  *******************************************************************************/

 package org.eclipse.tcf.te.tests.tcf.filesystem.adapters;

 

-import org.eclipse.core.runtime.Platform;

 import org.eclipse.tcf.te.tcf.filesystem.core.interfaces.IConfirmCallback;

-import org.eclipse.tcf.te.tcf.filesystem.ui.internal.adapters.DeleteHandlerDelegate;

+import org.eclipse.tcf.te.tcf.filesystem.ui.internal.handlers.DeleteHandler;

 import org.eclipse.tcf.te.tests.tcf.filesystem.FSPeerTestCase;

-import org.eclipse.tcf.te.ui.views.interfaces.handler.IDeleteHandlerDelegate;

 

 @SuppressWarnings("restriction")

 public class DeleteHandlerDelegateTest extends FSPeerTestCase {

-	private IDeleteHandlerDelegate delegate;

+	private DeleteHandler delegate;

 

     @Override

 	protected void setUp() throws Exception {

 		super.setUp();

-		delegate = (IDeleteHandlerDelegate) Platform.getAdapterManager().getAdapter(test11File, IDeleteHandlerDelegate.class);

+		delegate = new DeleteHandler();

 		assertNotNull(delegate);

 		IConfirmCallback confirmCallback = new IConfirmCallback() {

 			@Override

@@ -36,7 +34,7 @@ public class DeleteHandlerDelegateTest extends FSPeerTestCase {
 				return 0;

 			}

 		};

-		((DeleteHandlerDelegate) delegate).setConfirmCallback(confirmCallback);

+		delegate.setConfirmCallback(confirmCallback);

 	}

 

 	public void testCanDelete() {

diff --git a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/tcf/filesystem/adapters/FSTreeNodeAdapterFactoryTest.java b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/tcf/filesystem/adapters/FSTreeNodeAdapterFactoryTest.java
index 597f35ba4..271add67c 100644
--- a/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/tcf/filesystem/adapters/FSTreeNodeAdapterFactoryTest.java
+++ b/target_explorer/plugins/org.eclipse.tcf.te.tests/src/org/eclipse/tcf/te/tests/tcf/filesystem/adapters/FSTreeNodeAdapterFactoryTest.java
@@ -12,7 +12,6 @@ package org.eclipse.tcf.te.tests.tcf.filesystem.adapters;
 import org.eclipse.core.runtime.Platform;

 import org.eclipse.jface.viewers.ILabelProvider;

 import org.eclipse.tcf.te.tests.tcf.filesystem.FSPeerTestCase;

-import org.eclipse.tcf.te.ui.views.interfaces.handler.IDeleteHandlerDelegate;

 import org.eclipse.tcf.te.ui.views.interfaces.handler.IRefreshHandlerDelegate;

 import org.eclipse.ui.IActionFilter;

 

@@ -21,19 +20,15 @@ public class FSTreeNodeAdapterFactoryTest extends FSPeerTestCase {
 		IActionFilter filter = (IActionFilter) Platform.getAdapterManager().getAdapter(testFile, IActionFilter.class);

 		assertNotNull(filter);

 	}

-	

+

 	public void testLabelProviderAdapter() {

 		ILabelProvider labelProvider = (ILabelProvider) Platform.getAdapterManager().getAdapter(testFile, ILabelProvider.class);

 		assertNotNull(labelProvider);

 	}

-	

+

 	public void testRefreshHandlerDelegateAdapter() {

 		IRefreshHandlerDelegate delegate = (IRefreshHandlerDelegate) Platform.getAdapterManager().getAdapter(testFolder, IRefreshHandlerDelegate.class);

 		assertNotNull(delegate);

 	}

-	

-	public void testDeleteHandlerDelegateAdapter() {

-		IDeleteHandlerDelegate delegate = (IDeleteHandlerDelegate) Platform.getAdapterManager().getAdapter(testFolder, IDeleteHandlerDelegate.class);

-		assertNotNull(delegate);

-	}

+

 }