Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv20344
Modified Files:
BlockUrlConverter.java Url.java
Log Message:
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
Index: BlockUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BlockUrlConverter.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- BlockUrlConverter.java 25 Oct 2008 09:34:29 -0000 1.11
+++ BlockUrlConverter.java 27 Oct 2008 17:16:34 -0000 1.12
@@ -25,7 +25,7 @@
* URLConverters would probably like this, and can extend from this.
*
* @author Michiel Meeuwissen
- * @version $Id: BlockUrlConverter.java,v 1.11 2008/10/25 09:34:29 michiel Exp
$
+ * @version $Id: BlockUrlConverter.java,v 1.12 2008/10/27 17:16:34 michiel Exp
$
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -194,7 +194,7 @@
String u = BasicUrlConverter.getUrl(niceUrl.getUrl(), map,
request, escapeAmps);
log.debug("Returning actual url " + u);
- return new Url(this, u, niceUrl.getQuality());
+ return Url.createUrl(this, u, niceUrl.getQuality());
} else {
return Url.NOT;
}
Index: Url.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/Url.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- Url.java 25 Oct 2008 09:34:29 -0000 1.3
+++ Url.java 27 Oct 2008 17:16:34 -0000 1.4
@@ -14,35 +14,31 @@
import org.mmbase.util.functions.*;
/**
-
+ * An Url object is the result of [EMAIL PROTECTED] UrlConverter}s. It basicly
bundles a String ([EMAIL PROTECTED]
+ * #getUrl}) with a 'quality' of this string.
*
* @author Michiel Meeuwissen
- * @version $Id: Url.java,v 1.3 2008/10/25 09:34:29 michiel Exp $
+ * @version $Id: Url.java,v 1.4 2008/10/27 17:16:34 michiel Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
-public class Url {
- private final String url;
+public abstract class Url {
private final UrlConverter urlConverter;
private int quality = 0;
- public Url(UrlConverter uc, String url) {
+ public Url(UrlConverter uc) {
this.url = url;
this.urlConverter = uc;
}
- public Url(UrlConverter uc, String url, int q) {
- this.url = url;
+ public Url(UrlConverter uc, int q) {
this.quality = q;
this.urlConverter = uc;
}
- public Url(Url u, int q) {
- this.url = u.url;
- this.urlConverter = u.urlConverter;
- this.quality = q;
- }
- public String getUrl() {
- return url;
- }
+ /**
+ * The actuall url as a String.
+ */
+ public abstract String getUrl();
+
public int getQuality() {
return quality;
}
@@ -50,10 +46,17 @@
return urlConverter;
}
- public static final Url NOT = new Url(null, null, Integer.MIN_VALUE);
-
public String toString() {
return url == null ? "NULL" : url;
}
+ public static final Url NOT = new Url(null, Integer.MIN_VALUE) {
+ public String getUrl() { return null; }
+ };
+
+ public static Url createUrl(UrlConverter uc, final String url, int
quality) {
+ return new Url(uc, quality) {
+ public String getUrl() { return url; }
+ };
+ }
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
