Author: jerome
Date: 2009-04-06 10:37:34 +0200 (Mon, 06 Apr 2009)
New Revision: 4346
Added:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
Log:
* Added commons class.
* Added BelgianFrench gadget.
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
2009-04-06 08:00:19 UTC (rev 4345)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/Configuration.java
2009-04-06 08:37:34 UTC (rev 4346)
@@ -26,11 +26,11 @@
public class Configuration extends SimpleGadgetConfiguration{
private String channel = "LA UNE";
- private boolean giveProgramDescription = true;
+ private boolean giveProgramDescription = false;
private boolean giveMorning = true;
private boolean giveAfternoon = true;
private boolean giveEvening = true;
- private boolean giveNowPlaying = true;
+ private boolean giveNowPlaying = false;
/**
Added:
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
(rev 0)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
2009-04-06 08:37:34 UTC (rev 4346)
@@ -0,0 +1,109 @@
+/* This file is part of "tuxdroid programs tv".
+ * Copyright 2009, kysoh
+ * Author : Conan Jerome
+ * eMail : jerome.conan AT kysoh.com
+ *
+ * "tuxdroid programs tv" is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * "tuxdroid programs tv" is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with "tuxdroid programs tv"; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+
+package com.kysoh.tvPrograms.gadget;
+
+import java.util.Vector;
+
+import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
+import com.kysoh.tvPrograms.Program;
+import com.kysoh.tvPrograms.programs.SimplePrograms;
+import com.kysoh.tvPrograms.programs.belgian.BelgianDutch;
+
+public class GadgetProgramTV {
+
+ /**
+ * Used function to give the current tv program.
+ * @param configuration
+ */
+ public static void giveProgram(Configuration configuration,
Vector<Program> programme, SimpleGadget<?> gadget)
+ {
+ //Morning program.
+ if(configuration.getGiveMorning())
+ {
+ Vector<Program> morning =
SimplePrograms.sortMorning(programme);
+
+ for(Program oneProgram : morning)
+ {
+ if(!configuration.getGiveProgramDescription())
+ {
+
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle());
+ }
+ else
+ {
+
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle() + " " + oneProgram.getDescription());
+ }
+ }
+ }
+
+ //Afternoon program.
+ if (configuration.getGiveAfternoon())
+ {
+ Vector<Program> afternoon =
SimplePrograms.sortAfternoon(programme);
+ for(Program oneProgram : afternoon)
+ {
+
+ if(!configuration.getGiveProgramDescription())
+ {
+
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle());
+ }
+ else
+ {
+
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle() + " " + oneProgram.getDescription());
+ }
+ }
+ }
+
+ //Evening program.
+ if(configuration.getGiveEvening())
+ {
+ Vector<Program> evening =
SimplePrograms.sortEvening(programme);
+ for(Program oneProgram : evening)
+ {
+ if(!configuration.getGiveProgramDescription())
+ {
+
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle());
+ }
+ else
+ {
+
gadget.throwMessage(oneProgram.getChannel() + " " + oneProgram.getStartTime() +
" " + oneProgram.getTitle() + " " + oneProgram.getDescription());
+ }
+ }
+ }
+
+ //Give now playing program.
+ if(configuration.getGiveNowPlaying())
+ {
+ Program nowPlaying =
BelgianDutch.getNowPlaying(programme);
+ gadget.throwMessage("Now playing {0} on {1}",
nowPlaying.getTitle(), nowPlaying.getChannel());
+ }
+ }
+
+
+ /**
+ * Quit the gadget.
+ */
+ public static void quitGadget()
+ {
+ System.exit(0);
+ }
+
+}
Property changes on:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramTV.java
___________________________________________________________________
Name: svn:executable
+ *
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
2009-04-06 08:00:19 UTC (rev 4345)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeDu.java
2009-04-06 08:37:34 UTC (rev 4346)
@@ -43,20 +43,8 @@
protected void start() throws Throwable
{
BelgianDutch.addProgramLoadListener(this);
-
-
-
duPrograms = new
BelgianDutch(this.configuration().getChannel());
}
-
-
- /**
- * Quit the gadget.
- */
- private void quiGadget()
- {
- System.exit(0);
- }
/**
@@ -66,7 +54,7 @@
public void loadError(String url)
{
throwMessage("Error while loading the TV program");
- this.quiGadget();
+ GadgetProgramTV.quitGadget();
}
@@ -76,65 +64,7 @@
@Override
public void loaded(Vector<Program> completeProgram)
{
-
- //Morning program.
- if(this.configuration().getGiveMorning())
- {
- Vector<Program> morning =
BelgianDutch.sortMorning(completeProgram);
-
- for(Program oneProgram : morning)
- {
-
if(!this.configuration().getGiveProgramDescription())
- {
- throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle());
- }
- else
- {
- throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle() + " " +
oneProgram.getDescription());
- }
- }
- }
-
- //Afternoon program.
- if (this.configuration().getGiveAfternoon())
- {
- Vector<Program> afternoon =
BelgianDutch.sortAfternoon(completeProgram);
- for(Program oneProgram : afternoon)
- {
-
if(!this.configuration().getGiveProgramDescription())
- {
- throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle());
- }
- else
- {
- throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle() + " " +
oneProgram.getDescription());
- }
- }
- }
-
- //Evening program.
- if(this.configuration().getGiveEvening())
- {
- Vector<Program> evening =
BelgianDutch.sortEvening(completeProgram);
- for(Program oneProgram : evening)
- {
-
if(!this.configuration().getGiveProgramDescription())
- {
- throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle());
- }
- else
- {
- throwMessage(oneProgram.getChannel() +
" " + oneProgram.getStartTime() + " " + oneProgram.getTitle() + " " +
oneProgram.getDescription());
- }
- }
- }
-
- //Give now playing program.
- if(this.configuration().getGiveNowPlaying())
- {
- Program nowPlaying =
BelgianDutch.getNowPlaying(completeProgram);
- throwMessage("Now playing {0} on {1}",
nowPlaying.getTitle(), nowPlaying.getChannel());
- }
+ GadgetProgramTV.giveProgram(this.configuration(),
completeProgram, this);
}
Modified:
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
===================================================================
---
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
2009-04-06 08:00:19 UTC (rev 4345)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/gadget/GadgetProgramsTvBeFr.java
2009-04-06 08:37:34 UTC (rev 4346)
@@ -21,14 +21,56 @@
package com.kysoh.tvPrograms.gadget;
+import java.util.Vector;
+
import com.kysoh.tuxdroid.gadget.framework.gadget.SimpleGadget;
+import com.kysoh.tvPrograms.Program;
+import com.kysoh.tvPrograms.ProgramLoadListener;
+import com.kysoh.tvPrograms.programs.belgian.BelgianFrench;
-public class GadgetProgramsTvBeFr extends SimpleGadget<Configuration>{
+public class GadgetProgramsTvBeFr extends SimpleGadget<Configuration>
implements ProgramLoadListener{
+ BelgianFrench frPrograms;
+
+ /**
+ * Start the gadget.
+ */
@Override
protected void start() throws Throwable
{
-
+ BelgianFrench.addProgramLoadListener(this);
+ frPrograms = new
BelgianFrench(this.configuration().getChannel());
}
+
+ /**
+ * Handle load errors.
+ */
+ @Override
+ public void loadError(String url)
+ {
+ throwMessage("Error while loading the TV program");
+ GadgetProgramTV.quitGadget();
+ }
+
+
+ /**
+ * Handle program loaded.
+ */
+ @Override
+ public void loaded(Vector<Program> completeProgram)
+ {
+ GadgetProgramTV.giveProgram(this.configuration(),
completeProgram, this);
+ }
+
+
+ /**
+ * Simple main tests.
+ * @param args
+ */
+ public static void main(String[] args)
+ {
+ new GadgetProgramsTvBeFr().boot(args, new Configuration());
+ }
+
}
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-06 08:00:19 UTC (rev 4345)
+++
software_suite_v2/software/gadgets/tuxdroid-gadget-programsTV/trunk/tuxdroid-gadget-programsTV/src/com/kysoh/tvPrograms/programs/SimplePrograms.java
2009-04-06 08:37:34 UTC (rev 4346)
@@ -210,6 +210,7 @@
}
}
}
+ return sorted;
}
//Afternoon sort.
@@ -219,12 +220,15 @@
{
if(Integer.valueOf(p.getStartTime().substring(0, 2)).intValue() <= 18)
{
+
if(Integer.valueOf(p.getStartTime().substring(0, 2)).intValue() >= 13)
{
sorted.add(p);
}
}
}
+
+ return sorted;
}
//Evening sort.
@@ -249,6 +253,7 @@
}
}
}
+ return sorted;
}
return sorted;
}
------------------------------------------------------------------------------
_______________________________________________
Tux-droid-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tux-droid-svn
