Author: michiel
Date: 2010-02-15 23:48:06 +0100 (Mon, 15 Feb 2010)
New Revision: 41042
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/CloudReferrerTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/NodeListHelper.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/NodeReferrerTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/functions/NodeFunctionTag.java
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/Url.java
Log:
MMB-1917
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/CloudReferrerTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/CloudReferrerTag.java
2010-02-15 22:40:25 UTC (rev 41041)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/CloudReferrerTag.java
2010-02-15 22:48:06 UTC (rev 41042)
@@ -130,7 +130,7 @@
log.debug("found a Node Number in Context");
return getCloudVar().getNode(n.toString());
} else {
- return org.mmbase.util.Casting.toNode(n, getCloudVar());
+ return org.mmbase.util.BridgeCaster.toNode(n, getCloudVar());
}
}
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/NodeListHelper.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/NodeListHelper.java
2010-02-15 22:40:25 UTC (rev 41041)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/NodeListHelper.java
2010-02-15 22:48:06 UTC (rev 41042)
@@ -20,7 +20,7 @@
import java.util.*;
import org.mmbase.bridge.*;
-import org.mmbase.util.Casting;
+import org.mmbase.util.BridgeCaster;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -225,7 +225,7 @@
nodes.addAll((Collection<Node>) addObject);
} else {
cloud = getCloud(nodes, cloud);
- nodes.add(Casting.toNode(addObject, cloud));
+ nodes.add(BridgeCaster.toNode(addObject, cloud));
}
}
}
@@ -236,7 +236,7 @@
nodes.retainAll((Collection<Node>) retainObject);
} else {
cloud = getCloud(nodes, cloud);
-
nodes.retainAll(Collections.singletonList((Casting.toNode(retainObject,
cloud))));
+
nodes.retainAll(Collections.singletonList((BridgeCaster.toNode(retainObject,
cloud))));
}
}
}
@@ -247,7 +247,7 @@
nodes.removeAll((Collection<Node>) removeObject);
} else {
cloud = getCloud(nodes, cloud);
- nodes.remove((Casting.toNode(removeObject, cloud)));
+ nodes.remove((BridgeCaster.toNode(removeObject, cloud)));
}
}
}
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/NodeReferrerTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/NodeReferrerTag.java
2010-02-15 22:40:25 UTC (rev 41041)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/NodeReferrerTag.java
2010-02-15 22:48:06 UTC (rev 41042)
@@ -82,7 +82,7 @@
if (o instanceof Node) {
return (Node) o;
} else {
- return org.mmbase.util.Casting.toNode(o, getCloudVar());
+ return org.mmbase.util.BridgeCaster.toNode(o, getCloudVar());
}
}
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/functions/NodeFunctionTag.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/functions/NodeFunctionTag.java
2010-02-15 22:40:25 UTC (rev 41041)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/functions/NodeFunctionTag.java
2010-02-15 22:48:06 UTC (rev 41042)
@@ -18,7 +18,7 @@
import org.mmbase.bridge.jsp.taglib.containers.FunctionContainerReferrer;
import org.mmbase.bridge.jsp.taglib.util.Attribute;
import org.mmbase.bridge.jsp.taglib.util.Notfound;
-import org.mmbase.util.Casting;
+import org.mmbase.util.BridgeCaster;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
@@ -98,7 +98,7 @@
default:
}
}
- Node node = Casting.toNode(value, getCloudVar());
+ Node node = BridgeCaster.toNode(value, getCloudVar());
setNodeVar(node);
fillVars();
return EVAL_BODY;
Modified:
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/Url.java
===================================================================
---
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/Url.java
2010-02-15 22:40:25 UTC (rev 41041)
+++
mmbase/trunk/applications/taglib/src/main/java/org/mmbase/bridge/jsp/taglib/pageflow/Url.java
2010-02-15 22:48:06 UTC (rev 41042)
@@ -18,6 +18,7 @@
import javax.servlet.http.HttpServletResponse;
import org.mmbase.bridge.jsp.taglib.TaglibException;
import org.mmbase.bridge.jsp.taglib.ContextReferrerTag;
+import org.mmbase.util.Caster;
import org.mmbase.util.Casting;
import org.mmbase.util.functions.*;
import org.mmbase.framework.*;
@@ -39,7 +40,7 @@
* @version $Id$;
* @since MMBase-1.9
*/
-public class Url implements Comparable, CharSequence, Casting.Unwrappable {
+public class Url implements Comparable, CharSequence, Caster.Unwrappable {
private static final Logger log = Logging.getLoggerInstance(Url.class);
private static final Logger pageLog =
Logging.getLoggerInstance(Logging.PAGE_CATEGORY);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
