Start introducing the interfaces

git-svn-id: https://svn.argeo.org/slc/trunk@1642 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/AutoUiApplicationJemmy.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/AutoUiApplicationJemmy.java
deleted file mode 100644 (file)
index b9678c5..0000000
--- a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/AutoUiApplicationJemmy.java
+++ /dev/null
@@ -1,29 +0,0 @@
-package org.argeo.slc.jemmytest;
-
-import org.argeo.slc.autoui.AutoUiActivator;
-import org.argeo.slc.autoui.AutoUiApplication;
-import org.netbeans.jemmy.operators.JButtonOperator;
-import org.netbeans.jemmy.operators.JFrameOperator;
-import org.netbeans.jemmy.operators.JLabelOperator;
-
-public class AutoUiApplicationJemmy implements AutoUiApplication {
-       public Object execute(Object object) throws Exception {
-
-               // Find components
-               JFrameOperator jFrameOperator = new JFrameOperator("HelloWorldSwing");
-               JButtonOperator jButtonOperator = new JButtonOperator(jFrameOperator,
-                               "Button");
-               JLabelOperator jLabelOperator = new JLabelOperator(jFrameOperator,
-                               "Hello World");
-
-               // Execute actions
-               jButtonOperator.push();
-
-               // Performs checks
-               String textAfterPush = jLabelOperator.getText();
-               AutoUiActivator.stdOut("textAfterPush=" + textAfterPush);
-
-               return null;
-       }
-
-}

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java
new file mode 100644 (file)
index 0000000..d06661f
--- /dev/null
+++ b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/DummyStep.java
@@ -0,0 +1,33 @@
+package org.argeo.slc.jemmytest;
+
+import org.argeo.slc.autoui.AutoUiActivator;
+import org.argeo.slc.autoui.DetachedContext;
+import org.argeo.slc.autoui.DetachedStep;
+import org.argeo.slc.autoui.DetachedStepAnswer;
+import org.argeo.slc.autoui.DetachedStepRequest;
+import org.netbeans.jemmy.operators.JButtonOperator;
+import org.netbeans.jemmy.operators.JFrameOperator;
+import org.netbeans.jemmy.operators.JLabelOperator;
+
+public class DummyStep implements DetachedStep {
+       public DetachedStepAnswer execute(DetachedContext detachedContext,
+                       DetachedStepRequest detachedStepRequest) {
+
+               // Find components
+               JFrameOperator jFrameOperator = new JFrameOperator("HelloWorldSwing");
+               JButtonOperator jButtonOperator = new JButtonOperator(jFrameOperator,
+                               "Button");
+               JLabelOperator jLabelOperator = new JLabelOperator(jFrameOperator,
+                               "Hello World");
+
+               // Execute actions
+               jButtonOperator.push();
+
+               // Performs checks
+               String textAfterPush = jLabelOperator.getText();
+               AutoUiActivator.stdOut("textAfterPush=" + textAfterPush);
+
+               return null;
+       }
+
+}

diff --git a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java
index 50b782d16add3365adfbbd408b0e03f4683563bb..a67dc5ab2a82e7ebf730addeba8e40c937723697 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java
+++ b/sandbox/argeo.slc.jemmytest/src/main/java/org/argeo/slc/jemmytest/JemmyTestActivator.java
@@ -2,17 +2,15 @@ package org.argeo.slc.jemmytest;
 
 import java.util.Properties;
 
-import org.argeo.slc.autoui.AbstractAutoActivator;
-import org.argeo.slc.autoui.AutoUiApplication;
+import org.argeo.slc.autoui.AbstractDetachedActivator;
+import org.argeo.slc.autoui.DetachedStep;
 import org.osgi.framework.BundleContext;
 
-public class JemmyTestActivator extends AbstractAutoActivator {
+public class JemmyTestActivator extends AbstractDetachedActivator {
        protected void startAutoBundle(BundleContext context) throws Exception {
                Properties properties = new Properties();
-               // AutoUiApplicationJemmy applicationJemmy = new
-               // AutoUiApplicationJemmy();
-               AutoUiApplicationJemmy applicationJemmy = (AutoUiApplicationJemmy) getStaticRef("jemmyTest");
-               context.registerService(AutoUiApplication.class.getName(),
+               DummyStep applicationJemmy = (DummyStep) getStaticRef("jemmyTest");
+               context.registerService(DetachedStep.class.getName(),
                                applicationJemmy, properties);
                stdOut("JemmyTest started");
        }

diff --git a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
index cd06c5edb9a3953a61c2af97a889f9017fed9676..2736fd7c41a9dafb5a327abb158c33603744fa16 100644 (file)
--- a/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
+++ b/sandbox/argeo.slc.jemmytest/src/main/slc/conf/applicationContext.xml
@@ -4,7 +4,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
 
        <bean id="jemmyTest"
-               class="org.argeo.slc.jemmytest.AutoUiApplicationJemmy">
+               class="org.argeo.slc.jemmytest.DummyStep">
        </bean>
 
 </beans>
\ No newline at end of file