Author: remi
Date: 2009-04-15 15:07:15 +0200 (Wed, 15 Apr 2009)
New Revision: 4521
Modified:
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/ConfiguredGadget.py
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/WebGadgetTools.py
Log:
* added methods to get the default name of check and run commands
Modified:
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/ConfiguredGadget.py
===================================================================
---
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/ConfiguredGadget.py
2009-04-15 13:00:58 UTC (rev 4520)
+++
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/ConfiguredGadget.py
2009-04-15 13:07:15 UTC (rev 4521)
@@ -172,7 +172,7 @@
'uuid' : gadgetUuid,
},
'parameters' : parameters,
- 'command' : 'run',
+ 'command' : gadget.getDefaultRunCommandName(),
'originalGadgetUuid' : originalGadgetUuid,
}
return ConfiguredGadget(parent, dictionary, tgfFile, workingPath,
Modified:
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py
===================================================================
---
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py
2009-04-15 13:00:58 UTC (rev 4520)
+++
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/Gadget.py
2009-04-15 13:07:15 UTC (rev 4521)
@@ -118,6 +118,16 @@
for key in dictionary['commands'].keys():
self.__commands.append(GadgetToken(self,
dictionary['commands'][key]))
+ # Define default check and run commands
+ commandNamesList = self.getCommandsName()
+ if "run" in commandNamesList:
+ self.__defaultRunCommandName = "run"
+ else:
+ self.__defaultRunCommandName = self.__commands[0].getName()
+ if "check" in commandNamesList:
+ self.__defaultCheckCommandName = "check"
+ else:
+ self.__defaultCheckCommandName = self.__defaultRunCommandName
# Define interpreter
interpreterClass = GadgetInterpreter
if dictionary['interpreter']['kind'] == 'python':
@@ -224,6 +234,24 @@
return result
#
--------------------------------------------------------------------------
+ # Get the default check command name.
+ #
--------------------------------------------------------------------------
+ def getDefaultCheckCommandName(self):
+ """Get the default check command name.
+ @return: A string.
+ """
+ return self.__defaultCheckCommandName
+
+ #
--------------------------------------------------------------------------
+ # Get the default run command name.
+ #
--------------------------------------------------------------------------
+ def getDefaultRunCommandName(self):
+ """Get the default run command name.
+ @return: A string.
+ """
+ return self.__defaultRunCommandName
+
+ #
--------------------------------------------------------------------------
# Get the parameter objects list.
#
--------------------------------------------------------------------------
def getParameters(self):
Modified:
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/WebGadgetTools.py
===================================================================
---
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/WebGadgetTools.py
2009-04-15 13:00:58 UTC (rev 4520)
+++
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/WebGadgetTools.py
2009-04-15 13:07:15 UTC (rev 4521)
@@ -101,6 +101,8 @@
structure['is_configuration'] = "true"
else:
structure['is_configuration'] = "false"
+ structure['default_run_command'] = gadget.getDefaultRunCommandName()
+ structure['default_check_command'] =
gadget.getDefaultCheckCommandName()
# Add the parameters
structure['parameters'] = {}
gadgetParameters = gadget.getParameters()
------------------------------------------------------------------------------
This SF.net email is sponsored by:
High Quality Requirements in a Collaborative Environment.
Download a free trial of Rational Requirements Composer Now!
http://p.sf.net/sfu/www-ibm-com
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
