[vlma-devel] commit: Code simplifications and corrections. (Adrien Grand )

[git version control]

vlma | branch: master | Adrien Grand <jpountz at videolan.org> | Sun Jul 20 23:05:06 2008 +0200| [7b3c0fe3e6efbcb5ed74af0b486bf3f76210a4c8]

Code simplifications and corrections.

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

 pom.xml                                            |    2 -
 vlma-api/pom.xml                                   |   31 +--
 vlma-api/src/main/java/org/videolan/vlma/Data.java |   21 +-
 .../exception/AdapterAlreadyExistsException.java   |    2 +-
 .../exception/AdapterDoesNotExistException.java    |    2 +-
 .../AdapterParameterDoesNotExistException.java     |    2 +-
 .../InvalidAdapterParameterException.java          |    2 +-
 .../exception/InvalidServerNameException.java      |    2 +-
 .../exception/MediaAlreadyExistsException.java     |    2 +-
 .../exception/MediaDoesNotExistException.java      |    2 +-
 .../exception/NoAvailableOrderSenderException.java |    2 +-
 .../exception/SatelliteAlreadyExistsException.java |    2 +-
 .../exception/SatelliteDoesNotExistException.java  |    2 +-
 .../exception/ServerAlreadyExistsException.java    |    2 +-
 .../exception/ServerDoesNotExistException.java     |    2 +-
 .../java/org/videolan/vlma}/exception/package.html |    0 
 .../main/java/org/videolan/vlma/model/Command.java |    3 +-
 .../main/java/org/videolan/vlma/model/Order.java   |    1 +
 .../org/videolan/vlma/model/StreamingStrategy.java |    0 
 .../org/videolan/vlma/model/adapter/Adapter.java   |  116 +++++----
 .../videolan/vlma/model/adapter/DVBSAdapter.java   |    4 +-
 .../videolan/vlma/model/adapter/DVBTAdapter.java   |   10 +-
 .../videolan/vlma/model/adapter/FilesAdapter.java  |   10 +-
 .../org/videolan/vlma/model/adapter/Server.java    |  130 ++++++----
 .../videolan/vlma/model/adapter/StreamAdapter.java |    7 +-
 .../org/videolan/vlma/model/adapter}/package.html  |    2 +-
 .../videolan/vlma/model/media/FilesChannel.java    |   45 +----
 .../java/org/videolan/vlma/model/media/Media.java  |   64 +++--
 .../org/videolan/vlma/model/media/MediaGroup.java  |   12 +-
 .../org/videolan/vlma/model/media}/Program.java    |  265 +++++++++++++-------
 .../org/videolan/vlma/model/media/SatChannel.java  |   28 +--
 .../org/videolan/vlma/model/media/Satellite.java   |    0 
 .../videolan/vlma/model/media/StreamChannel.java   |   39 +---
 .../org/videolan/vlma/model/media/TNTChannel.java  |  111 ++++++++
 .../org/videolan/vlma/model/media/package.html     |    0 
 .../main/java/org/videolan/vlma/model/package.html |    0 
 vlma-configuration/.gitignore                      |    4 -
 vlma-configuration/pom.xml                         |   51 ----
 vlma-core/pom.xml                                  |   20 +-
 .../org/videolan/vlma/ConfigurationService.java    |   16 +-
 .../src/main/java/org/videolan/vlma/DataImpl.java  |   20 +-
 .../src/main/java/org/videolan/vlma/IpBank.java    |    2 +-
 .../main/java/org/videolan/vlma/OrderGiver.java    |    0 
 .../java/org/videolan/vlma/OrderGiverImpl.java     |    4 +-
 .../java/org/videolan/vlma}/ProgramFactory.java    |    8 +-
 .../main/java/org/videolan/vlma/VLMaService.java   |    2 +-
 .../java/org/videolan/vlma/VLMaServiceImpl.java    |   32 ++--
 .../org/videolan/vlma/monitor/OrderMonitor.java    |    2 +-
 .../org/videolan/vlma/monitor/ServerMonitor.java   |    2 +-
 .../org/videolan/vlma/notifier/MailNotifier.java   |    2 +-
 .../org/videolan/vlma/order/CommandLogger.java     |    2 +-
 .../java/org/videolan/vlma/order/OrderSender.java  |    4 +-
 .../videolan/vlma/order/OrderSenderDispatcher.java |    2 +-
 .../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   |   16 +-
 .../org/videolan/vlma/watcher/StreamWatcher.java   |    2 +-
 .../vlma/watcher/StreamWatcherDispatcher.java      |    2 +-
 .../vlma/watcher/StreamWatcherMockImpl.java        |    2 +-
 vlma-daemon/pom.xml                                |   10 -
 .../main/java/org/videolan/vlma/daemon/VLMad.java  |    5 +-
 vlma-daemon/src/main/resources/daemon.xml          |    8 +-
 vlma-model/.gitignore                              |    4 -
 vlma-model/pom.xml                                 |   51 ----
 .../vlma/model/adapter/AbstractAdapter.java        |   80 ------
 .../org/videolan/vlma/model/adapter/package.html   |    5 -
 .../videolan/vlma/model/media/AbstractMedia.java   |   78 ------
 .../org/videolan/vlma/model/media/TNTChannel.java  |  169 -------------
 .../videolan/vlma/model/program/ProgramImpl.java   |  188 --------------
 .../org/videolan/vlma/model/program/package.html   |    6 -
 .../org/videolan/vlma/model/server/Server.java     |  111 --------
 .../vlma/web/media/MediaProgramAddController.java  |    2 +-
 .../web/media/file/FileChannelAddController.java   |    2 +-
 .../web/media/file/FileChannelEditController.java  |    2 +-
 .../media/stream/StreamChannelAddController.java   |    2 +-
 .../media/stream/StreamChannelEditController.java  |    2 +-
 .../web/server/ServerAdapterAddController.java     |    2 +-
 .../vlma/web/server/ServerAdapterAddValidator.java |    2 +-
 .../web/server/ServerAdapterRemoveController.java  |    2 +-
 .../vlma/web/server/ServerAddValidator.java        |    2 +-
 .../vlma/web/server/ServerRemoveController.java    |    2 +-
 .../vlma/web/server/ServerRemoveValidator.java     |    2 +-
 .../vlma/web/server/ServerViewController.java      |    2 +-
 .../videolan/vlma/web/servlet/RrdGraphServlet.java |    2 +-
 86 files changed, 631 insertions(+), 1238 deletions(-)

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