[vlma-devel] commit: MediasProgramAddFormController: Don't prefix channels names with [ TNT], [SAT] or [VLMa]. (Pierre d'Herbemont )

[git version control]

vlma | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Wed Apr  9 14:48:29 2008 +0200| [fd8ec226933792163862ae238111d6a4dac260dd]

MediasProgramAddFormController: Don't prefix channels names with [TNT], [SAT] or [VLMa].

This pollute a bit the playlist, and the info is already present in the SAP group. The provider (TNT/Sat) could probably be added to the meta data of the stream, in replacement.

This patch is probably a bit subjective. But rationally, meta data should go in meta data fields, not in the name of the stream.

Signed-off-by: Adrien Grand <jpountz at videolan.org>

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

 .../web/medias/MediasProgramAddFormController.java |    9 +++------
 1 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/web/src/main/java/org/videolan/vlma/web/medias/MediasProgramAddFormController.java b/web/src/main/java/org/videolan/vlma/web/medias/MediasProgramAddFormController.java
index 31e8cea..a7afcbe 100644
--- a/web/src/main/java/org/videolan/vlma/web/medias/MediasProgramAddFormController.java
+++ b/web/src/main/java/org/videolan/vlma/web/medias/MediasProgramAddFormController.java
@@ -105,14 +105,11 @@ public class MediasProgramAddFormController extends SimpleFormController {
         if (media.getClass() == VlSatChannel.class){
             String country = new String(((VlSatChannel)media).getCountry());  
             if ( country != "")
-                mediasProgramAdd.setSap("[SAT][VLMa][" + country + "] " + media.getName());
+                mediasProgramAdd.setSap("[" + country + "] " + media.getName());
             else
-                mediasProgramAdd.setSap("[SAT][VLMa] " + media.getName());
+                mediasProgramAdd.setSap(media.getName());
         }
-        else if (media.getClass() == VlTNTChannel.class)
-            mediasProgramAdd.setSap("[TNT][VLMa] " + media.getName());
-        else
-            mediasProgramAdd.setSap("[VLMa] " + media.getName());
+            mediasProgramAdd.setSap(media.getName());
             
         mediasProgramAdd.setMediaId(mediaId);
         mediasProgramAdd.setData(data);