Author: jerome
Date: 2009-04-16 11:16:45 +0200 (Thu, 16 Apr 2009)
New Revision: 4531
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:
* Channel name says once.
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-16 09:06:47 UTC (rev 4530)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-16 09:16:45 UTC (rev 4531)
@@ -35,13 +35,15 @@
*/
public static void giveProgram(Configuration configuration,
Vector<Program> programme, SimpleGadget<?> gadget)
{
+ gadget.throwMessage("On {0}", programme.get(0).getChannel());
+
//Give now playing program.
if(configuration.getGiveNowPlaying())
{
Program nowPlaying =
SimplePrograms.getNowPlaying(programme);
if(nowPlaying != null)
{
- gadget.throwMessage("Now playing {0} on {1}",
nowPlaying.getTitle(), nowPlaying.getChannel());
+ gadget.throwMessage("Now playing {0}",
nowPlaying.getTitle());
}
else
{
@@ -58,11 +60,11 @@
{
if(!configuration.getGiveProgramDescription()
|| (oneProgram.getDescription().equalsIgnoreCase("undefined")))
{
- gadget.throwMessage("On {0} at {1},
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
+ gadget.throwMessage("{0}, {1}",
oneProgram.getStartTime(), oneProgram.getTitle());
}
else
{
- gadget.throwMessage("On {0} at {1},
{2}, {3}",oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
+ gadget.throwMessage("{0}, {1}, {2}",
oneProgram.getStartTime(), oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
@@ -76,11 +78,11 @@
if(!configuration.getGiveProgramDescription()
|| (oneProgram.getDescription().equalsIgnoreCase("undefined")))
{
- gadget.throwMessage("On {0} at {1},
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
+ gadget.throwMessage("{0}, {1}",
oneProgram.getStartTime(), oneProgram.getTitle());
}
else
{
- gadget.throwMessage("On {0} at {1} {2},
{3}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
+ gadget.throwMessage("{0}, {1}, {2}",
oneProgram.getStartTime(), oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
@@ -93,11 +95,11 @@
{
if(!configuration.getGiveProgramDescription()
|| (oneProgram.getDescription().equalsIgnoreCase("undefined")))
{
- gadget.throwMessage("On {0} at {1},
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
+ gadget.throwMessage("{0}, {1}",
oneProgram.getStartTime(), oneProgram.getTitle());
}
else
{
- gadget.throwMessage("On {0} at {1} {2},
{3}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
+ gadget.throwMessage("{0}, {1}, {2}",
oneProgram.getStartTime(), oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
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-16 09:06:47 UTC (rev 4530)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvFr.java
2009-04-16 09:16:45 UTC (rev 4531)
@@ -95,6 +95,15 @@
*/
public void giveProgram(Vector<Program> programme)
{
+ throwMessage("On {0}", programme.get(0).getChannel());
+
+ //Give now playing program.
+ if(this.configuration().getGiveNowPlaying())
+ {
+ Program nowPlaying =
SimplePrograms.getNowPlaying(programme);
+ throwMessage("Now playing {0}", nowPlaying.getTitle());
+ }
+
//Morning program.
if(this.configuration().getGiveMorning())
{
@@ -104,11 +113,11 @@
{
if(!this.configuration().getGiveProgramDescription())
{
- throwMessage("On {0} at {1} {2}",
oneProgram.getChannel(), oneProgram.getStartTime(), oneProgram.getTitle());
+ throwMessage("{0}, {1}",
oneProgram.getStartTime(), oneProgram.getTitle());
}
else
{
- throwMessage("On {0} at {1} {2}, the
description is {3}",oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
+ throwMessage("{0}, {1}, {2}",
oneProgram.getStartTime(), oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
@@ -122,11 +131,11 @@
if(!this.configuration().getGiveProgramDescription())
{
- throwMessage("On {0} at {1} {2}",
oneProgram.getChannel(), oneProgram.getStartTime(), oneProgram.getTitle());
+ throwMessage("{0}, {1}",
oneProgram.getStartTime(), oneProgram.getTitle());
}
else
{
- throwMessage("On {0} at {1} {2}, the
description is {3}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
+ throwMessage("{0}, {1}, {2}",
oneProgram.getStartTime(), oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
@@ -139,21 +148,14 @@
{
if(!this.configuration().getGiveProgramDescription())
{
- throwMessage("On {0} at {1} {2}",
oneProgram.getChannel(), oneProgram.getStartTime(), oneProgram.getTitle());
+ throwMessage("{0}, {1}",
oneProgram.getStartTime(), oneProgram.getTitle());
}
else
{
- throwMessage("On {0} at {1} {2}, the
description is {3}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
+ throwMessage("{0}, {1}, {2}",
oneProgram.getStartTime(), oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
-
- //Give now playing program.
- if(this.configuration().getGiveNowPlaying())
- {
- Program nowPlaying =
SimplePrograms.getNowPlaying(programme);
- throwMessage("Now playing {0} on {1}",
nowPlaying.getTitle(), nowPlaying.getChannel());
- }
}
------------------------------------------------------------------------------
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
