Update of /var/cvs/contributions/didactor2/src/core/java/nl/didactor/filter
In directory james.mmbase.org:/tmp/cvs-serv6063
Modified Files:
DidactorUrlConverter.java
Log Message:
made compile again
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/core/java/nl/didactor/filter
Index: DidactorUrlConverter.java
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/core/java/nl/didactor/filter/DidactorUrlConverter.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- DidactorUrlConverter.java 22 Oct 2008 08:52:14 -0000 1.10
+++ DidactorUrlConverter.java 30 Oct 2008 08:53:15 -0000 1.11
@@ -20,7 +20,7 @@
*
* @author Michiel Meeuwissen
- * @version $Id: DidactorUrlConverter.java,v 1.10 2008/10/22 08:52:14 michiel
Exp $
+ * @version $Id: DidactorUrlConverter.java,v 1.11 2008/10/30 08:53:15 michiel
Exp $
*/
public class DidactorUrlConverter extends DirectoryUrlConverter {
private static final Logger log =
Logging.getLoggerInstance(DidactorUrlConverter.class);
@@ -47,17 +47,17 @@
}
- @Override protected String getFilteredInternalDirectoryUrl(List<String>
path, Map<String, Object> blockParameters, Parameters frameworkParameters)
throws FrameworkException {
+ @Override protected Url getFilteredInternalDirectoryUrl(List<String> path,
Map<String, Object> blockParameters, Parameters frameworkParameters) throws
FrameworkException {
StringBuilder result = new StringBuilder("/shared/render.jspx");
// article mode
if (path.size() == 0) {
log.debug("No component in path");
- return null;
+ return Url.NOT;
}
Component component =
ComponentRepository.getInstance().getComponent(path.get(0));
if (component == null) {
log.debug("No didactor component in " + path);
- return null;
+ return Url.NOT;
}
Setting<String> setting = (Setting<String>)
component.getSetting("didactor_nodeprovider");
String value = "education";
@@ -78,7 +78,7 @@
if (block == null) return null;
result.append("&block=");
result.append(block.getName());
- return result.toString();
+ return new BasicUrl(this, result.toString());
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
