Update of /var/cvs/src/org/mmbase/framework/basic
In directory james.mmbase.org:/tmp/cvs-serv17954
Modified Files:
BlockUrlConverter.java MMBaseUrlConverter.java
Log Message:
view source links in editwizard examples were broken
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.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- BlockUrlConverter.java 20 Oct 2008 16:45:11 -0000 1.1
+++ BlockUrlConverter.java 20 Oct 2008 17:03:31 -0000 1.2
@@ -25,7 +25,7 @@
* URLConverters would probably like this, and can extend from this.
*
* @author Michiel Meeuwissen
- * @version $Id: BlockUrlConverter.java,v 1.1 2008/10/20 16:45:11 michiel Exp $
+ * @version $Id: BlockUrlConverter.java,v 1.2 2008/10/20 17:03:31 michiel Exp $
* @since MMBase-1.9
* @todo EXPERIMENTAL
*/
@@ -66,17 +66,23 @@
* Framework#BLOCK} framework parameters to determin the explicit block
for [EMAIL PROTECTED] #getUrl},
* which may often be what you want.
*/
- protected Block getExplicitBlock(Parameters frameworkParameters) throws
FrameworkException {
+ protected Block getExplicitBlock(String path, Parameters
frameworkParameters) throws FrameworkException {
String componentName = frameworkParameters.get(Framework.COMPONENT);
if (componentName != null) {
+ log.debug("Found component " + componentName);
Component component =
ComponentRepository.getInstance().getComponent(componentName);
if (component == null) throw new FrameworkException("No such
component " + componentName);
String blockName = frameworkParameters.get(Framework.BLOCK);
if (blockName == null) {
log.debug("found explicit component " + component);
+ if (path != null && ! "".equals(path)) {
+ return component.getBlock(path);
+ } else {
return component.getDefaultBlock();
+ }
} else {
Block block = component.getBlock(blockName);
+ if (path != null && ! "".equals(path)) throw new
IllegalArgumentException("Cannot use both 'path' argument ('" + path + "') and
'block' parameter ('" + frameworkParameters + "' -> " + block + ")");
if (block == null) throw new FrameworkException("No such block
" + blockName);
log.debug("found explicit block " + block);
return block;
@@ -98,13 +104,12 @@
State state = State.getState(request);
// First explore
- Block block = getExplicitBlock(frameworkParameters);
+ Block block = getExplicitBlock(path, frameworkParameters);
if (block != null) {
if (components != null && !
components.contains(block.getComponent())) {
log.debug("Explicit block, but not mine one");
return null;
}
- if (path != null && ! "".equals(path)) throw new
IllegalArgumentException("Cannot use both 'path' argument and 'block'
parameter");
return block;
}
Index: MMBaseUrlConverter.java
===================================================================
RCS file: /var/cvs/src/org/mmbase/framework/basic/MMBaseUrlConverter.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- MMBaseUrlConverter.java 20 Oct 2008 16:45:11 -0000 1.14
+++ MMBaseUrlConverter.java 20 Oct 2008 17:03:31 -0000 1.15
@@ -20,7 +20,7 @@
* was configured for this prefix).
*
* @author Michiel Meeuwissen
- * @version $Id: MMBaseUrlConverter.java,v 1.14 2008/10/20 16:45:11 michiel
Exp $
+ * @version $Id: MMBaseUrlConverter.java,v 1.15 2008/10/20 17:03:31 michiel
Exp $
* @since MMBase-1.9
*/
public class MMBaseUrlConverter extends DirectoryUrlConverter {
@@ -104,7 +104,7 @@
}
}
if (! categoryOk) {
- log.debug("No sBuch component clasification, ignoring
this");
+ log.debug("No such component clasification, ignoring
this");
return null;
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
