Non-sprint task - major refactoring: cleanup of unnecessary and unused cap test message / command indirection.

2 files changed, 11 insertions, 44 deletions

diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java
index a3ed5c2d0..257b03e5e 100644
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java
+++ b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/SwingAUTServer.java
@@ -21,6 +21,7 @@ import java.util.regex.PatternSyntaxException;
 import org.eclipse.jubula.rc.common.AUTServer;
 import org.eclipse.jubula.rc.common.driver.IRobot;
 import org.eclipse.jubula.rc.common.driver.IRobotFactory;
+import org.eclipse.jubula.rc.common.exception.ComponentNotFoundException;
 import org.eclipse.jubula.rc.common.listener.BaseAUTListener;
 import org.eclipse.jubula.rc.swing.driver.RobotFactoryConfig;
 import org.eclipse.jubula.rc.swing.listener.CheckListener;
@@ -29,6 +30,7 @@ import org.eclipse.jubula.rc.swing.listener.FocusTracker;
 import org.eclipse.jubula.rc.swing.listener.MappingListener;
 import org.eclipse.jubula.rc.swing.listener.RecordListener;
 import org.eclipse.jubula.tools.internal.constants.AUTServerExitConstants;
+import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier;
 import org.eclipse.jubula.tools.internal.utils.EnvironmentUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -253,5 +255,12 @@ public class SwingAUTServer extends AUTServer {
         return returnArray;
     }
 
-
-}
+    /**
+     * {@inheritDoc}
+     */
+    public Object findComponent(IComponentIdentifier ci, int timeout) 
+        throws ComponentNotFoundException, IllegalArgumentException {
+        
+        return ComponentHandler.findComponent(ci, true, timeout);
+    }
+}
\ No newline at end of file
diff --git a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/commands/CAPTestCommand.java b/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/commands/CAPTestCommand.java
deleted file mode 100644
index 817333836..000000000
--- a/org.eclipse.jubula.rc.swing/src/org/eclipse/jubula/rc/swing/commands/CAPTestCommand.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2004, 2010 BREDEX GmbH.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *     BREDEX GmbH - initial API and implementation and/or initial documentation
- *******************************************************************************/
-package org.eclipse.jubula.rc.swing.commands;
-
-import org.eclipse.jubula.rc.common.commands.AbstractCapTestCommand;
-import org.eclipse.jubula.rc.common.exception.ComponentNotFoundException;
-import org.eclipse.jubula.rc.swing.listener.ComponentHandler;
-import org.eclipse.jubula.tools.internal.objects.IComponentIdentifier;
-
-
-/**
- * This class gets an message with ICommand action parameter triples. It invokes
- * the implementation class and executes the method. Then it creates a
- * <code>CAPTestResponseMessage</code> and sends it back to the client. The
- * <code>CAPTestResponseMessage</code> contains an error event only if the
- * test step fails, due to a problem prior to or during the execution of the
- * implementation class action method.
- * 
- * @author BREDEX GmbH
- * @created 02.09.2004
- * 
- */
-public class CAPTestCommand extends AbstractCapTestCommand {
-
-    /**
-     * {@inheritDoc}
-     */
-    protected Object findComponent(IComponentIdentifier ci, int timeout) 
-        throws ComponentNotFoundException, IllegalArgumentException {
-        
-        return ComponentHandler.findComponent(ci, true, timeout);
-    }
-    
-} 
\ No newline at end of file