Author: Paul_R
Date: 2008-08-28 15:33:40 +0200 (Thu, 28 Aug 2008)
New Revision: 1624
Added:
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/Messages.java
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages.properties
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_en.properties
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_fr.properties
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_nl.properties
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/.classpath
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/gadgets.xml
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/FeedGadget.java
Log:
* Improved functionalities and fix some bugs.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/.classpath
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/.classpath
2008-08-28 09:45:10 UTC (rev 1623)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/.classpath
2008-08-28 13:33:40 UTC (rev 1624)
@@ -1,11 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="sources"/>
- <classpathentry kind="src" path="tests"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/karmalab-commons"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-framework"/>
- <classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
- <classpathentry combineaccessrules="false" kind="src"
path="/tuxdroid-gadget-tester"/>
- <classpathentry kind="output" path="targets/eclipse"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="sources"/>
+ <classpathentry kind="src" path="tests"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con"
path="org.eclipse.jdt.junit.JUNIT_CONTAINER/3"/>
+ <classpathentry kind="lib" path="G:/Projects/tux/Gadget
Ressources/tuxdroid-gadget-framework_fat.jar"/>
+ <classpathentry kind="lib" path="G:/Projects/tux/Gadget
Ressources/tuxdroid-gadget-tester_fat.jar"/>
+ <classpathentry kind="output" path="targets/eclipse"/>
+</classpath>
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/gadgets.xml
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/gadgets.xml
2008-08-28 09:45:10 UTC (rev 1623)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/gadgets.xml
2008-08-28 13:33:40 UTC (rev 1624)
@@ -40,5 +40,9 @@
type="string"
defaultValue="http://artisan.karma-lab.net/rss.xml"; />
</parameters>
+ <commands>
+ <command name="play" description="play"/>
+ <command name="stop" description="stop"/>
+ </commands>
</gadget>
-</gadgets>
\ No newline at end of file
+</gadgets>
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/FeedGadget.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/FeedGadget.java
2008-08-28 09:45:10 UTC (rev 1623)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/FeedGadget.java
2008-08-28 13:33:40 UTC (rev 1624)
@@ -22,8 +22,9 @@
package net.karmaLab.tuxDroid.gadgets;
-import java.io.IOException;
+import java.io.*;
import java.net.URL;
+import java.net.URLConnection;
import java.util.Vector;
import net.karmaLab.beans.mapping.annotation.Published;
@@ -36,7 +37,7 @@
public class FeedGadget extends SimpleGadget<FeedGadget.Configuration> {
public static class Configuration extends SimpleGadgetConfiguration {
- private String address = "http://artisan.karma-lab.net/rss.xml";;
+ private String address =
"http://artisan.karma-lab.net/rss.xml";; //$NON-NLS-1$
private boolean enabled = true;
@@ -46,7 +47,7 @@
private boolean readDescription = false;
- private String title = "Artisan";
+ private String title = "Artisan"; //$NON-NLS-1$
@Published
public String getAddress() {
@@ -96,7 +97,6 @@
public void setTitle(String title) {
this.title = title;
}
-
}
public static void main(String[] args) throws Exception {
@@ -104,40 +104,53 @@
}
@Override
- public void start() throws FeedReaderException, IOException {
- throwTrace("Loading " + configuration().getTitle() + " stream");
+ public void start() throws FeedReaderException, IOException {
+ throwTrace("Loading " + configuration().getTitle() + "
stream"); //$NON-NLS-1$ //$NON-NLS-2$
URL feedUrl = new URL(configuration().getAddress());
+
Feed feed = new Feed(feedUrl.openStream());
+
int count = configuration().getNumberOfEntries();
-
+ String message = "";
for (FeedEntry entry : feed) {
boolean found = false;
for (String title : configuration().getLastTitles()) {
- if (entry.getTitle().equals(title))
-
- {
+ if (entry.getTitle().equals(title)) {
found = true;
break;
}
}
if (!found) {
configuration().getLastTitles().insertElementAt(entry.getTitle(), 0);
- throwMessage(configuration().getTitle() + ":" +
entry.getTitle().trim() + ".");
+ message = message + configuration().getTitle()
+ " : " + entry.getTitle().trim() + ". ";
+
if (configuration().isReadDescription()) {
- throwMessage(entry.getTextDescription()
+ ".\n");
+ message = message +
entry.getTextDescription() + " ";
}
}
- count--;
- if (count <= 0) {
+ if (--count == 0) {
break;
}
}
+ throwMessage(this.searchForPercent(message));
+
if (configuration().getLastTitles().size() >
configuration().getNumberOfEntries()) {
for (int i = 0; i <
configuration().getNumberOfEntries() - configuration().getLastTitles().size();
i++) {
configuration().getLastTitles().remove(configuration().getNumberOfEntries());
}
}
-
}
-
+
+ /**
+ * This function search and replace all "%" symbol.
+ * If a string is sent with a % symbol, throwMessage crash !
+ * @param The original message
+ * @return The message without "%"
+ */
+ private String searchForPercent(String message) {
+ while (message.contains("%")) {
+ message = message.replace("%",
Messages.getString("percent")); //$NON-NLS-1$
+ }
+ return message;
+ }
}
Added:
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/Messages.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/Messages.java
(rev 0)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/Messages.java
2008-08-28 13:33:40 UTC (rev 1624)
@@ -0,0 +1,34 @@
+package net.karmaLab.tuxDroid.gadgets;
+
+import java.util.MissingResourceException;
+import java.util.Locale;
+import java.util.ResourceBundle;
+
+public class Messages {
+ private static final String BUNDLE_NAME =
"net.karmaLab.tuxDroid.gadgets.messages"; //$NON-NLS-1$
+
+ private static final ResourceBundle RESOURCE_BUNDLE;
+
+ private static final String ccLang =
System.getProperty("CC_SET_LANGUAGE");
+
+ static
+ {
+ if (ccLang == null) {
+ RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME);
+ }
+ else {
+ RESOURCE_BUNDLE = ResourceBundle.getBundle(BUNDLE_NAME,
new Locale(ccLang));
+ }
+ }
+
+ private Messages() {
+ }
+
+ public static String getString(String key) {
+ try {
+ return RESOURCE_BUNDLE.getString(key);
+ } catch (MissingResourceException e) {
+ return '!' + key + '!';
+ }
+ }
+}
\ No newline at end of file
Added:
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages.properties
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages.properties
(rev 0)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages.properties
2008-08-28 13:33:40 UTC (rev 1624)
@@ -0,0 +1 @@
+percent=percent
Added:
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_en.properties
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_en.properties
(rev 0)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_en.properties
2008-08-28 13:33:40 UTC (rev 1624)
@@ -0,0 +1 @@
+percent=percent
Added:
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_fr.properties
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_fr.properties
(rev 0)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_fr.properties
2008-08-28 13:33:40 UTC (rev 1624)
@@ -0,0 +1 @@
+percent=pourcent
Added:
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_nl.properties
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_nl.properties
(rev 0)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-feed/trunk/tuxdroid-gadget-feed/sources/net/karmaLab/tuxDroid/gadgets/messages_nl.properties
2008-08-28 13:33:40 UTC (rev 1624)
@@ -0,0 +1 @@
+percent=percent
-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
