[vlma-devel] commit: Ability to set several programmations per media. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Fri Dec 26 19:53:16 2008 +0100| [af6c02304ef4bbf3985cb82aeb0aae20f61f897d] | committer: Adrien Grand 

Ability to set several programmations per media.

> http://git.videolan.org/gitweb.cgi/vlma.git/?a=commit;h=af6c02304ef4bbf3985cb82aeb0aae20f61f897d
---

 vlma-api/src/main/java/org/videolan/vlma/Data.java |    2 +-
 .../java/org/videolan/vlma/model/DTTChannel.java   |    6 +-
 .../java/org/videolan/vlma/model/FilesChannel.java |    3 +-
 .../main/java/org/videolan/vlma/model/Media.java   |   33 ++-
 .../java/org/videolan/vlma/model/MediaGroup.java   |   14 +-
 .../main/java/org/videolan/vlma/model/Order.java   |    1 +
 .../main/java/org/videolan/vlma/model/Program.java |   25 ++-
 .../java/org/videolan/vlma/model/SatChannel.java   |    3 +-
 .../org/videolan/vlma/model/StreamChannel.java     |    3 +-
 .../org/videolan/vlma/model/StreamingStrategy.java |   20 ++-
 .../src/main/java/org/videolan/vlma/DataImpl.java  |   44 +++--
 .../src/main/java/org/videolan/vlma/IpBank.java    |   12 +-
 .../main/java/org/videolan/vlma/OrderComputer.java |   11 +-
 .../main/java/org/videolan/vlma/OrderManager.java  |   37 ++--
 .../main/java/org/videolan/vlma/VLMaService.java   |    4 +-
 .../java/org/videolan/vlma/VLMaServiceImpl.java    |   23 +-
 .../org/videolan/vlma/order/DTTOrderSender.java    |    6 +-
 .../org/videolan/vlma/order/FilesOrderSender.java  |    6 +-
 .../org/videolan/vlma/order/SatOrderSender.java    |    6 +-
 .../org/videolan/vlma/order/StreamOrderSender.java |    6 +-
 .../vlma/watcher/DirectMulticastStreamWatcher.java |    9 +-
 .../videolan/vlma/watcher/HttpStreamWatcher.java   |   13 +-
 .../videolan/vlma/watcher/RtspStreamWatcher.java   |   19 +--
 .../org/videolan/vlma/watcher/StreamWatcher.java   |    4 +-
 .../vlma/watcher/StreamWatcherDispatcher.java      |   23 +-
 .../vlma/watcher/StreamWatcherMockImpl.java        |    4 +-
 .../test/java/org/videolan/vlma/IpBankTest.java    |    2 +-
 .../java/org/videolan/vlma/OrderGiverTest.java     |    8 +-
 .../java/org/videolan/vlma/VLMaServiceTest.java    |   19 +-
 .../watcher/DirectMulticastStreamWatcherTest.java  |    6 +-
 .../vlma/watcher/HttpStreamWatcherTest.java        |    5 +-
 .../media/MediaProgramAddController.java           |   10 +-
 .../web/controller/media/MediaProgramRemove.java   |   44 ++++
 .../media/MediaProgramRemoveController.java        |   22 +-
 .../media/MediaProgramRemoveValidator.java         |    8 +-
 .../web/controller/media/MediaRemoveValidator.java |    2 +-
 .../web/controller/media/MediaViewController.java  |  103 --------
 .../service/AbstractPlaylistController.java        |   21 +--
 .../web/controller/welcome/WelcomeController.java  |   47 ++--
 .../java/org/videolan/vlma/web/tag/Program.java    |   36 +++-
 vlma-webapp/src/main/resources/messages.properties |    8 +-
 .../src/main/resources/messages_fr.properties      |    8 +-
 .../src/main/webapp/WEB-INF/VLMa-servlet.xml       |    6 +-
 .../src/main/webapp/WEB-INF/defs/templates.xml     |    4 -
 .../WEB-INF/jsp/dtt/dttchannellist_right.jsp       |   85 ++++----
 .../WEB-INF/jsp/file/filechannellist_right.jsp     |   85 ++++----
 .../webapp/WEB-INF/jsp/media/mediaview_right.jsp   |   12 -
 .../WEB-INF/jsp/satellite/satchannellist_right.jsp |   84 ++++----
 .../main/webapp/WEB-INF/jsp/service/playlist.jsp   |    7 +-
 .../main/webapp/WEB-INF/jsp/service/podcast.jsp    |    6 +-
 .../WEB-INF/jsp/stream/streamchannellist_right.jsp |   71 +++---
 .../webapp/WEB-INF/jsp/welcome/welcome_right.jsp   |  250 +++++---------------
 vlma-webapp/src/main/webapp/css/style.css          |   17 +-
 53 files changed, 584 insertions(+), 729 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlma.git/?a=commitdiff;h=af6c02304ef4bbf3985cb82aeb0aae20f61f897d