[vlma-devel] commit: Model: No jealous, everyone at the same level. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Tue Aug 26 22:09:07 2008 +0200| [f7608ad1beb9fbf8aefaabc0c07a2b1af4eba2e6] | committer: Adrien Grand 

Model: No jealous, everyone at the same level.

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

 vlma-api/src/main/java/org/videolan/vlma/Data.java |    8 +++---
 .../videolan/vlma/model/{adapter => }/Adapter.java |    4 +--
 .../main/java/org/videolan/vlma/model/Command.java |    1 -
 .../vlma/model/{adapter => }/DVBSAdapter.java      |    5 +---
 .../vlma/model/{adapter => }/DVBTAdapter.java      |    4 +--
 .../vlma/model/{adapter => }/FilesAdapter.java     |    4 +--
 .../vlma/model/{media => }/FilesChannel.java       |    4 +--
 .../org/videolan/vlma/model/{media => }/Media.java |    2 +-
 .../vlma/model/{media => }/MediaGroup.java         |    2 +-
 .../main/java/org/videolan/vlma/model/Order.java   |    2 -
 .../videolan/vlma/model/{media => }/Program.java   |    3 +-
 .../vlma/model/{media => }/SatChannel.java         |    3 +-
 .../videolan/vlma/model/{media => }/Satellite.java |    2 +-
 .../videolan/vlma/model/{adapter => }/Server.java  |    2 +-
 .../vlma/model/{adapter => }/StreamAdapter.java    |    4 +--
 .../vlma/model/{media => }/StreamChannel.java      |    3 +-
 .../vlma/model/{media => }/StreamingStrategy.java  |    2 +-
 .../vlma/model/{media => }/TNTChannel.java         |    3 +-
 .../org/videolan/vlma/model/adapter/package.html   |    6 ----
 .../org/videolan/vlma/model/media/package.html     |    5 ---
 .../src/main/java/org/videolan/vlma/DataImpl.java  |   18 ++++++------
 .../src/main/java/org/videolan/vlma/IpBank.java    |    6 ++--
 .../main/java/org/videolan/vlma/OrderGiver.java    |   12 ++++----
 .../java/org/videolan/vlma/ProgramFactory.java     |    4 +-
 .../main/java/org/videolan/vlma/VLMaService.java   |    6 ++--
 .../java/org/videolan/vlma/VLMaServiceImpl.java    |    8 +++---
 .../main/java/org/videolan/vlma/dao/VLMaDao.java   |    6 ++--
 .../java/org/videolan/vlma/dao/VLMaDaoImpl.java    |   28 ++++++++++----------
 .../org/videolan/vlma/monitor/OrderMonitor.java    |    6 ++--
 .../org/videolan/vlma/monitor/ServerMonitor.java   |    2 +-
 .../videolan/vlma/monitor/ServerStateMonitor.java  |    2 +-
 .../org/videolan/vlma/notifier/MailNotifier.java   |    2 +-
 .../org/videolan/vlma/order/CommandLogger.java     |    2 +-
 .../org/videolan/vlma/order/FilesOrderSender.java  |    6 ++--
 .../java/org/videolan/vlma/order/OrderSender.java  |    8 +++---
 .../videolan/vlma/order/OrderSenderDispatcher.java |   10 +++---
 .../org/videolan/vlma/order/SatOrderSender.java    |    6 ++--
 .../org/videolan/vlma/order/StreamOrderSender.java |    6 ++--
 .../org/videolan/vlma/order/TNTOrderSender.java    |    6 ++--
 .../org/videolan/vlma/retriever/DataRetriever.java |    2 +-
 .../videolan/vlma/retriever/SnmpDataRetriever.java |    2 +-
 .../vlma/watcher/DirectMulticastStreamWatcher.java |    2 +-
 .../vlma/watcher/ExtremeStreamWatcher.java         |    2 +-
 .../videolan/vlma/watcher/HttpStreamWatcher.java   |    2 +-
 .../org/videolan/vlma/watcher/StreamWatcher.java   |    3 +-
 .../vlma/watcher/StreamWatcherDispatcher.java      |    4 +-
 .../vlma/watcher/StreamWatcherMockImpl.java        |    2 +-
 .../test/java/org/videolan/vlma/IpBankTest.java    |   11 ++++---
 .../java/org/videolan/vlma/OrderGiverTest.java     |   17 +++++------
 .../java/org/videolan/vlma/ProgramFactoryTest.java |    8 +++--
 .../org/videolan/vlma/dao/VLMaDaoImplTest.java     |   12 ++++----
 .../org/videolan/vlma/order/CommandLoggerTest.java |    4 +-
 .../watcher/DirectMulticastStreamWatcherTest.java  |    4 +-
 .../vlma/watcher/HttpStreamWatcherTest.java        |    4 +-
 .../configuration/ConfigurationEditController.java |    2 +-
 .../videolan/vlma/web/media/MediaProgramAdd.java   |    2 +-
 .../vlma/web/media/MediaProgramAddController.java  |   10 +++---
 .../web/media/MediaProgramRemoveController.java    |    8 +++---
 .../vlma/web/media/file/FileChannelAdd.java        |    2 +-
 .../web/media/file/FileChannelAddController.java   |    2 +-
 .../web/media/file/FileChannelAddValidator.java    |    4 +-
 .../web/media/file/FileChannelEditController.java  |    6 ++--
 .../web/media/file/FileChannelListController.java  |    4 +-
 .../media/satellite/SatChannelListController.java  |    4 +-
 .../vlma/web/media/stream/StreamChannelAdd.java    |    2 +-
 .../media/stream/StreamChannelAddController.java   |    2 +-
 .../media/stream/StreamChannelAddValidator.java    |    4 +-
 .../media/stream/StreamChannelEditController.java  |    4 +-
 .../media/stream/StreamChannelListController.java  |    4 +-
 .../web/media/tnt/TNTChannelAddController.java     |    2 +-
 .../vlma/web/media/tnt/TNTChannelAddValidator.java |    4 +-
 .../web/media/tnt/TNTChannelListController.java    |    4 +-
 .../web/media/tnt/TNTChannelRemoveController.java  |    2 +-
 .../web/media/tnt/TNTChannelRemoveValidator.java   |    2 +-
 .../vlma/web/satellite/SatelliteAddController.java |    2 +-
 .../vlma/web/satellite/SatelliteAddValidator.java  |    2 +-
 .../web/satellite/SatelliteEditController.java     |    2 +-
 .../vlma/web/satellite/SatelliteEditValidator.java |    2 +-
 .../web/satellite/SatelliteRemoveController.java   |    2 +-
 .../web/satellite/SatelliteRemoveValidator.java    |    2 +-
 .../videolan/vlma/web/server/ServerAdapterAdd.java |    4 +-
 .../web/server/ServerAdapterAddController.java     |    6 ++--
 .../vlma/web/server/ServerAdapterAddValidator.java |    4 +-
 .../web/server/ServerAdapterRemoveController.java  |    4 +-
 .../web/server/ServerAdapterRemoveValidator.java   |    4 +-
 .../vlma/web/server/ServerAddController.java       |    9 +++---
 .../vlma/web/server/ServerAddValidator.java        |    2 +-
 .../vlma/web/server/ServerRemoveController.java    |    2 +-
 .../vlma/web/server/ServerRemoveValidator.java     |    2 +-
 .../vlma/web/server/ServerViewController.java      |    2 +-
 .../web/service/AbstractPlaylistController.java    |    4 +-
 .../vlma/web/service/PlaylistController.java       |    2 +-
 .../vlma/web/service/PodcastController.java        |    2 +-
 .../videolan/vlma/web/servlet/RrdGraphServlet.java |    2 +-
 .../vlma/web/welcome/WelcomeController.java        |   10 +++---
 95 files changed, 205 insertions(+), 232 deletions(-)

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