[vlma-devel] commit: Replace MediaGroup with ProgramGroup. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Tue Dec 30 23:57:39 2008 +0100| [8dbc3b087e47f31b7dd3bcf168ff732eca218c58] | committer: Adrien Grand 

Replace MediaGroup with ProgramGroup.

This has been done because two programs can sometimes not be in the same group
(now that there can be several programs per media), for instance if one program
is a broadcast whereas the other is a VoD.

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

 .../main/java/org/videolan/vlma/model/Adapter.java |    4 +-
 .../java/org/videolan/vlma/model/DTTChannel.java   |   15 +---
 .../java/org/videolan/vlma/model/FilesChannel.java |    4 +-
 .../main/java/org/videolan/vlma/model/Media.java   |   22 ----
 .../main/java/org/videolan/vlma/model/Order.java   |   36 ++++----
 .../main/java/org/videolan/vlma/model/Program.java |   49 ++++++++--
 .../model/{MediaGroup.java => ProgramGroup.java}   |   30 +++---
 .../java/org/videolan/vlma/model/SatChannel.java   |   19 +---
 .../org/videolan/vlma/model/StreamChannel.java     |    5 +-
 .../org/videolan/vlma/model/StreamingStrategy.java |   17 +++
 .../org/videolan/vlma/model/MediaGroupTest.java    |   66 ++++++++++---
 .../java/org/videolan/vlma/model/OrderTest.java    |   36 +++++--
 .../main/java/org/videolan/vlma/OrderComputer.java |  103 +++++++++----------
 .../main/java/org/videolan/vlma/OrderManager.java  |   47 ++++-----
 .../java/org/videolan/vlma/monitor/Monitor.java    |   12 +-
 .../org/videolan/vlma/monitor/OrderMonitor.java    |   10 +-
 .../org/videolan/vlma/order/DTTOrderSender.java    |   12 +-
 .../org/videolan/vlma/order/FilesOrderSender.java  |    2 +-
 .../videolan/vlma/order/OrderSenderDispatcher.java |    4 +-
 .../org/videolan/vlma/order/SatOrderSender.java    |   10 +-
 .../org/videolan/vlma/order/StreamOrderSender.java |    2 +-
 .../java/org/videolan/vlma/OrderGiverTest.java     |   20 +++-
 22 files changed, 291 insertions(+), 234 deletions(-)

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