diff options
Diffstat (limited to 'sca-cpp/trunk/modules/edit/palettes')
13 files changed, 311 insertions, 127 deletions
diff --git a/sca-cpp/trunk/modules/edit/palettes/control/palette.composite b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite new file mode 100644 index 0000000000..fbc27c0bfe --- /dev/null +++ b/sca-cpp/trunk/modules/edit/palettes/control/palette.composite @@ -0,0 +1,78 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. +--> +<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" + xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" + targetNamespace="http://control" + name="palette"> + + <service name="appstart" promote="appstart"/> + <service name="appstop" promote="appstop"/> + <service name="service" promote="service"/> + <service name="every" promote="every"/> + <service name="geolocation" promote="geolocation"/> + <service name="call" promote="call"/> + + <component name="appstart" t:title="start" t:color="green1"> + <t:implementation.python script="nuvem/appstart.py"/> + <service name="appstart" t:visible="false"> + <t:binding.http uri="appstart"/> + </service> + <reference name="content"/> + </component> + + <component name="appstop" t:title="stop" t:color="green1"> + <t:implementation.python script="nuvem/appstop.py"/> + <service name="appstop" t:visible="false"> + <t:binding.http uri="appstop"/> + </service> + <reference name="content"/> + </component> + + <component name="service" t:title="{compname}" t:color="green1"> + <t:implementation.python script="nuvem/service.py"/> + <service name="service" t:visible="false"/> + <reference name="content"/> + </component> + + <component name="every" t:title="timer" t:color="green1"> + <t:implementation.python script="nuvem/every.py"/> + <service name="every" t:visible="false"> + <t:binding.http uri="every"/> + </service> + <reference name="n"/> + <reference name="content"/> + </component> + + <component name="geolocation" t:title="location" t:color="green1"> + <t:implementation.python script="nuvem/geolocation.py"/> + <service name="geolocation" t:visible="false"> + <t:binding.http uri="geolocation"/> + </service> + <reference name="content"/> + </component> + + <component name="call" t:title="call" t:color="green1"> + <t:implementation.python script="nuvem/call.py"/> + <service name="call"/> + <reference name="name"/> + <reference name="proxy" wiredByImpl="true" t:visible="false"/> + </component> + +</composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite index 2b37912ed4..f9dab736f8 100644 --- a/sca-cpp/trunk/modules/edit/palettes/database/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/database/palette.composite @@ -30,35 +30,35 @@ <service name="put" promote="put"/> <service name="delete" promote="delete"/> - <component name="filedb" t:title="File database" t:color="green1"> + <component name="filedb" t:title="file" t:color="red1"> <t:implementation.python script="nuvem/filedb.py"/> <service name="filedb"/> <reference name="db" target="AppDataFileCache" t:visible="false"/> <property name="host" t:visible="false"/> </component> - <component name="nosqldb" t:title="Indexed database" t:color="green1"> + <component name="nosqldb" t:title="index **" t:color="red1"> <t:implementation.python script="nuvem/nosqldb.py"/> <service name="nosqldb"/> <reference name="db" target="AppDataNoSQLCache" t:visible="false"/> <property name="host" t:visible="false"/> </component> - <component name="sqldb" t:title="SQL database" t:color="green1"> + <component name="sqldb" t:title="sql **" t:color="red1"> <t:implementation.python script="nuvem/sqldb.py"/> <service name="sqldb"/> <reference name="db" target="AppDataSQLCache" t:visible="false"/> <property name="host" t:visible="false"/> </component> - <component name="get" t:title="get" t:color="green1"> + <component name="get" t:title="get" t:color="red1"> <t:implementation.python script="nuvem/get.py"/> <service name="get"/> <reference name="collection"/> <reference name="id"/> </component> - <component name="post" t:title="post" t:color="green1"> + <component name="post" t:title="post" t:color="red1"> <t:implementation.python script="nuvem/post.py"/> <service name="post"/> <reference name="collection"/> @@ -66,7 +66,7 @@ <reference name="value"/> </component> - <component name="put" t:title="put" t:color="green1"> + <component name="put" t:title="put" t:color="red1"> <t:implementation.python script="nuvem/put.py"/> <service name="put"/> <reference name="collection"/> @@ -74,7 +74,7 @@ <reference name="value"/> </component> - <component name="delete" t:title="delete" t:color="green1"> + <component name="delete" t:title="delete" t:color="red1"> <t:implementation.python script="nuvem/delete.py"/> <service name="delete"/> <reference name="collection"/> diff --git a/sca-cpp/trunk/modules/edit/palettes/event/palette.composite b/sca-cpp/trunk/modules/edit/palettes/event/palette.composite deleted file mode 100644 index 51675139aa..0000000000 --- a/sca-cpp/trunk/modules/edit/palettes/event/palette.composite +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. ---> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://event" - name="palette"> - - <service name="page" promote="page"/> - <service name="widget" promote="widget"/> - <service name="every" promote="every"/> - <service name="location" promote="location"/> - - <component name="page" t:title="when page opens" t:color="green1"> - <t:implementation.python script="nuvem/page.py"/> - <service name="page" t:visible="false"> - <t:binding.http uri="page"/> - </service> - <reference name="content"/> - </component> - - <component name="widget" t:title="on {compname} widget" t:color="green1"> - <t:implementation.python script="nuvem/widget.py"/> - <service name="widget" t:visible="false"/> - <reference name="content"/> - </component> - - <component name="every" t:title="every n millisec" t:color="green1"> - <t:implementation.python script="nuvem/every.py"/> - <service name="every" t:visible="false"> - <t:binding.http uri="every"/> - </service> - <reference name="n"/> - <reference name="content"/> - </component> - - <component name="location" t:title="on location change" t:color="green1"> - <t:implementation.python script="nuvem/location.py"/> - <service name="location" t:visible="false"> - <t:binding.http uri="location"/> - </service> - <reference name="content"/> - </component> - -</composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite index fc6ba48a55..317cf338ed 100644 --- a/sca-cpp/trunk/modules/edit/palettes/http/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/http/palette.composite @@ -28,6 +28,7 @@ <service name="param" promote="param"/> <service name="user" promote="user"/> <service name="email" promote="email"/> + <service name="url" promote="url"/> <service name="get" promote="get"/> <service name="post" promote="post"/> <service name="put" promote="put"/> @@ -54,7 +55,7 @@ <component name="param" t:title="?param" t:color="green1"> <t:implementation.python script="nuvem/param.py"/> <service name="param"/> - <reference name="name"/> + <property name="name">x</property> <property name="query" t:visible="false"></property> </component> @@ -70,27 +71,34 @@ <property name="email" t:visible="false"></property> </component> - <component name="get" t:title="http get" t:color="green1"> + <component name="url" t:title="url" t:color="green1"> + <t:implementation.python script="nuvem/url.py"/> + <service name="url"/> + <reference name="address"/> + <reference name="args"/> + </component> + + <component name="get" t:title="get" t:color="green1"> <implementation.cpp path="lib/http" library="libhttpget"/> <service name="get"/> <reference name="url"/> </component> - <component name="post" t:title="http post **" t:color="green1"> + <component name="post" t:title="post **" t:color="green1"> <implementation.cpp path="lib/http" library="libhttppost"/> <service name="post"/> <reference name="url"/> <reference name="content"/> </component> - <component name="put" t:title="http put **" t:color="green1"> + <component name="put" t:title="put **" t:color="green1"> <implementation.cpp path="lib/http" library="libhttpput"/> <service name="put"/> <reference name="url"/> <reference name="content"/> </component> - <component name="delete" t:title="http delete **" t:color="green1"> + <component name="delete" t:title="delete" t:color="green1"> <implementation.cpp path="lib/http" library="libhttpdelete"/> <service name="delete"/> <reference name="url"/> diff --git a/sca-cpp/trunk/modules/edit/palettes/list/palette.composite b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite index 36cde72a17..2272a107c7 100644 --- a/sca-cpp/trunk/modules/edit/palettes/list/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/lists/palette.composite @@ -19,17 +19,23 @@ --> <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://list" + targetNamespace="http://lists" name="palette"> <service name="pair" promote="pair"/> <service name="list" promote="list"/> <service name="first" promote="first"/> <service name="rest" promote="rest"/> + <service name="second" promote="second"/> + <service name="last" promote="last"/> <service name="empty" promote="empty"/> + <service name="insert" promote="insert"/> <service name="append" promote="append"/> <service name="itemnb" promote="itemnb"/> - <service name="find" promote="find"/> + <service name="lookup" promote="lookup"/> + <service name="search" promote="search"/> + <service name="names" promote="names"/> + <service name="values" promote="values"/> <service name="range" promote="range"/> <component name="pair" t:title="pair" t:color="yellow1"> @@ -45,42 +51,80 @@ <reference name="item" t:clonable="true"/> </component> - <component name="first" t:title="first item" t:color="yellow1"> + <component name="first" t:title="first" t:color="yellow1"> <t:implementation.python script="nuvem/first.py"/> <service name="first"/> <reference name="list"/> </component> - <component name="rest" t:title="rest of list" t:color="yellow1"> + <component name="rest" t:title="rest" t:color="yellow1"> <t:implementation.python script="nuvem/rest.py"/> <service name="rest"/> <reference name="list"/> </component> - <component name="empty" t:title="empty list" t:color="yellow1"> + <component name="second" t:title="second" t:color="yellow1"> + <t:implementation.python script="nuvem/second.py"/> + <service name="second"/> + <reference name="list"/> + </component> + + <component name="last" t:title="last" t:color="yellow1"> + <t:implementation.python script="nuvem/last.py"/> + <service name="last"/> + <reference name="list"/> + </component> + + <component name="empty" t:title="empty" t:color="yellow1"> <t:implementation.python script="nuvem/empty.py"/> <service name="empty"/> </component> - <component name="append" t:title="append" t:color="yellow1"> + <component name="insert" t:title="insert" t:color="yellow1"> + <t:implementation.python script="nuvem/insert.py"/> + <service name="insert"/> + <reference name="value"/> + <reference name="list"/> + </component> + + <component name="append" t:title="+" t:color="yellow1"> <t:implementation.python script="nuvem/append.py"/> <service name="append"/> <reference name="first"/> <reference name="second"/> </component> - <component name="itemnb" t:title="item number" t:color="yellow1"> + <component name="itemnb" t:title="item #" t:color="yellow1"> <t:implementation.python script="nuvem/itemnb.py"/> <service name="itemnb"/> <reference name="index"/> <reference name="list"/> </component> - <component name="find" t:title="find by name" t:color="yellow1"> - <t:implementation.python script="nuvem/find.py"/> - <service name="find"/> + <component name="lookup" t:title="lookup" t:color="yellow1"> + <t:implementation.python script="nuvem/lookup.py"/> + <service name="lookup"/> <reference name="name"/> - <reference name="assoc"/> + <reference name="list"/> + </component> + + <component name="search" t:title="search" t:color="yellow1"> + <t:implementation.python script="nuvem/search.py"/> + <service name="search"/> + <reference name="path"/> + <reference name="list"/> + </component> + + <component name="names" t:title="names" t:color="yellow1"> + <t:implementation.python script="nuvem/names.py"/> + <service name="names"/> + <reference name="list"/> + </component> + + <component name="values" t:title="values" t:color="yellow1"> + <t:implementation.python script="nuvem/values.py"/> + <service name="values"/> + <reference name="list"/> </component> <component name="range" t:title="range" t:color="yellow1"> diff --git a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite index d3c99d74c4..f835d8df03 100644 --- a/sca-cpp/trunk/modules/edit/palettes/math/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/math/palette.composite @@ -27,8 +27,15 @@ <service name="add" promote="add"/> <service name="subtract" promote="subtract"/> <service name="distance" promote="distance"/> + <service name="random" promote="random"/> + <service name="sin" promote="sin"/> + <service name="cos" promote="cos"/> + <service name="round" promote="round"/> + <service name="sum" promote="sum"/> + <service name="min" promote="min"/> + <service name="max" promote="max"/> - <component name="multiply" t:title="multiply" t:color="magenta1"> + <component name="multiply" t:title="*" t:color="magenta1"> <t:implementation.python script="nuvem/multiply.py"/> <service name="multiply"> <documentation>*</documentation> @@ -37,7 +44,7 @@ <reference name="value2"/> </component> - <component name="divide" t:title="divide" t:color="magenta1"> + <component name="divide" t:title="/" t:color="magenta1"> <t:implementation.python script="nuvem/divide.py"/> <service name="divide"> <documentation>/</documentation> @@ -46,7 +53,7 @@ <reference name="value2"/> </component> - <component name="add" t:title="add" t:color="magenta1"> + <component name="add" t:title="+" t:color="magenta1"> <t:implementation.python script="nuvem/add.py"/> <service name="add"> <documentation>+</documentation> @@ -55,7 +62,7 @@ <reference name="value2"/> </component> - <component name="subtract" t:title="subtract" t:color="magenta1"> + <component name="subtract" t:title="-" t:color="magenta1"> <t:implementation.python script="nuvem/subtract.py"/> <service name="subtract"> <documentation>-</documentation> @@ -71,4 +78,46 @@ <reference name="location2"/> </component> + <component name="random" t:title="rand" t:color="magenta1"> + <t:implementation.python script="nuvem/random_.py"/> + <service name="random"/> + </component> + + <component name="sin" t:title="sin" t:color="magenta1"> + <t:implementation.python script="nuvem/sin_.py"/> + <service name="sin"/> + <reference name="x"/> + </component> + + <component name="cos" t:title="cos" t:color="magenta1"> + <t:implementation.python script="nuvem/cos_.py"/> + <service name="cos"/> + <reference name="x"/> + </component> + + <component name="round" t:title="round" t:color="magenta1"> + <t:implementation.python script="nuvem/round_.py"/> + <service name="round"/> + <reference name="n"/> + <reference name="x"/> + </component> + + <component name="sum" t:title="sum" t:color="magenta1"> + <t:implementation.python script="nuvem/sum_.py"/> + <service name="sum"/> + <reference name="l"/> + </component> + + <component name="min" t:title="min" t:color="magenta1"> + <t:implementation.python script="nuvem/min_.py"/> + <service name="min"/> + <reference name="l"/> + </component> + + <component name="max" t:title="max" t:color="magenta1"> + <t:implementation.python script="nuvem/max_.py"/> + <service name="max"/> + <reference name="l"/> + </component> + </composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite index d6b8ebcaaf..2cabac1a26 100644 --- a/sca-cpp/trunk/modules/edit/palettes/python/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/python/palette.composite @@ -25,14 +25,14 @@ <service name="eval" promote="eval"/> <service name="exec" promote="exec"/> - <component name="eval" t:title="py expr" t:color="magenta1"> + <component name="eval" t:title="expr" t:color="magenta1"> <t:implementation.python script="nuvem/eval_.py"/> <service name="eval"/> <reference name="py"/> <reference name="ref"/> </component> - <component name="exec" t:title="py script" t:color="magenta1"> + <component name="exec" t:title="script" t:color="magenta1"> <t:implementation.python script="nuvem/exec_.py"/> <service name="exec"/> <reference name="py"/> diff --git a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite index d6e4a0fa1e..04cc674962 100644 --- a/sca-cpp/trunk/modules/edit/palettes/search/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/search/palette.composite @@ -26,10 +26,11 @@ <service name="yahoosearch" promote="yahoosearch"/> <service name="bingsearch" promote="bingsearch"/> <service name="googlemap" promote="googlemap"/> + <service name="googleimages" promote="googleimages"/> <service name="weather" promote="weather"/> <service name="traffic" promote="traffic"/> - <component name="googlesearch" t:title="google search" t:color="red1"> + <component name="googlesearch" t:title="google" t:color="red1"> <t:implementation.python script="nuvem/gsearch.py"/> <service name="googlesearch"/> <reference name="query"/> @@ -38,16 +39,22 @@ </reference> </component> - <component name="yahoosearch" t:title="yahoo search **" t:color="red1"> - <t:implementation.python script="nuvem/yahoosearch.py"/> + <component name="yahoosearch" t:title="yahoo" t:color="red1"> + <t:implementation.python script="nuvem/ysearch.py"/> <service name="yahoosearch"/> <reference name="query"/> + <reference name="s" t:visible="false"> + <t:binding.http uri="http://search.yahooapis.com/WebSearchService/V1/webSearch"/> + </reference> </component> - <component name="bingsearch" t:title="bing search **" t:color="red1"> - <t:implementation.python script="nuvem/bingsearch.py"/> + <component name="bingsearch" t:title="bing" t:color="red1"> + <t:implementation.python script="nuvem/bsearch.py"/> <service name="bingsearch"/> <reference name="query"/> + <reference name="s" t:visible="false"> + <t:binding.http uri="http://www.bing.com/search"/> + </reference> </component> <component name="googlemap" t:title="google map" t:color="red1"> @@ -59,6 +66,15 @@ </reference> </component> + <component name="googleimages" t:title="google images" t:color="red1"> + <t:implementation.python script="nuvem/gimages.py"/> + <service name="googleimages"/> + <reference name="query"/> + <reference name="s" t:visible="false"> + <t:binding.http uri="https://ajax.googleapis.com/ajax/services/search/images"/> + </reference> + </component> + <component name="weather" t:title="weather" t:color="red1"> <t:implementation.python script="nuvem/gweather.py"/> <service name="weather"/> diff --git a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite index fdd174afb0..fea8fba4e1 100644 --- a/sca-cpp/trunk/modules/edit/palettes/social/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/social/palette.composite @@ -30,6 +30,9 @@ <service name="twfriends" promote="twfriends"/> <service name="twfollowers" promote="twfollowers"/> <service name="twtimeline" promote="twtimeline"/> + <service name="bzprofile" promote="bzprofile"/> + <service name="picalbum" promote="picalbum"/> + <service name="flkalbum" promote="flkalbum"/> <component name="fbprofile" t:title="facebook profile" t:color="blue1"> <t:implementation.python script="nuvem/fbprofile.py"/> @@ -103,4 +106,31 @@ </reference> </component> + <component name="bzprofile" t:title="buzz profile" t:color="blue1"> + <t:implementation.python script="nuvem/bzprofile.py"/> + <service name="bzprofile"/> + <reference name="id"/> + <reference name="bz" t:visible="false"> + <t:binding.http uri="https://www.googleapis.com/buzz/v1/people"/> + </reference> + </component> + + <component name="picalbum" t:title="picasa album" t:color="blue1"> + <t:implementation.python script="nuvem/picalbum.py"/> + <service name="picalbum"/> + <reference name="id"/> + <reference name="pic" t:visible="false"> + <t:binding.http uri="https://picasaweb.google.com/data/feed/api/user"/> + </reference> + </component> + + <component name="flkalbum" t:title="flicker album" t:color="blue1"> + <t:implementation.python script="nuvem/flkalbum.py"/> + <service name="flkalbum"/> + <reference name="id"/> + <reference name="flk" t:visible="false"> + <t:binding.http uri="http://api.flickr.com/services/feeds/photos_public.gne"/> + </reference> + </component> + </composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite index ad65ffdc1d..050316acb1 100644 --- a/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/talk/palette.composite @@ -22,37 +22,40 @@ targetNamespace="http://talk" name="palette"> - <service name="call" promote="call"/> - <service name="smssend" promote="smssend"/> - <service name="gtalksend" promote="gtalksend"/> - <service name="gtalkreceive" promote="gtalkreceive"/> + <service name="voicecall" promote="voicecall"/> + <service name="sendsms" promote="sendsms"/> + <service name="sendgtalk" promote="sendgtalk"/> + <service name="sendemail" promote="sendemail"/> - <component name="call" t:title="place call **" t:color="blue1"> - <t:implementation.python script="nuvem/call.py"/> - <service name="call"/> + <component name="voicecall" t:title="voice **" t:color="blue1"> + <t:implementation.python script="nuvem/voicecall.py"/> + <service name="voicecall"/> <reference name="to"/> </component> - <component name="smssend" t:title="send sms **" t:color="blue1"> - <t:implementation.python script="nuvem/smssend.py"/> - <service name="smssend"/> + <component name="sendsms" t:title="sms **" t:color="blue1"> + <t:implementation.python script="nuvem/sendsms.py"/> + <service name="sendsms"/> <reference name="user"/> <reference name="to"/> <reference name="msg"/> </component> - <component name="gtalksend" t:title="send gtalk **" t:color="blue1"> - <t:implementation.python script="nuvem/gtalksend.py"/> - <service name="gtalksend"/> + <component name="sendgtalk" t:title="gtalk" t:color="blue1"> + <implementation.cpp path="lib/chat" library="libchat-sender2"/> + <service name="sendgtalk"/> <reference name="jid"/> + <reference name="pass"/> <reference name="to"/> <reference name="msg"/> </component> - <component name="gtalkreceive" t:title="gtalk received **" t:color="blue1"> - <t:implementation.python script="nuvem/gtalkreceive.py"/> - <service name="gtalkreceive"/> - <reference name="jid"/> + <component name="sendemail" t:title="email **" t:color="blue1"> + <t:implementation.python script="nuvem/sendemail.py"/> + <service name="sendemail"/> + <reference name="from"/> + <reference name="to"/> + <reference name="msg"/> </component> </composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite index bef3a84a1b..a8844b172e 100644 --- a/sca-cpp/trunk/modules/edit/palettes/text/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/text/palette.composite @@ -60,13 +60,13 @@ <reference name="string"/> </component> - <component name="lowercase" t:title="lowercase" t:color="magenta1"> + <component name="lowercase" t:title="lower" t:color="magenta1"> <t:implementation.python script="nuvem/lowercase.py"/> <service name="lowercase"/> <reference name="string"/> </component> - <component name="uppercase" t:title="uppercase" t:color="magenta1"> + <component name="uppercase" t:title="upper" t:color="magenta1"> <t:implementation.python script="nuvem/uppercase.py"/> <service name="uppercase"/> <reference name="string"/> diff --git a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite index 24db398347..a762a46b2a 100644 --- a/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/transform/palette.composite @@ -26,6 +26,7 @@ <service name="filter" promote="filter"/> <service name="reduce" promote="reduce"/> <service name="reverse" promote="reverse"/> + <service name="shuffle" promote="shuffle"/> <component name="foreach" t:title="foreach" t:color="yellow1"> <t:implementation.python script="nuvem/map_.py"/> @@ -49,6 +50,7 @@ <reference name="item"/> <reference name="accum"/> <reference name="transform"/> + <reference name="init"/> <reference name="list"/> </component> @@ -58,4 +60,10 @@ <reference name="list"/> </component> + <component name="shuffle" t:title="shuffle" t:color="yellow1"> + <t:implementation.python script="nuvem/shuffle_.py"/> + <service name="shuffle"/> + <reference name="list"/> + </component> + </composite> diff --git a/sca-cpp/trunk/modules/edit/palettes/value/palette.composite b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite index 1cd9022493..75c4bca5bb 100644 --- a/sca-cpp/trunk/modules/edit/palettes/value/palette.composite +++ b/sca-cpp/trunk/modules/edit/palettes/values/palette.composite @@ -19,47 +19,50 @@ --> <composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://value" + targetNamespace="http://values" name="palette"> + <service name="property" promote="property"/> <service name="text" promote="text"/> <service name="number" promote="number"/> <service name="name" promote="name"/> <service name="valueof" promote="valueof"/> - <service name="nothing" promote="nothing"/> <service name="true" promote="true"/> <service name="false" promote="false"/> + <service name="nothing" promote="nothing"/> <service name="now" promote="now"/> - <component name="text" t:title="text" t:color="orange1"> + <component name="property" t:title="{propval} :" t:color="orange1"> + <t:implementation.python script="nuvem/assoc.py"/> + <service name="property"/> + <reference name="value"/> + <property name="property">name</property> + </component> + + <component name="text" t:title=" '{propval}'" t:color="orange1"> <t:implementation.python script="nuvem/text.py"/> <service name="text"/> - <property name="property">abc</property> + <property name="property">text</property> </component> - <component name="number" t:title="number" t:color="orange1"> + <component name="number" t:title="#" t:color="orange1"> <t:implementation.python script="nuvem/number.py"/> <service name="number"/> - <property name="property">0</property> + <property name="property">123</property> </component> - <component name="name" t:title="name" t:color="orange1"> + <component name="name" t:title="" t:color="orange1"> <t:implementation.python script="nuvem/name.py"/> <service name="name"/> <property name="property">name</property> </component> - <component name="valueof" t:title="value of" t:color="orange1"> + <component name="valueof" t:title="valueof" t:color="orange1"> <t:implementation.python script="nuvem/valueof.py"/> <service name="valueof"/> <property name="name">name</property> </component> - <component name="nothing" t:title="nothing" t:color="orange1"> - <t:implementation.python script="nuvem/nothing.py"/> - <service name="nothing"/> - </component> - <component name="true" t:title="true" t:color="orange1"> <t:implementation.python script="nuvem/true_.py"/> <service name="true"/> @@ -70,9 +73,15 @@ <service name="false"/> </component> + <component name="nothing" t:title="nothing" t:color="orange1"> + <t:implementation.python script="nuvem/nothing.py"/> + <service name="nothing"/> + </component> + <component name="now" t:title="now" t:color="orange1"> <t:implementation.python script="nuvem/now.py"/> <service name="now"/> + <reference name="format"/> </component> </composite> |