Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv18753
Modified Files:
BasicUrlConverter.java BlockUrlConverter.java
ChainedUrlConverter.java DirectoryUrlConverter.java
MMBaseUrlConverter.java Url.java UrlConverter.java
Log Message:
quality -> weight
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
Index: BasicUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BasicUrlConverter.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- BasicUrlConverter.java 27 Oct 2008 17:27:37 -0000 1.22
+++ BasicUrlConverter.java 29 Oct 2008 19:42:42 -0000 1.23
@@ -25,7 +25,7 @@
*
*
* @author Michiel Meeuwissen
- * @version $Id: BasicUrlConverter.java,v 1.22 2008/10/27 17:27:37 michiel Exp
$
+ * @version $Id: BasicUrlConverter.java,v 1.23 2008/10/29 19:42:42 michiel Exp
$
* @since MMBase-1.9
*/
public final class BasicUrlConverter implements UrlConverter {
@@ -119,7 +119,7 @@
return true;
}
- public int getDefaultQuality() {
+ public int getDefaultWeight() {
return Integer.MIN_VALUE + 1000;
}
Index: BlockUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/BlockUrlConverter.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- BlockUrlConverter.java 27 Oct 2008 17:27:37 -0000 1.13
+++ BlockUrlConverter.java 29 Oct 2008 19:42:42 -0000 1.14
@@ -25,7 +25,7 @@
* URLConverters would probably like this, and can extend from this.
*
* @author Michiel Meeuwissen
- * @version $Id: BlockUrlConverter.java,v 1.13 2008/10/27 17:27:37 michiel Exp
$
+ * @version $Id: BlockUrlConverter.java,v 1.14 2008/10/29 19:42:42 michiel Exp
$
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -139,7 +139,7 @@
return null;
}
- public int getDefaultQuality() {
+ public int getDefaultWeight() {
return 0;
}
@@ -198,7 +198,7 @@
String u = BasicUrlConverter.getUrl(niceUrl.getUrl(), map,
request, escapeAmps);
log.debug("Returning actual url " + u);
- return new BasicUrl(this, u, niceUrl.getQuality());
+ return new BasicUrl(this, u, niceUrl.getWeight());
} else {
return Url.NOT;
}
Index: ChainedUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/ChainedUrlConverter.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- ChainedUrlConverter.java 29 Oct 2008 10:22:08 -0000 1.18
+++ ChainedUrlConverter.java 29 Oct 2008 19:42:42 -0000 1.19
@@ -28,7 +28,7 @@
* outcome of a converter can be added to the outcome of its preceder.
*
* @author André van Toly
- * @version $Id: ChainedUrlConverter.java,v 1.18 2008/10/29 10:22:08 andre Exp
$
+ * @version $Id: ChainedUrlConverter.java,v 1.19 2008/10/29 19:42:42 michiel
Exp $
* @since MMBase-1.9
*/
public class ChainedUrlConverter implements UrlConverter {
@@ -103,7 +103,7 @@
// return Link.NULL;
// }
- public int getDefaultQuality() {
+ public int getDefaultWeight() {
return 0;
}
@@ -120,10 +120,10 @@
Class preferred = frameworkParameters.get(URLCONVERTER_PARAM);
Url b = u;
if (preferred != null && ! preferred.isInstance(u.getUrlConverter())) {
- b = new BasicUrl(b, Math.min(Integer.MIN_VALUE, b.getQuality() -
10000));
+ b = new BasicUrl(b, Math.min(Integer.MIN_VALUE, b.getWeight() -
10000));
}
if (current != null && u.getUrlConverter() != current) {
- b = new BasicUrl(b, Math.min(Integer.MIN_VALUE, b.getQuality() -
10000));
+ b = new BasicUrl(b, Math.min(Integer.MIN_VALUE, b.getWeight() -
10000));
}
return b;
}
@@ -140,7 +140,7 @@
}
for (UrlConverter uc : uclist) {
Url proposal = getProposal(uc.getUrl(path, params,
frameworkParameters, escapeAmps), frameworkParameters);
- if (proposal.getQuality() > result.getQuality()) {
+ if (proposal.getWeight() > result.getWeight()) {
result = proposal;
}
}
@@ -156,7 +156,7 @@
Url result = Url.NOT;
for (UrlConverter uc : uclist) {
Url proposal = getProposal(uc.getProcessUrl(path, params,
frameworkParameters, escapeAmps), frameworkParameters);
- if (proposal.getQuality() > result.getQuality()) {
+ if (proposal.getWeight() > result.getWeight()) {
result = proposal;
}
}
@@ -173,7 +173,7 @@
Url result = Url.NOT;
for (UrlConverter uc : uclist) {
Url proposal = getProposal(uc.getInternalUrl(path, params,
frameworkParameters), frameworkParameters);
- if (proposal.getQuality() > result.getQuality()) {
+ if (proposal.getWeight() > result.getWeight()) {
result = proposal;
}
Index: DirectoryUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/DirectoryUrlConverter.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- DirectoryUrlConverter.java 29 Oct 2008 14:35:49 -0000 1.15
+++ DirectoryUrlConverter.java 29 Oct 2008 19:42:42 -0000 1.16
@@ -28,7 +28,7 @@
* It is also assumed that the niceness of the URL's is basicly about one
block.
*
* @author Michiel Meeuwissen
- * @version $Id: DirectoryUrlConverter.java,v 1.15 2008/10/29 14:35:49 michiel
Exp $
+ * @version $Id: DirectoryUrlConverter.java,v 1.16 2008/10/29 19:42:42 michiel
Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -47,8 +47,8 @@
if (! directory.startsWith("/")) directory = "/" + directory;
}
- public int getDefaultQuality() {
- return Math.max(Integer.MAX_VALUE, super.getDefaultQuality() + 1000);
+ @Override public int getDefaultWeight() {
+ return Math.max(Integer.MAX_VALUE, super.getDefaultWeight() + 1000);
}
@Override protected final Url getNiceUrl(Block block,
Index: MMBaseUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/MMBaseUrlConverter.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -b -r1.20 -r1.21
--- MMBaseUrlConverter.java 28 Oct 2008 17:40:26 -0000 1.20
+++ MMBaseUrlConverter.java 29 Oct 2008 19:42:42 -0000 1.21
@@ -20,7 +20,7 @@
* was configured for this prefix).
*
* @author Michiel Meeuwissen
- * @version $Id: MMBaseUrlConverter.java,v 1.20 2008/10/28 17:40:26 michiel
Exp $
+ * @version $Id: MMBaseUrlConverter.java,v 1.21 2008/10/29 19:42:42 michiel
Exp $
* @since MMBase-1.9
*/
public class MMBaseUrlConverter extends DirectoryUrlConverter {
@@ -42,8 +42,8 @@
}
- public int getDefaultQuality() {
- return Math.max(Integer.MAX_VALUE, super.getDefaultQuality() + 1000);
+ @Override public int getDefaultWeight() {
+ return Math.max(Integer.MAX_VALUE, super.getDefaultWeight() + 1000);
}
public void setRenderJsp(String j) {
Index: Url.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/Url.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- Url.java 28 Oct 2008 17:40:26 -0000 1.6
+++ Url.java 29 Oct 2008 19:42:42 -0000 1.7
@@ -18,19 +18,19 @@
* #getUrl}) with a 'quality' of this string.
*
* @author Michiel Meeuwissen
- * @version $Id: Url.java,v 1.6 2008/10/28 17:40:26 michiel Exp $
+ * @version $Id: Url.java,v 1.7 2008/10/29 19:42:42 michiel Exp $
* @since MMBase-1.9
*/
public abstract class Url {
private final UrlConverter urlConverter;
- private int quality = 0;
+ private int weight = 0;
public Url(UrlConverter uc) {
this.urlConverter = uc;
- this.quality = uc.getDefaultQuality();
+ this.weight = uc.getDefaultWeight();
}
- public Url(UrlConverter uc, int q) {
- this.quality = q;
+ public Url(UrlConverter uc, int w) {
+ this.weight = w;
this.urlConverter = uc;
}
/**
@@ -38,8 +38,8 @@
*/
public abstract String getUrl();
- public int getQuality() {
- return quality;
+ public int getWeight() {
+ return weight;
}
public UrlConverter getUrlConverter() {
return urlConverter;
@@ -48,8 +48,12 @@
public String toString() {
String url = getUrl();
- return getClass() + " " + getUrlConverter() + " " + (url == null ?
"NULL" : url) + ":" + getQuality();
+ return getClass() + " " + getUrlConverter() + " " + (url == null ?
"NULL" : url) + ":" + getWeight();
}
+
+ /**
+ * NOT is the return value for an UrlConverter which cannot produce an URL
for given parameters.
+ */
public static final Url NOT = new Url(null, Integer.MIN_VALUE) {
public String getUrl() {
return null;
Index: UrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/UrlConverter.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- UrlConverter.java 27 Oct 2008 17:27:37 -0000 1.12
+++ UrlConverter.java 29 Oct 2008 19:42:42 -0000 1.13
@@ -22,7 +22,7 @@
* chained one after another.
*
* @author Michiel Meeuwissen
- * @version $Id: UrlConverter.java,v 1.12 2008/10/27 17:27:37 michiel Exp $
+ * @version $Id: UrlConverter.java,v 1.13 2008/10/29 19:42:42 michiel Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -43,7 +43,7 @@
*/
boolean isFilteredMode(Parameters frameworkParameters) throws
FrameworkException;
- int getDefaultQuality();
+ int getDefaultWeight();
/**
* See [EMAIL PROTECTED] org.mmbase.framework.Framework#getUrl(String,
Map, Parameters, boolean)}.
@@ -55,7 +55,7 @@
* You should escape & when a URL is exposed (i.e.
in HTML), but not if the url is
* for some reason called directly.
* @return An URL relative to the root of this web application (i.e.
without a context
- * path). <code>null</code> if not determinable.
+ * path). [EMAIL PROTECTED] Url.NOT} if not determinable.
* @throws FrameworkException thrown when something goes wrong in the
Framework
*/
Url getUrl(String path,
@@ -80,7 +80,7 @@
* @param params Extra parameters for that path
* @param frameworkParameters The parameters that are required by the
framework, such as the
* 'request' and 'cloud' objects
- * @return A valid internal URL, or <code>null</code> if nothing framework
specific could be
+ * @return A valid internal URL, or [EMAIL PROTECTED] Url.NOT} if nothing
framework specific could be
* determined (this would make it possible to 'chain' frameworks).
* @throws FrameworkException thrown when something goes wrong in the
Framework
*/
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
