Author: jerome
Date: 2009-07-08 14:02:34 +0200 (Wed, 08 Jul 2009)
New Revision: 5086
Modified:
software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml
software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java
Log:
* Improved the fix : possible tts output bug related to the '&' character
* Updated two channels into the plugin.xml file that was not working.
Modified:
software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml
===================================================================
---
software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml
2009-07-08 11:29:23 UTC (rev 5085)
+++
software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/resources/plugin.xml
2009-07-08 12:02:34 UTC (rev 5086)
@@ -37,7 +37,7 @@
category="Options"
name="flandreChannel"
description="Select your Belgian Dutch channel"
- type="enum(Vijf TV, Prime One, Prime Action, Prime
Movies, Canvas, Fashion TV Prime Fezztival,
+ type="enum(Vijf TV, Prime One, Prime Action, Prime
Movies, Canvas, Fashion TV, Prime Fezztival,
JIM,KANAALTWEE, Ketnet, MTV Netherland, Prime Sport,
The Music Factory, Trace TV, Vitaya, VT4, VTM)"
defaultValue="Vijf TV" />
<parameter
Modified:
software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java
===================================================================
---
software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java
2009-07-08 11:29:23 UTC (rev 5085)
+++
software_suite_v3/software/plugin/plugin-programsTv/trunk/plugin-programsTv/src/com/kysoh/tvPrograms/plugin/PluginProgramTV.java
2009-07-08 12:02:34 UTC (rev 5086)
@@ -83,9 +83,9 @@
if(!configuration.getGiveNowPlaying())
{
channel = programme.get(0).getChannel();
- if(channel.contains("&"))
+ if(channel.contains(" & "))
{
- channel = channel.replace("&", "&&");
+ channel = channel.replace(" & ", " &&
");
}
gadget.throwMessage("On {0}", channel);
@@ -103,18 +103,19 @@
if(!configuration.getGiveProgramDescription()
|| (oneProgram.getDescription().equalsIgnoreCase("undefined")))
{
title = oneProgram.getTitle();
- if(title.contains("&"))
+
+ if(title.contains(" & "))
{
- title = title.replace("&",
"&&");
+ title = title.replace(" & ", "
&& ");
}
gadget.throwMessage("{0}, {1}",
oneProgram.getStartTime(), title);
}
else
{
title = oneProgram.getTitle();
- if(title.contains("&"))
+ if(title.contains(" & "))
{
- title = title.replace("&",
"&&");
+ title = title.replace(" & ", "
&& ");
}
gadget.throwMessage("{0}, {1}, {2}",
oneProgram.getStartTime(), title, oneProgram.getDescription());
}
@@ -129,9 +130,9 @@
if(!configuration.getGiveNowPlaying())
{
channel = programme.get(0).getChannel();
- if(channel.contains("&"))
+ if(channel.contains(" & "))
{
- channel = channel.replace("&", "&&");
+ channel = channel.replace(" & ", " &&
");
}
gadget.throwMessage("On {0}", channel);
}
@@ -149,18 +150,18 @@
if(!configuration.getGiveProgramDescription()
|| (oneProgram.getDescription().equalsIgnoreCase("undefined")))
{
title = oneProgram.getTitle();
- if(title.contains("&"))
+ if(title.contains(" & "))
{
- title = title.replace("&",
"&&");
+ title = title.replace(" & ", "
&& ");
}
gadget.throwMessage("{0}, {1}",
oneProgram.getStartTime(), title);
}
else
{
title = oneProgram.getTitle();
- if(title.contains("&"))
+ if(title.contains(" & "))
{
- title = title.replace("&",
"&&");
+ title = title.replace(" & ", "
&& ");
}
gadget.throwMessage("{0}, {1}, {2}",
oneProgram.getStartTime(), title , oneProgram.getDescription());
}
@@ -175,9 +176,9 @@
if(!configuration.getGiveNowPlaying())
{
channel = programme.get(0).getChannel();
- if(channel.contains("&"))
+ if(channel.contains(" & "))
{
- channel = channel.replace("&", "&&");
+ channel = channel.replace(" & ", " &&
");
}
gadget.throwMessage("On {0}", channel);
}
@@ -194,18 +195,18 @@
if(!configuration.getGiveProgramDescription()
|| (oneProgram.getDescription().equalsIgnoreCase("undefined")))
{
title = oneProgram.getTitle();
- if(title.contains("&"))
+ if(title.contains(" & "))
{
- title = title.replace("&",
"&&");
+ title = title.replace(" & ", "
&& ");
}
gadget.throwMessage("{0}, {1}",
oneProgram.getStartTime(), title);
}
else
{
title = oneProgram.getTitle();
- if(title.contains("&"))
+ if(title.contains(" & "))
{
- title = title.replace("&",
"&&");
+ title = title.replace(" & ", "
&& ");
}
gadget.throwMessage("{0}, {1}, {2}",
oneProgram.getStartTime(), title, oneProgram.getDescription());
}
------------------------------------------------------------------------------
Enter the BlackBerry Developer Challenge
This is your chance to win up to $100,000 in prizes! For a limited time,
vendors submitting new applications to BlackBerry App World(TM) will have
the opportunity to enter the BlackBerry Developer Challenge. See full prize
details at: http://p.sf.net/sfu/Challenge
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
