Author: jerome
Date: 2009-04-23 12:43:35 +0200 (Thu, 23 Apr 2009)
New Revision: 4579
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
Log:
* Inverted tts order ( on yyy your morning ==> Your morning ... on yyy ).
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-23 10:39:07 UTC (rev 4578)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-23 10:43:35 UTC (rev 4579)
@@ -49,15 +49,17 @@
gadget.throwMessage("No TV program for now");
}
}
- else
- {
- gadget.throwMessage("On {0}",
programme.get(0).getChannel());
- }
//Morning program.
if(configuration.getGiveMorning())
{
gadget.throwMessage("Your morning TV Programs");
+
+ if(!configuration.getGiveNowPlaying())
+ {
+ gadget.throwMessage("On {0}",
programme.get(0).getChannel());
+ }
+
Vector<Program> morning =
SimplePrograms.sortMorning(programme);
for(Program oneProgram : morning)
@@ -77,6 +79,12 @@
if (configuration.getGiveAfternoon())
{
gadget.throwMessage("Your afternoon TV Programs");
+
+ if(!configuration.getGiveNowPlaying())
+ {
+ gadget.throwMessage("On {0}",
programme.get(0).getChannel());
+ }
+
Vector<Program> afternoon =
SimplePrograms.sortAfternoon(programme);
for(Program oneProgram : afternoon)
{
@@ -96,6 +104,12 @@
if(configuration.getGiveEvening())
{
gadget.throwMessage("Your evening TV Programs");
+
+ if(!configuration.getGiveNowPlaying())
+ {
+ gadget.throwMessage("On {0}",
programme.get(0).getChannel());
+ }
+
Vector<Program> evening =
SimplePrograms.sortEvening(programme);
for(Program oneProgram : evening)
{
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
2009-04-23 10:39:07 UTC (rev 4578)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
2009-04-23 10:43:35 UTC (rev 4579)
@@ -114,16 +114,17 @@
Program nowPlaying =
SimplePrograms.getNowPlaying(programme);
throwMessage("Now playing on {0}, {1}",
nowPlaying.getChannel(), nowPlaying.getTitle());
}
- else
- {
- throwMessage("On {0}", programme.get(0).getChannel());
- }
//Morning program.
if(this.configuration().getGiveMorning())
{
throwMessage("Your morning TV Programs");
+ if(!this.configuration().getGiveNowPlaying())
+ {
+ throwMessage("On {0}",
programme.get(0).getChannel());
+ }
+
Vector<Program> morning =
SimplePrograms.sortMorning(programme);
for(Program oneProgram : morning)
@@ -143,6 +144,12 @@
if (this.configuration().getGiveAfternoon())
{
throwMessage("Your afternoon TV Programs");
+
+ if(!this.configuration().getGiveNowPlaying())
+ {
+ throwMessage("On {0}",
programme.get(0).getChannel());
+ }
+
Vector<Program> afternoon =
SimplePrograms.sortAfternoon(programme);
for(Program oneProgram : afternoon)
{
@@ -162,6 +169,12 @@
if(this.configuration().getGiveEvening())
{
throwMessage("Your evening TV Programs");
+
+ if(!this.configuration().getGiveNowPlaying())
+ {
+ throwMessage("On {0}",
programme.get(0).getChannel());
+ }
+
Vector<Program> evening =
SimplePrograms.sortEvening(programme);
for(Program oneProgram : evening)
{
------------------------------------------------------------------------------
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
