Author: remi
Date: 2009-04-21 11:51:01 +0200 (Tue, 21 Apr 2009)
New Revision: 4569
Modified:
softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/ConfiguredGadget.py
Log:
* hidden parameters list is now passed to the gadget configurations
Modified:
softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py
===================================================================
---
softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py
2009-04-21 09:48:41 UTC (rev 4568)
+++
softwares_suite_v3/kysoh/tuxware/server/trunk/resources/01_robot_system/resourceGadgetFramework.py
2009-04-21 09:51:01 UTC (rev 4569)
@@ -317,17 +317,19 @@
return True
return False
- def createConfiguration(self, gadgetUuid, parameters, name):
+ def createConfiguration(self, gadgetUuid, parameters, name,
+ hiddenParameters):
"""Create a configuration of a gadget.
@param gadgetUuid: Gadget uuid.
@param parameters: Parameters.
@param name: Name of the configured gadget.
+ @param hiddenParameters: Hidden parameters list.
@return: The success.
"""
gadget = self.__gadgetsContainer.getGadgetByUuid(gadgetUuid)
if gadget != None:
configuredGadget = ConfiguredGadget.createConfiguredGadget(gadget,
- parameters, name)
+ parameters, name, hiddenParameters)
self.__gadgetsContainer.insertConfiguration(configuredGadget)
return True
else:
@@ -829,6 +831,7 @@
'uuid' : 'string',
'parameters' : 'string',
'name' : 'string',
+ 'hiddenParameters' : 'string'
}
self.minimalUserLevel = TDS_CLIENT_LEVEL_ANONYMOUS
self.exclusiveExecution = False
@@ -846,9 +849,10 @@
param = paramStruct.split("=")
if len(param) == 2:
params[param[0]] = param[1]
+ hiddenParameters = parameters['hiddenParameters'].split("|")
name = parameters['name']
if not resourceGadgetFramework.createConfiguration(uuid, params,
- name):
+ name, hiddenParameters):
contentStruct['root']['result'] = getStrError(E_TDREST_FAILED)
return headersStruct, contentStruct
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-21 09:48:41 UTC (rev 4568)
+++
softwares_suite_v3/kysoh/tuxware/server/trunk/util/applicationserver/gadget/ConfiguredGadget.py
2009-04-21 09:51:01 UTC (rev 4569)
@@ -50,6 +50,8 @@
for key in configuration['parameters'].keys():
if key == parameter.getName():
parameter.setDefaultValue(configuration['parameters'][key])
+ if parameter.getName() in configuration['hiddenParameters']:
+ parameter.setVisible(False)
# Set the gadget description
self.getDescription().setUuid(configuration['description']['uuid'])
self.getDescription().setName(configuration['description']['name'])
@@ -149,11 +151,12 @@
#
--------------------------------------------------------------------------
# Create a configured gadget.
#
--------------------------------------------------------------------------
- def createConfiguredGadget(gadget, parameters, name):
+ def createConfiguredGadget(gadget, parameters, name, hiddenParameters =
[]):
"""Create a configured gadget.
@param gadget: Gadget parent.
@param parameters: Gadget parameters.
@param name: Name of the configured gadget.
+ @param hiddenParameters: Hidden parameters list.
@return: A new ConfiguredGadget object.
"""
parent = gadget.getContainer()
@@ -172,6 +175,7 @@
'uuid' : gadgetUuid,
},
'parameters' : parameters,
+ 'hiddenParameters' : hiddenParameters,
'command' : gadget.getDefaultRunCommandName(),
'originalGadgetUuid' : originalGadgetUuid,
}
@@ -227,6 +231,8 @@
finally:
f.close()
try:
+ if not configuration.has_key('hiddenParameters'):
+ configuration['hiddenParameters'] = []
# Get the original gadget
originalGadgetUuid = configuration['originalGadgetUuid']
gadgetFound = False
------------------------------------------------------------------------------
Stay on top of everything new and different, both inside and
around Java (TM) technology - register by April 22, and save
$200 on the JavaOne (SM) conference, June 2-5, 2009, San Francisco.
300 plus technical and hands-on sessions. Register today.
Use priority code J9JMT32. http://p.sf.net/sfu/p
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
