Author: remi
Date: 2008-09-17 15:14:39 +0200 (Wed, 17 Sep 2008)
New Revision: 1875
Modified:
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPIFlippers.java
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPIMouthEyes.java
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPISoundFlash.java
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPISpinning.java
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPITTS.java
Log:
* updated synchronous commands to asynchronous when the client level is ANONYME
Modified:
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPIFlippers.java
===================================================================
---
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPIFlippers.java
2008-09-17 13:14:25 UTC (rev 1874)
+++
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPIFlippers.java
2008-09-17 13:14:39 UTC (rev 1875)
@@ -172,6 +172,10 @@
}
Double timeout = count * 1.0;
Boolean ret = onAsync(count, finalState, speed);
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return ret;
+ }
if (ret)
{
ret = waitMovingOff(timeout);
@@ -249,6 +253,10 @@
{
Double timeout = duration * 2.0;
Boolean ret = onDuringAsync(duration, finalState, speed);
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return ret;
+ }
if (ret)
{
ret = waitMovingOff(timeout);
Modified:
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPIMouthEyes.java
===================================================================
---
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPIMouthEyes.java
2008-09-17 13:14:25 UTC (rev 1874)
+++
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPIMouthEyes.java
2008-09-17 13:14:39 UTC (rev 1875)
@@ -136,6 +136,10 @@
}
Double timeout = count * 1.0;
Boolean ret = onAsync(count, finalState);
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return ret;
+ }
if (ret)
{
ret = waitMovingOff(timeout);
@@ -180,6 +184,10 @@
{
Double timeout = duration * 2.0;
Boolean ret = onDuringAsync(duration, finalState);
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return ret;
+ }
if (ret)
{
ret = waitMovingOff(timeout);
Modified:
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPISoundFlash.java
===================================================================
---
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPISoundFlash.java
2008-09-17 13:14:25 UTC (rev 1874)
+++
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPISoundFlash.java
2008-09-17 13:14:39 UTC (rev 1875)
@@ -78,6 +78,10 @@
{
if (playAsync(track, volume))
{
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return true;
+ }
String trackName = String.format("TRACK_%03d", track);
eventHandlers.waitCondition(TuxAPIConst.ST_NAME_AUDIO_FLASH_PLAY, 0.2,
trackName, null);
Modified:
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPISpinning.java
===================================================================
---
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPISpinning.java
2008-09-17 13:14:25 UTC (rev 1874)
+++
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPISpinning.java
2008-09-17 13:14:39 UTC (rev 1875)
@@ -178,6 +178,10 @@
{
Double timeout = turns * 5.0;
Boolean ret = leftOnAsync(turns, speed);
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return ret;
+ }
if (ret)
{
ret = waitLeftMovingOff(timeout);
@@ -207,6 +211,10 @@
{
Double timeout = turns * 5.0;
Boolean ret = rightOnAsync(turns, speed);
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return ret;
+ }
if (ret)
{
ret = waitRightMovingOff(timeout);
@@ -298,6 +306,10 @@
{
Double timeout = duration * 2.0;
Boolean ret = leftOnDuringAsync(duration, speed);
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return ret;
+ }
if (ret)
{
ret = waitLeftMovingOff(timeout);
@@ -327,6 +339,10 @@
{
Double timeout = duration * 2.0;
Boolean ret = rightOnDuringAsync(duration, speed);
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return ret;
+ }
if (ret)
{
ret = waitRightMovingOff(timeout);
Modified:
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPITTS.java
===================================================================
---
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPITTS.java
2008-09-17 13:14:25 UTC (rev 1874)
+++
software_suite_v2/tuxware/java-api/trunk/src/com/tuxisalive/api/TuxAPITTS.java
2008-09-17 13:14:39 UTC (rev 1875)
@@ -158,6 +158,10 @@
{
return false;
}
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return true;
+ }
// Wait the speak status
ret =
eventHandlers.waitCondition(TuxAPIConst.ST_NAME_SPEAK_STATUS, 5.0,
null, null);
@@ -201,6 +205,10 @@
{
if (speakAsync(text, locutor, pitch))
{
+ if (pParent.server.getClientLevel() ==
TuxAPIConst.CLIENT_LEVEL_ANONYME)
+ {
+ return true;
+ }
eventHandlers.waitCondition(TuxAPIConst.ST_NAME_TTS_SOUND_STATE, 1.0, "ON",
null);
Object result[] =
pParent.status.requestOne(TuxAPIConst.ST_NAME_TTS_SOUND_STATE);
if (result[0].equals("ON"))
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
