Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv19184
Modified Files:
ChainedUrlConverter.java DirectoryUrlConverter.java
MMBaseUrlConverter.java
Log Message:
sigh, that was a thinking error
See also: http://cvs.mmbase.org/viewcvs/src/org/mmbase/framework/basic
Index: ChainedUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/ChainedUrlConverter.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- ChainedUrlConverter.java 29 Oct 2008 19:42:42 -0000 1.19
+++ ChainedUrlConverter.java 29 Oct 2008 19:59:36 -0000 1.20
@@ -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.19 2008/10/29 19:42:42 michiel
Exp $
+ * @version $Id: ChainedUrlConverter.java,v 1.20 2008/10/29 19:59:36 michiel
Exp $
* @since MMBase-1.9
*/
public class ChainedUrlConverter implements UrlConverter {
@@ -120,10 +120,12 @@
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.getWeight() -
10000));
+ int q = b.getWeight();
+ b = new BasicUrl(b, Math.min(q, q - 10000));
}
if (current != null && u.getUrlConverter() != current) {
- b = new BasicUrl(b, Math.min(Integer.MIN_VALUE, b.getWeight() -
10000));
+ int q = b.getWeight();
+ b = new BasicUrl(b, Math.min(q, q - 10000));
}
return b;
}
Index: DirectoryUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/DirectoryUrlConverter.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- DirectoryUrlConverter.java 29 Oct 2008 19:42:42 -0000 1.16
+++ DirectoryUrlConverter.java 29 Oct 2008 19:59:36 -0000 1.17
@@ -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.16 2008/10/29 19:42:42 michiel
Exp $
+ * @version $Id: DirectoryUrlConverter.java,v 1.17 2008/10/29 19:59:36 michiel
Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -48,7 +48,8 @@
}
@Override public int getDefaultWeight() {
- return Math.max(Integer.MAX_VALUE, super.getDefaultWeight() + 1000);
+ int q = super.getDefaultWeight();
+ return Math.max(q, q + 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.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- MMBaseUrlConverter.java 29 Oct 2008 19:42:42 -0000 1.21
+++ MMBaseUrlConverter.java 29 Oct 2008 19:59:36 -0000 1.22
@@ -20,7 +20,7 @@
* was configured for this prefix).
*
* @author Michiel Meeuwissen
- * @version $Id: MMBaseUrlConverter.java,v 1.21 2008/10/29 19:42:42 michiel
Exp $
+ * @version $Id: MMBaseUrlConverter.java,v 1.22 2008/10/29 19:59:36 michiel
Exp $
* @since MMBase-1.9
*/
public class MMBaseUrlConverter extends DirectoryUrlConverter {
@@ -43,9 +43,9 @@
@Override public int getDefaultWeight() {
- return Math.max(Integer.MAX_VALUE, super.getDefaultWeight() + 1000);
+ int q = super.getDefaultWeight();
+ return Math.max(q, q + 1000);
}
-
public void setRenderJsp(String j) {
renderJsp = j;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
