Author: remi
Date: 2009-04-10 16:57:28 +0200 (Fri, 10 Apr 2009)
New Revision: 4489
Modified:
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/pom.xml
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/gadget.xml
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/WeatherGadget.java
Log:
* adapted the gadget to perfectly run in the python framework.
* fixed name to "run"
* bumped to 1.2
Modified:
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/pom.xml
===================================================================
---
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/pom.xml
2009-04-10 14:50:31 UTC (rev 4488)
+++
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/pom.xml
2009-04-10 14:57:28 UTC (rev 4489)
@@ -4,7 +4,7 @@
<groupId>com.kysoh</groupId>
<artifactId>tuxdroid-gadget-weather</artifactId>
<packaging>jar</packaging>
- <version>1.1</version>
+ <version>1.2</version>
<name>Weather forecast gadget for Tux Droid</name>
<url>http://www.tuxisalive.com</url>
@@ -13,7 +13,7 @@
<dependency>
<groupId>com.kysoh</groupId>
<artifactId>tuxdroid-gadget-java-kit</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</dependency>
<dependency>
<groupId>net.karmaLab</groupId>
@@ -84,10 +84,14 @@
<copy
file="${project.build.directory}/${project.artifactId}-${project.version}.jar"
todir="./libraries" />
<zip destfile="./${project.artifactId}.tgf">
- <zipfileset dir="." includes="resources/*"
/>
- <zipfileset dir="." includes="libraries/*"
/>
- <zipfileset dir="."
includes="executables/*" />
- </zip>
+ <zipfileset dir="." includes="resources/*" />
+ <zipfileset dir="." includes="libraries/*" >
+ <exclude name="libraries/tuxdroid-gadget-java-kit*" />
+ <exclude name="libraries/karmalab-commons*" />
+ <exclude name="libraries/tuxdroid-java-api*" />
+ </zipfileset>
+ <zipfileset dir="." includes="executables/*" />
+ </zip>
</tasks>
</configuration>
<goals>
Modified:
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/gadget.xml
===================================================================
---
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/gadget.xml
2009-04-10 14:50:31 UTC (rev 4488)
+++
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/resources/gadget.xml
2009-04-10 14:57:28 UTC (rev 4489)
@@ -8,7 +8,7 @@
<name>Weather Gadget</name>
<description>Google Weather Gadget</description>
<author>Yoran Brault</author>
- <version>1.1</version>
+ <version>1.2</version>
<iconFile>resources/gadget.png</iconFile>
<executionMode>service</executionMode>
<uuid>f63af23e-7ae0-4389-b89b-bc5a8185b0b8</uuid>
@@ -39,7 +39,7 @@
</parameters>
<commands>
<command
- name="check"
+ name="run"
description="Check the weather" />
</commands>
</gadget>
Modified:
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/WeatherGadget.java
===================================================================
---
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/WeatherGadget.java
2009-04-10 14:50:31 UTC (rev 4488)
+++
softwares_suite_v3/community/gadget/tuxdroid-gadget-weather/trunk/tuxdroid-gadget-weather/sources/net/karmaLab/tuxDroid/gadgets/WeatherGadget.java
2009-04-10 14:57:28 UTC (rev 4489)
@@ -50,7 +50,7 @@
/**
* get googleURL property value.
- *
+ *
* @return googleURL value
*/
public String getGoogleURL() {
@@ -59,7 +59,7 @@
/**
* set googleURL property value.
- *
+ *
* @param googleURL
* new value
*/
@@ -163,7 +163,7 @@
} catch (Exception e) {
throw new SimpleGadgetException(e);
}
-
+
try {
Element current = xmlReply.getElementAt(1);
String weather = getData(current, "condition");
@@ -178,12 +178,12 @@
throwMessage("Current weather at {0} is \"{1}\"
with a temperature of {2} degrees {3}; Humidity level is {4} percent.",
configuration().getLocation(), weather, temperature, configuration().getUnit()
== Unit.celsius ? "celsius" : "fahrenheit",
humidity);
}
-
+
if (configuration().isTomorrow()) {
String temperatureHigh;
current = xmlReply.getElementAt(3);
weather = getData(current, "condition");
-
+
/*
* There is an annoying difference between
google FR and EN. EN :
* Temperatures on the forecast are in
Fahrenheit FR : Temperatures
@@ -201,7 +201,7 @@
temperature = getData(current, "low");
temperatureHigh = getData(current,
"high");
}
-
+
throwMessage("Tomorrow's forecast. \"{0}\"
temperatures from {1} to {2} degrees.", weather, temperature, temperatureHigh);
}
outputFile.deleteOnExit();
@@ -223,4 +223,8 @@
float celsiusValue = (float) ((farhenheitValue - 32) / 1.8);
return String.valueOf((int) celsiusValue);
}
+
+ @Override
+ public void onGadgetStop() {
+ }
}
------------------------------------------------------------------------------
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
