Update of
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers
In directory james.mmbase.org:/tmp/cvs-serv18825/urlcomposers
Modified Files:
FragmentURLComposer.java MarkupURLComposer.java
RamURLComposer.java RealURLComposer.java URLComposer.java
Log Message:
Added @Override tags
See also:
http://cvs.mmbase.org/viewcvs/applications/media/src/org/mmbase/applications/media/urlcomposers
Index: FragmentURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/FragmentURLComposer.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- FragmentURLComposer.java 21 Jun 2007 15:50:20 -0000 1.14
+++ FragmentURLComposer.java 16 Apr 2009 10:28:07 -0000 1.15
@@ -28,6 +28,8 @@
public class FragmentURLComposer extends URLComposer {
protected MMObjectNode fragment;
+
+ @Override
public void init(MMObjectNode provider, MMObjectNode source, MMObjectNode
fragment, Map<String, Object> info, Set<MMObjectNode> cacheExpireObjects) {
super.init(provider, source, fragment, info, cacheExpireObjects);
@@ -38,8 +40,11 @@
this.fragment = fragment;
}
- public MMObjectNode getFragment() { return fragment; }
+ public MMObjectNode getFragment() {
+ return fragment;
+ }
+ @Override
public boolean isAvailable() {
Boolean fragmentAvailable;
if (fragment != null) {
@@ -53,6 +58,7 @@
/**
* @see java.lang.Object#equals(java.lang.Object)
*/
+ @Override
public boolean equals(Object o) {
if (super.equals(o)) {
FragmentURLComposer r = (FragmentURLComposer) o;
@@ -65,6 +71,7 @@
/**
* @see java.lang.Object#hashCode()
*/
+ @Override
public int hashCode() {
return HashCodeUtil.hashCode(super.hashCode(), fragment);
}
Index: MarkupURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/MarkupURLComposer.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- MarkupURLComposer.java 21 Jun 2007 15:50:20 -0000 1.9
+++ MarkupURLComposer.java 16 Apr 2009 10:28:07 -0000 1.10
@@ -49,7 +49,7 @@
* that the source-format must be Real, if the templates language
* is SMIL (this is perhaps too limited).
*/
-
+ @Override
public boolean canCompose() {
MMObjectNode template = getTemplate();
if (template == null) return false;
@@ -57,7 +57,7 @@
if (getFormat() == Format.SMIL && !( sourceFormat == Format.RM ||
sourceFormat == Format.RA)) return false;
return true;
}
-
+ @Override
protected StringBuffer getURLBuffer() {
MMObjectNode template = getTemplate();
if (template != null) {
@@ -75,13 +75,15 @@
}
}
+
+ @Override
public String getGUIIndicator(Map<String,Locale> options) {
Locale locale = options.get("locale");
Format sourceFormat = Format.get(source.getIntValue("format"));
return super.getGUIIndicator(options) + " (" +
sourceFormat.getGUIIndicator(locale) + ")";
}
-
+ @Override
public String getDescription(Map<String,Locale> options) {
Locale locale = options.get("locale");
ResourceBundle m =
ResourceBundle.getBundle("org.mmbase.applications.media.urlcomposers.resources.markupurlcomposer",
locale);
@@ -98,7 +100,7 @@
/**
* Depends on mimetype of the template to return the format of this
urlcomposer.
*/
-
+ @Override
public Format getFormat() {
MMObjectNode template = getTemplate();
if (template == null) return Format.HTML;
Index: RamURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/RamURLComposer.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -b -r1.17 -r1.18
--- RamURLComposer.java 21 Jun 2007 15:50:20 -0000 1.17
+++ RamURLComposer.java 16 Apr 2009 10:28:07 -0000 1.18
@@ -35,11 +35,13 @@
protected Format format;
+ @Override
public void init(MMObjectNode provider, MMObjectNode source, MMObjectNode
fragment, Map<String, Object> info, Set<MMObjectNode> cacheExpireObjects) {
super.init(provider, source, fragment, info, cacheExpireObjects);
format = Format.get(source.getIntValue("format"));
}
+ @Override
protected StringBuffer getURLBuffer() {
List<String> servlets = MMBaseServlet.getServletMappings("media-" +
format);
String servlet;
@@ -55,7 +57,7 @@
return new StringBuffer("http://"; + Config.host + servlet +
"?fragment=" + (fragment == null ? "" : "" + fragment.getNumber()) + "&source="
+ (source == null ? "" : "" + source.getNumber()));
}
-
+ @Override
public Format getFormat() {
if (format == Format.RM) return Format.RAM;
if (format == Format.ASF) return Format.WMP;
Index: RealURLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/RealURLComposer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- RealURLComposer.java 21 Jun 2007 15:50:20 -0000 1.19
+++ RealURLComposer.java 16 Apr 2009 10:28:07 -0000 1.20
@@ -22,6 +22,7 @@
public class RealURLComposer extends FragmentURLComposer {
+ @Override
protected StringBuffer getURLBuffer() {
StringBuffer buff = super.getURLBuffer();
if (getFormat().equals(Format.RM)) {
Index: URLComposer.java
===================================================================
RCS file:
/var/cvs/applications/media/src/org/mmbase/applications/media/urlcomposers/URLComposer.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
