Update of
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep
In directory james.mmbase.org:/tmp/cvs-serv18825/urlcomposers/omroep
Modified Files:
CgiBbURLComposer.java CgiSbURLComposer.java
CgiURLComposer.java RealBbURLComposer.java
RealSbURLComposer.java SimpleRealURLComposer.java
SimpleWmURLComposer.java WmBbURLComposer.java
WmSbURLComposer.java
Log Message:
Added @Override tags
See also:
http://cvs.mmbase.org/viewcvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep
Index: CgiBbURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep/CgiBbURLComposer.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CgiBbURLComposer.java 26 Nov 2003 16:48:36 -0000 1.1
+++ CgiBbURLComposer.java 16 Apr 2009 10:28:07 -0000 1.2
@@ -13,15 +13,17 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: CgiBbURLComposer.java,v 1.1 2003/11/26 16:48:36 michiel Exp $
+ * @version $Id: CgiBbURLComposer.java,v 1.2 2009/04/16 10:28:07 michiel Exp $
* @since MMBase-1.7
*/
public class CgiBbURLComposer extends CgiSbURLComposer {
+ @Override
protected String getBandPrefix() {
return "bb.";
}
+ @Override
protected String getBand() {
return "breedband";
}
Index: CgiSbURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep/CgiSbURLComposer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- CgiSbURLComposer.java 21 Jun 2007 15:50:21 -0000 1.5
+++ CgiSbURLComposer.java 16 Apr 2009 10:28:07 -0000 1.6
@@ -20,7 +20,7 @@
* An example. Produces an URL to the omroep cgi-scripts (for real and wm)
*
* @author Michiel Meeuwissen
- * @version $Id: CgiSbURLComposer.java,v 1.5 2007/06/21 15:50:21 nklasens Exp $
+ * @version $Id: CgiSbURLComposer.java,v 1.6 2009/04/16 10:28:07 michiel Exp $
* @since MMBase-1.7
*/
public class CgiSbURLComposer extends RamURLComposer {
@@ -32,6 +32,7 @@
protected String getBand() {
return "smalband";
}
+ @Override
public String getGUIIndicator(Map<String,Locale> options) {
return super.getGUIIndicator(options) + " (" + getBand() +")";
}
@@ -40,6 +41,7 @@
/**
* These scripts actually wrap the source in a ram or wmp
*/
+ @Override
public Format getFormat() {
Format format = super.getFormat();
if (format == Format.RM) return Format.RAM;
@@ -51,11 +53,12 @@
/**
* Host must be cgi.omroep.nl script.
*/
+ @Override
public boolean canCompose() {
return provider.getStringValue("host").equals("cgi.omroep.nl") &&
provider.getStringValue("rootpath").charAt(0) == '%';
}
-
+ @Override
protected StringBuffer getURLBuffer() {
String rootPath = provider.getStringValue("rootpath").substring(1);
StringBuffer buff = new
StringBuffer(provider.getStringValue("protocol") + "://cgi.omroep.nl" +
rootPath);
Index: CgiURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep/CgiURLComposer.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- CgiURLComposer.java 12 Apr 2006 00:01:21 -0000 1.10
+++ CgiURLComposer.java 16 Apr 2009 10:28:07 -0000 1.11
@@ -19,7 +19,7 @@
* An example. Produces an URL to the omroep cgi-scripts (for real and wm)
*
* @author Michiel Meeuwissen
- * @version $Id: CgiURLComposer.java,v 1.10 2006/04/12 00:01:21 michiel Exp $
+ * @version $Id: CgiURLComposer.java,v 1.11 2009/04/16 10:28:07 michiel Exp $
* @since MMBase-1.7
*/
public class CgiURLComposer extends RamURLComposer {
@@ -27,6 +27,7 @@
/**
* These scripts actually wrap the source in a ram or wmp
*/
+ @Override
public Format getFormat() {
Format format = super.getFormat();
if (format.isReal()) return Format.RAM;
@@ -37,12 +38,13 @@
/**
* Host must be cgi.omroep.nl script.
*/
+ @Override
public boolean canCompose() {
return provider.getStringValue("host").equals("cgi.omroep.nl") &&
(provider.getStringValue("rootpath").charAt(0) != '%');
}
-
+ @Override
protected StringBuffer getURLBuffer() {
String rootpath = provider.getStringValue("rootpath");
StringBuffer buff = new
StringBuffer(provider.getStringValue("protocol") + "://cgi.omroep.nl" +
rootpath);
Index: RealBbURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep/RealBbURLComposer.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- RealBbURLComposer.java 15 Jul 2003 12:26:37 -0000 1.5
+++ RealBbURLComposer.java 16 Apr 2009 10:28:07 -0000 1.6
@@ -13,15 +13,17 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: RealBbURLComposer.java,v 1.5 2003/07/15 12:26:37 vpro Exp $
+ * @version $Id: RealBbURLComposer.java,v 1.6 2009/04/16 10:28:07 michiel Exp $
* @since MMBase-1.7
*/
public class RealBbURLComposer extends RealSbURLComposer {
+ @Override
protected String getBandPrefix() {
return "bb.";
}
+ @Override
protected String getBand() {
return "breedband";
}
Index: RealSbURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep/RealSbURLComposer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- RealSbURLComposer.java 21 Jun 2007 15:50:21 -0000 1.9
+++ RealSbURLComposer.java 16 Apr 2009 10:28:07 -0000 1.10
@@ -18,11 +18,12 @@
* An example. URL's from these kind of URLComposers can contain 'start' and
'end' arguments and so on.
*
* @author Michiel Meeuwissen
- * @version $Id: RealSbURLComposer.java,v 1.9 2007/06/21 15:50:21 nklasens Exp
$
+ * @version $Id: RealSbURLComposer.java,v 1.10 2009/04/16 10:28:07 michiel Exp
$
* @since MMBase-1.7
*/
public class RealSbURLComposer extends RealURLComposer {
+ @Override
public boolean canCompose() {
return provider.getStringValue("host").equals("cgi.omroep.nl") &&
provider.getStringValue("rootpath").charAt(0) == '%';
}
@@ -41,18 +42,18 @@
}
return lastSlash;
}
-
-
protected String getBandPrefix() {
return "sb.";
}
protected String getBand() {
return "smalband";
}
+ @Override
public String getGUIIndicator(Map<String,Locale> options) {
return super.getGUIIndicator(options) + " (" + getBand() +")";
}
+ @Override
protected StringBuffer getURLBuffer() {
StringBuffer buff = new StringBuffer("rtsp://streams.omroep.nl");
int lastSlash = addURL(buff, source.getStringValue("url"));
Index: SimpleRealURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep/SimpleRealURLComposer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SimpleRealURLComposer.java 30 Jan 2005 16:46:36 -0000 1.2
+++ SimpleRealURLComposer.java 16 Apr 2009 10:28:07 -0000 1.3
@@ -16,15 +16,17 @@
* An example. URL's from these kind of URLComposers can contain 'start' and
'end' arguments and so on.
*
* @author Michiel Meeuwissen
- * @version $Id: SimpleRealURLComposer.java,v 1.2 2005/01/30 16:46:36 nico Exp
$
+ * @version $Id: SimpleRealURLComposer.java,v 1.3 2009/04/16 10:28:07 michiel
Exp $
* @since MMBase-1.7
*/
public class SimpleRealURLComposer extends RealURLComposer {
+ @Override
public boolean canCompose() {
return provider.getStringValue("host").equals("cgi.omroep.nl") &&
provider.getStringValue("rootpath").charAt(0) != '%';
}
+ @Override
protected StringBuffer getURLBuffer() {
StringBuffer buff = new StringBuffer("rtsp://streams.omroep.nl" +
source.getStringValue("url"));
RealURLComposer.getRMArgs(buff, fragment, info); // append time,
title, als
Index: SimpleWmURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep/SimpleWmURLComposer.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- SimpleWmURLComposer.java 30 Jan 2005 16:46:36 -0000 1.2
+++ SimpleWmURLComposer.java 16 Apr 2009 10:28:07 -0000 1.3
@@ -14,16 +14,17 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: SimpleWmURLComposer.java,v 1.2 2005/01/30 16:46:36 nico Exp $
+ * @version $Id: SimpleWmURLComposer.java,v 1.3 2009/04/16 10:28:07 michiel
Exp $
* @since MMBase-1.7
*/
public class SimpleWmURLComposer extends URLComposer {
+ @Override
public boolean canCompose() {
return provider.getStringValue("host").equals("cgi.omroep.nl") &&
provider.getStringValue("rootpath").charAt(0) != '%';
}
-
+ @Override
protected StringBuffer getURLBuffer() {
StringBuffer buff = new StringBuffer("mms://media.omroep.nl" +
source.getStringValue("url"));
return buff;
Index: WmBbURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep/WmBbURLComposer.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- WmBbURLComposer.java 15 Jul 2003 12:43:45 -0000 1.6
+++ WmBbURLComposer.java 16 Apr 2009 10:28:07 -0000 1.7
@@ -13,15 +13,17 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: WmBbURLComposer.java,v 1.6 2003/07/15 12:43:45 vpro Exp $
+ * @version $Id: WmBbURLComposer.java,v 1.7 2009/04/16 10:28:07 michiel Exp $
* @since MMBase-1.7
*/
public class WmBbURLComposer extends WmSbURLComposer {
+ @Override
protected String getBandPrefix() {
return "bb.";
}
+ @Override
protected String getBand() {
return "breedband";
}
Index: WmSbURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/omroep/WmSbURLComposer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- WmSbURLComposer.java 21 Jun 2007 15:50:21 -0000 1.9
+++ WmSbURLComposer.java 16 Apr 2009 10:28:07 -0000 1.10
@@ -17,11 +17,12 @@
/**
*
* @author Michiel Meeuwissen
- * @version $Id: WmSbURLComposer.java,v 1.9 2007/06/21 15:50:21 nklasens Exp $
+ * @version $Id: WmSbURLComposer.java,v 1.10 2009/04/16 10:28:07 michiel Exp $
* @since MMBase-1.7
*/
public class WmSbURLComposer extends URLComposer {
+ @Override
public boolean canCompose() {
return provider.getStringValue("host").equals("cgi.omroep.nl") &&
provider.getStringValue("rootpath").charAt(0) == '%';
@@ -34,11 +35,13 @@
protected String getBand() {
return "smalband";
}
+
+ @Override
public String getGUIIndicator(Map<String,Locale> options) {
return super.getGUIIndicator(options) + " (" + getBand() + ")";
}
-
+ @Override
protected StringBuffer getURLBuffer() {
StringBuffer buff = new StringBuffer("mms://media.omroep.nl");
int lastSlash = RealSbURLComposer.addURL(buff,
source.getStringValue("url"));
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
