Author: remi
Date: 2009-03-12 23:46:29 +0100 (Thu, 12 Mar 2009)
New Revision: 4037
Modified:
software_suite_v2/libraries/java/bridge-gadget-framework/trunk/src/main/java/com/kysoh/bridge/gadget/framework/GadgetFrameworkBridge.java
Log:
* added the gadget instance uuid in the gadget start returns
* added the gadget instance uuid in the notifications
Modified:
software_suite_v2/libraries/java/bridge-gadget-framework/trunk/src/main/java/com/kysoh/bridge/gadget/framework/GadgetFrameworkBridge.java
===================================================================
---
software_suite_v2/libraries/java/bridge-gadget-framework/trunk/src/main/java/com/kysoh/bridge/gadget/framework/GadgetFrameworkBridge.java
2009-03-12 22:44:51 UTC (rev 4036)
+++
software_suite_v2/libraries/java/bridge-gadget-framework/trunk/src/main/java/com/kysoh/bridge/gadget/framework/GadgetFrameworkBridge.java
2009-03-12 22:46:29 UTC (rev 4037)
@@ -78,8 +78,9 @@
public void errors(GadgetInstance gadgetInstance, String
message)
{
message = message.replace("\n", "|");
- bridge.pushEvent(String.format("GADGET|ERROR|%s|%s",
+ bridge.pushEvent(String.format("GADGET|ERROR|%s|%s|%s",
gadgetInstance.getGadget().getDescription().getUuid(),
+ gadgetInstance.getUuid(),
message));
}
@@ -114,8 +115,9 @@
pitch =
gadgetInstance.getInstanceParameters().get(gadgetParameter);
}
}
-
bridge.pushEvent(String.format("GADGET|NOTIFICATION|%s|%s|%s|%s|%s",
+
bridge.pushEvent(String.format("GADGET|NOTIFICATION|%s|%s|%s|%s|%s|%s",
gadgetInstance.getGadget().getDescription().getUuid(),
+ gadgetInstance.getUuid(),
locutor,
pitch,
name,
@@ -128,8 +130,9 @@
*/
public void starting(GadgetInstance gadgetInstance)
{
- bridge.pushEvent(String.format("GADGET|STARTING|%s",
-
gadgetInstance.getGadget().getDescription().getUuid()));
+ bridge.pushEvent(String.format("GADGET|STARTING|%s|%s",
+
gadgetInstance.getGadget().getDescription().getUuid(),
+ gadgetInstance.getUuid()));
}
/**
@@ -138,8 +141,9 @@
*/
public void stopped(GadgetInstance gadgetInstance)
{
- bridge.pushEvent(String.format("GADGET|STOPPED|%s",
-
gadgetInstance.getGadget().getDescription().getUuid()));
+ bridge.pushEvent(String.format("GADGET|STOPPED|%s|%s",
+
gadgetInstance.getGadget().getDescription().getUuid(),
+ gadgetInstance.getUuid()));
}
/**
@@ -150,8 +154,9 @@
public void trace(GadgetInstance gadgetInstance, String message)
{
message = message.replace("\n", "|");
- bridge.pushEvent(String.format("GADGET|TRACE|%s|%s",
+ bridge.pushEvent(String.format("GADGET|TRACE|%s|%s|%s",
gadgetInstance.getGadget().getDescription().getUuid(),
+ gadgetInstance.getUuid(),
message));
}
}
@@ -376,14 +381,7 @@
{
parameters = new String[0];
}
- if (startGadgetByName(args[0], args[1],
parameters))
- {
- return "SUCCESS";
- }
- else
- {
- return "FAILED";
- }
+ return startGadgetByName(args[0],
args[1], parameters);
}
// SUBCMD : START_BY_UUID
-------------------------------------
// args[0] : Gadget uuid.
@@ -408,14 +406,7 @@
{
parameters = new String[0];
}
- if (startGadgetByUuid(args[0], args[1],
parameters))
- {
- return "SUCCESS";
- }
- else
- {
- return "FAILED";
- }
+ return startGadgetByUuid(args[0],
args[1], parameters);
}
// SUBCMD : STOP_BY_NAME
--------------------------------------
// args[0] : Gadget name.
@@ -502,15 +493,15 @@
* @param gadgetName Gadget name.
* @param command Command name.
* @param parameters Configured parameters.
- * @return The success of the gadget starting.
+ * @return The uuid of the gadget instance or "FAILED".
*/
- private boolean startGadgetByName(String gadgetName, String command,
+ private String startGadgetByName(String gadgetName, String command,
String...parameters)
{
// Container must be deployed
if (!frameworkIsDeployed)
{
- return false;
+ return "FAILED";
}
// Search the requested gadget
for (Gadget gadget : gadgetsContainer.getGadgets())
@@ -520,7 +511,7 @@
return startGadget(gadget, command, parameters);
}
}
- return false;
+ return "FAILED";
}
/**
@@ -549,15 +540,15 @@
* @param gadgetUuid Gadget uuid.
* @param command Command name.
* @param parameters Configured parameters.
- * @return The success of the gadget starting.
+ * @return The uuid of the gadget instance or "FAILED".
*/
- private boolean startGadgetByUuid(String gadgetUuid, String command,
+ private String startGadgetByUuid(String gadgetUuid, String command,
String...parameters)
{
// Container must be deployed
if (!frameworkIsDeployed)
{
- return false;
+ return "FAILED";
}
// Search the requested gadget
for (Gadget gadget : gadgetsContainer.getGadgets())
@@ -567,7 +558,7 @@
return startGadget(gadget, command, parameters);
}
}
- return false;
+ return "FAILED";
}
/**
@@ -596,9 +587,9 @@
* @param gadget Gadget.
* @param command Command name.
* @param parameters Configured parameters.
- * @return The success of the gadget starting.
+ * @return The uuid of the gadget instance or "FAILED".
*/
- private boolean startGadget(Gadget gadget, String command,
String...parameters)
+ private String startGadget(Gadget gadget, String command,
String...parameters)
{
// Search the requested command in the gadget
for (GadgetToken gadgetToken : gadget.getCommands())
@@ -662,10 +653,10 @@
}
}
gadgetInstance.start(gadgetToken,
gadgetInstanceParameters);
- return true;
+ return gadgetInstance.getUuid().toString();
}
}
- return false;
+ return "FAILED";
}
/**
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
