|
@@ -1,47 +1,54 @@
|
|
|
package at.acdp.urweb.web;
|
|
|
-
|
|
|
import at.acdp.urweb.Main;
|
|
|
import at.acdp.urweb.fhpp.Status;
|
|
|
import com.nmote.xr.XRMethod;
|
|
|
-
|
|
|
-import java.util.concurrent.ExecutionException;
|
|
|
+import org.slf4j.Logger;
|
|
|
+import org.slf4j.LoggerFactory;
|
|
|
|
|
|
public class XRServer {
|
|
|
+ private final static Logger logger = LoggerFactory.getLogger(XRServer.class);
|
|
|
|
|
|
@XRMethod(value = "example.helloWorld", help = "Returns 'Helo ' + argument")
|
|
|
public static String hello(Object s) {
|
|
|
return "Hello '" + s + "'";
|
|
|
}
|
|
|
|
|
|
- @XRMethod(value = "ref", help = "ref")
|
|
|
+ @XRMethod(value = "ref2", help = "ref")
|
|
|
public static String ref(String a, String b) {
|
|
|
return "ref";
|
|
|
}
|
|
|
|
|
|
@XRMethod(value = "rel", help = "rel")
|
|
|
public static void rel(String pos) {
|
|
|
+ logger.info("Relative to {} Begin", pos);
|
|
|
System.out.println("rel: "+pos);
|
|
|
- waitMC(true);
|
|
|
Main.fhm.direktAuftrag(Integer.parseInt(pos),0,true);
|
|
|
+ waitMC(true);
|
|
|
Main.fhm.direktAuftrag(Integer.parseInt(pos),1,true);
|
|
|
waitMC(true);
|
|
|
+ logger.info("Relative to {} End", pos);
|
|
|
}
|
|
|
|
|
|
@XRMethod(value = "abs", help = "abs")
|
|
|
public static void abs(String pos) {
|
|
|
- System.out.println("abs: "+pos);
|
|
|
- waitMC(true);
|
|
|
+ logger.info("Absolute to {} Begin", pos);
|
|
|
Main.fhm.direktAuftrag(Integer.parseInt(pos),0, false);
|
|
|
+ waitMC(true);
|
|
|
Main.fhm.direktAuftrag(Integer.parseInt(pos),1, false);
|
|
|
waitMC(true);
|
|
|
+ logger.info("Absolute to {} End", pos);
|
|
|
}
|
|
|
|
|
|
private static void waitMC(boolean what) {
|
|
|
+ logger.info("Waiting for MC");
|
|
|
while(true) {
|
|
|
- Status s=Main.fhm.readStatus().join();
|
|
|
- System.out.println(s.mc);
|
|
|
- if(s.mc==what) break;
|
|
|
+ Status s = Main.fhm.readStatus().join();
|
|
|
+ if (s.mc == what) break;
|
|
|
}
|
|
|
+ logger.info("Got MC");
|
|
|
+ }
|
|
|
+
|
|
|
+ private static void checkPos(int pos) {
|
|
|
|
|
|
}
|
|
|
|
|
@@ -55,19 +62,4 @@ public class XRServer {
|
|
|
return e.toString();
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
- @XRMethod(value = "set_title", help = "Returns 'Helo ' + argument")
|
|
|
- public static String set_title(Object s) {
|
|
|
- return "Hello '" + s + "'";
|
|
|
- }
|
|
|
-
|
|
|
- @XRMethod(value = "get_title", help = "Returns 'Helo ' + argument")
|
|
|
- public static String get_title() {
|
|
|
- return "Hello";
|
|
|
- }
|
|
|
-
|
|
|
- @XRMethod(value = "get_message")
|
|
|
- public static String get_message(Object s) {
|
|
|
- return "asdfasdfas";
|
|
|
- }
|
|
|
}
|