Author: jerome
Date: 2009-04-08 19:32:26 +0200 (Wed, 08 Apr 2009)
New Revision: 4422
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/Program.java
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/programs/SimplePrograms.java
Log:
* Formated output program strings to gadgets noifications format.
* Handling an other possible error.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/Program.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/Program.java
2009-04-08 17:20:34 UTC (rev 4421)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/Program.java
2009-04-08 17:32:26 UTC (rev 4422)
@@ -37,8 +37,13 @@
* @param description : The program description.
* @param channel : The program channel.
*/
- public Program(String title, String startTime, String description,
String channel)
+ public Program(String title, String startTime, String description,
String channel) throws Exception
{
+ if((title == null) || (title == ""))
+ {
+ throw new Exception("Program title cannot be empty: " +
title);
+ }
+
this.title = title;
this.startTime = startTime;
this.description = description;
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-08 17:20:34 UTC (rev 4421)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-08 17:32:26 UTC (rev 4422)
@@ -44,11 +44,11 @@
{
if(!configuration.getGiveProgramDescription())
{
-
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle());
+ gadget.throwMessage("On {0} at {1}
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
}
else
{
-
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle() + " " + oneProgram.getDescription());
+ gadget.throwMessage("On {0} at {1} {2},
the descripion is {3}",oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
@@ -62,11 +62,11 @@
if(!configuration.getGiveProgramDescription())
{
-
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle());
+ gadget.throwMessage("On {0} at {1}
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
}
else
{
-
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle() + " " + oneProgram.getDescription());
+ gadget.throwMessage("On {0} at {1} {2},
the descripion is {3}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
@@ -79,11 +79,11 @@
{
if(!configuration.getGiveProgramDescription())
{
-
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle());
+ gadget.throwMessage("On {0} at {1}
{2}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle());
}
else
{
-
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle() + " " + oneProgram.getDescription());
+ gadget.throwMessage("On {0} at {1} {2},
the descripion is {3}", oneProgram.getChannel(), oneProgram.getStartTime(),
oneProgram.getTitle(), oneProgram.getDescription());
}
}
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-08 17:20:34 UTC (rev 4421)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-08 17:32:26 UTC (rev 4422)
@@ -295,8 +295,16 @@
description =
HTMLUtils.HtmlToString(description);
}
- Program p = new Program(title,
startTime, description, channel);
- def.add(p);
+ try
+ {
+ Program p = new
Program(title, startTime, description, channel);
+ def.add(p);
+ }
+
+ catch(Exception titleError)
+ {
+
System.out.println(titleError.getMessage());
+ }
}
}
}
------------------------------------------------------------------------------
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
