Update of
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions
In directory james.mmbase.org:/tmp/cvs-serv28116/functions
Modified Files:
Functions.java
Log Message:
made same as in 1.8
See also:
http://cvs.mmbase.org/viewcvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions
Index: Functions.java
===================================================================
RCS file:
/var/cvs/applications/taglib/src/org/mmbase/bridge/jsp/taglib/functions/Functions.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- Functions.java 28 Mar 2008 13:04:17 -0000 1.27
+++ Functions.java 23 Jul 2008 17:12:20 -0000 1.28
@@ -37,7 +37,7 @@
</mm:cloud>
* @author Michiel Meeuwissen
* @since MMBase-1.8
- * @version $Id: Functions.java,v 1.27 2008/03/28 13:04:17 michiel Exp $
+ * @version $Id: Functions.java,v 1.28 2008/07/23 17:12:20 michiel Exp $
* @todo EXPERIMENTAL
*/
public class Functions {
@@ -87,7 +87,7 @@
javax.servlet.jsp.PageContext pageContext =
ContextReferrerTag.getThreadPageContext();
ContextTag tag = (ContextTag)
pageContext.getAttribute(ContextTag.CONTEXTTAG_KEY);
CharTransformer ct = ContentTag.getCharTransformer(escaper, tag);
- return ct == null ? "" + Casting.unWrap(string) : ct.transform(""
+ Casting.unWrap(string));
+ return ct == null ? Casting.toString(Casting.unWrap(string)) :
ct.transform(Casting.toString(Casting.unWrap(string)));
} catch (Exception e) {
String mes = "Could not escape " + string + " with escape " +
escaper + " : " + e.getMessage();
log.debug(mes, e);
@@ -138,6 +138,21 @@
return cloud.getNodeManager(nodeManager).getProperty(name);
}
+ /**
+ * @since MMBase-1.8.6
+ */
+ public static Object moduleProperty(String module, String name) {
+ Cloud cloud = (Cloud)
ContextReferrerTag.getThreadPageContext().getAttribute(CloudTag.KEY,
CloudTag.SCOPE);
+ return cloud.getCloudContext().getModule(module).getProperty(name);
+ }
+
+ /**
+ * @since MMBase-1.8.6
+ */
+ public static Object property(String name) {
+ Cloud cloud = (Cloud)
ContextReferrerTag.getThreadPageContext().getAttribute(CloudTag.KEY,
CloudTag.SCOPE);
+ return cloud.getProperty(name);
+ }
/**
* @since MMBase-1.8.4
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
