Author: michiel
Date: 2010-02-15 23:09:12 +0100 (Mon, 15 Feb 2010)
New Revision: 41034
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/bridge/ContextProvider.java
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/VirtualNode.java
mmbase/trunk/core/src/main/java/org/mmbase/bridge/util/AbstractFieldValue.java
mmbase/trunk/core/src/main/java/org/mmbase/bridge/util/AbstractNode.java
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/NodeDataType.java
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/Related.java
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/RelatedList.java
Log:
MMB-1917. Factoring out bridge dependencies from Casting
Modified: mmbase/trunk/core/src/main/java/org/mmbase/bridge/ContextProvider.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/bridge/ContextProvider.java
2010-02-15 22:07:50 UTC (rev 41033)
+++ mmbase/trunk/core/src/main/java/org/mmbase/bridge/ContextProvider.java
2010-02-15 22:09:12 UTC (rev 41034)
@@ -14,8 +14,7 @@
import java.io.*;
import java.net.URL;
import java.net.URLConnection;
-import org.mmbase.util.ResourceLoader;
-import org.mmbase.util.LocalizedString;
+import org.mmbase.util.*;
import org.mmbase.util.logging.*;
@@ -101,6 +100,7 @@
log.error("During parsing of " + url + ": " + e.getMessage(),
e);
}
}
+ Casting.setHelper(new BridgeCaster());
}
/**
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
2010-02-15 22:07:50 UTC (rev 41033)
+++
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/BasicNode.java
2010-02-15 22:09:12 UTC (rev 41034)
@@ -406,7 +406,7 @@
}
if (nodeManager.hasField(fieldName)) { // only if this is actually a
field of this node-manager, otherewise it might be e.g. a request for an
'element' of a cluster node
Field field = nodeManager.getField(fieldName);
- result =
Casting.toNode(field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_NODE).process(this, field, result), getCloud());
+ result =
BridgeCaster.toNode(field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_NODE).process(this, field, result), getCloud());
}
return result;
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/VirtualNode.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/VirtualNode.java
2010-02-15 22:07:50 UTC (rev 41033)
+++
mmbase/trunk/core/src/main/java/org/mmbase/bridge/implementation/VirtualNode.java
2010-02-15 22:09:12 UTC (rev 41034)
@@ -15,6 +15,7 @@
import org.mmbase.bridge.*;
import org.mmbase.util.Casting;
+import org.mmbase.util.BridgeCaster;
import org.mmbase.bridge.util.*;
import org.mmbase.datatypes.DataType;
import org.mmbase.module.core.VirtualBuilder;
@@ -270,7 +271,7 @@
}
if (nodeManager.hasField(fieldName)) { // only if this is actually a
field of this node-manager, otherewise it might be e.g. a request for an
'element' of a cluster node
Field field = nodeManager.getField(fieldName);
- result =
Casting.toNode(field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_NODE).process(getActualNodeForField(fieldName), field, result),
getCloud());
+ result =
BridgeCaster.toNode(field.getDataType().getProcessor(DataType.PROCESS_GET,
Field.TYPE_NODE).process(getActualNodeForField(fieldName), field, result),
getCloud());
}
return result;
}
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/bridge/util/AbstractFieldValue.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/bridge/util/AbstractFieldValue.java
2010-02-15 22:07:50 UTC (rev 41033)
+++
mmbase/trunk/core/src/main/java/org/mmbase/bridge/util/AbstractFieldValue.java
2010-02-15 22:09:12 UTC (rev 41034)
@@ -11,6 +11,7 @@
package org.mmbase.bridge.util;
import org.mmbase.bridge.*;
import org.mmbase.util.Casting;
+import org.mmbase.util.BridgeCaster;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import java.util.*;
@@ -82,7 +83,7 @@
}
public Node toNode() {
- return Casting.toNode(get(), cloud);
+ return BridgeCaster.toNode(get(), cloud);
}
@Override
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/bridge/util/AbstractNode.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/bridge/util/AbstractNode.java
2010-02-15 22:07:50 UTC (rev 41033)
+++ mmbase/trunk/core/src/main/java/org/mmbase/bridge/util/AbstractNode.java
2010-02-15 22:09:12 UTC (rev 41034)
@@ -124,7 +124,7 @@
setLongValue(fieldName, Casting.toLong(value));
break;
case Field.TYPE_XML: setXMLValue(fieldName, (Document) value);
break;
- case Field.TYPE_NODE: setNodeValue(fieldName,
Casting.toNode(value, getCloud())); break;
+ case Field.TYPE_NODE: setNodeValue(fieldName,
BridgeCaster.toNode(value, getCloud())); break;
case Field.TYPE_DATETIME: setDateValue(fieldName, (Date) value);
break;
case Field.TYPE_BOOLEAN: setBooleanValue(fieldName,
Casting.toBoolean(value)); break;
case Field.TYPE_DECIMAL: setDecimalValue(fieldName,
Casting.toDecimal(value)); break;
@@ -481,7 +481,7 @@
}
public Node getNodeValue(String fieldName) {
- Node result = Casting.toNode(getValueWithoutProcess(fieldName),
getCloud());
+ Node result = BridgeCaster.toNode(getValueWithoutProcess(fieldName),
getCloud());
NodeManager nodeManager = getNodeManager();
if (nodeManager.hasField(fieldName)) { // gui(..) stuff could not work.
Field field = nodeManager.getField(fieldName);
Modified: mmbase/trunk/core/src/main/java/org/mmbase/datatypes/NodeDataType.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/datatypes/NodeDataType.java
2010-02-15 22:07:50 UTC (rev 41033)
+++ mmbase/trunk/core/src/main/java/org/mmbase/datatypes/NodeDataType.java
2010-02-15 22:09:12 UTC (rev 41034)
@@ -11,6 +11,7 @@
import java.util.*;
import org.mmbase.util.Casting;
+import org.mmbase.util.BridgeCaster;
import org.mmbase.util.LocalizedString;
import org.mmbase.bridge.*;
import org.mmbase.util.logging.*;
@@ -62,7 +63,7 @@
return preCast;
} else {
try {
- Node res = Casting.toNode(preCast, getCloud(node, field));
+ Node res = BridgeCaster.toNode(preCast, getCloud(node, field));
if (res == null) {
if (Casting.toString(value).equals("-1")) {
return null;
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/Related.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/Related.java
2010-02-15 22:07:50 UTC (rev 41033)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/Related.java
2010-02-15 22:09:12 UTC (rev 41034)
@@ -204,7 +204,7 @@
log.debug("Found " + rl.size() + " existing relations");
if (value != null) {
Cloud cloud = node.getCloud();
- Node dest = Casting.toNode(value, cloud);
+ Node dest = BridgeCaster.toNode(value, cloud);
boolean related = false;
if (rl.size() == 1) {
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/RelatedList.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/RelatedList.java
2010-02-15 22:07:50 UTC (rev 41033)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/processors/RelatedList.java
2010-02-15 22:09:12 UTC (rev 41034)
@@ -58,7 +58,7 @@
NodeList otherNodes = cloud.getCloudContext().createNodeList();
NodeList relatedNodes = cloud.getCloudContext().createNodeList();
for (Object v : Casting.toList(value)) {
- otherNodes.add(Casting.toNode(v, cloud));
+ otherNodes.add(BridgeCaster.toNode(v, cloud));
}
relatedNodes.addAll(otherNodes);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
