Author: michiel
Date: 2010-02-09 15:04:04 +0100 (Tue, 09 Feb 2010)
New Revision: 40931
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/AbstractHandler.java
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/JavaRequest.java
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/Request.java
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/BinaryHandler.java
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/HtmlHandler.java
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
Log:
some improvement on this 'handler' stuff (it was sill experimental)
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/AbstractHandler.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/AbstractHandler.java
2010-02-09 14:03:04 UTC (rev 40930)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/AbstractHandler.java
2010-02-09 14:04:04 UTC (rev 40931)
@@ -128,7 +128,7 @@
}
- protected void setValue(Node node, String fieldName, Object value) {
+ protected void setValue(Request request, Node node, String fieldName,
Object value) {
node.setValue(fieldName, value);
}
@@ -146,9 +146,9 @@
return false;
} else {
if ("".equals(fieldValue) && interpretEmptyAsNull(field)) {
- setValue(node, fieldName, null);
+ setValue(request, node, fieldName, null);
} else {
- setValue(node, fieldName, fieldValue);
+ setValue(request, node, fieldName, fieldValue);
}
return true;
}
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/JavaRequest.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/JavaRequest.java
2010-02-09 14:03:04 UTC (rev 40930)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/JavaRequest.java
2010-02-09 14:04:04 UTC (rev 40931)
@@ -25,8 +25,10 @@
private Map<String, Object> values = new HashMap<String, Object>();
+ private boolean post = false;
- public JavaRequest() {
+ public JavaRequest(boolean p) {
+ post = p;
}
public Object put(String f, Object v) {
@@ -51,7 +53,11 @@
return values.get(field.getName() + "_" + part);
}
+ public boolean isPost() {
+ return post;
+ }
+
}
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/Request.java
===================================================================
--- mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/Request.java
2010-02-09 14:03:04 UTC (rev 40930)
+++ mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/Request.java
2010-02-09 14:04:04 UTC (rev 40931)
@@ -52,4 +52,6 @@
*/
<C> C setProperty(Parameter<C> name, C value);
<C> C getProperty(Parameter<C> name);
+
+ boolean isPost();
}
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/BinaryHandler.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/BinaryHandler.java
2010-02-09 14:03:04 UTC (rev 40930)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/BinaryHandler.java
2010-02-09 14:04:04 UTC (rev 40931)
@@ -67,7 +67,7 @@
@Override
- protected void setValue(Node node, String fieldName, Object value) {
+ protected void setValue(Request request, Node node, String fieldName,
Object value) {
if (value == null) {
node.setValue(fieldName, value);
} else {
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/HtmlHandler.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/HtmlHandler.java
2010-02-09 14:03:04 UTC (rev 40930)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/handlers/html/HtmlHandler.java
2010-02-09 14:04:04 UTC (rev 40931)
@@ -95,9 +95,9 @@
log.debug("Setting " + fieldName + " to " +
(fieldValue == null ? "" : fieldValue.getClass().getName()) + " " + fieldValue);
}
if ("".equals(fieldValue) &&
interpretEmptyAsNull(field)) {
- setValue(node, fieldName, null);
+ setValue(request, node, fieldName, null);
} else {
- setValue(node, fieldName, fieldValue);
+ setValue(request, node, fieldName, fieldValue);
}
} catch (Throwable t) {
// may throw exception like 'You cannot change the
field"
Modified:
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
===================================================================
---
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
2010-02-09 14:03:04 UTC (rev 40930)
+++
mmbase/trunk/core/src/main/java/org/mmbase/datatypes/util/xml/DataTypeDefinition.java
2010-02-09 14:04:04 UTC (rev 40931)
@@ -443,20 +443,21 @@
long value = DataTypeXml.getLongValue(conditionElement);
bDataType.setMinLength(value);
setRestrictionData(bDataType.getMinLengthRestriction(),
conditionElement);
- return true;
} else if ("maxLength".equals(localName)) {
long value = DataTypeXml.getLongValue(conditionElement);
bDataType.setMaxLength(value);
setRestrictionData(bDataType.getMaxLengthRestriction(),
conditionElement);
- return true;
} else if ("length".equals(localName)) {
long value = DataTypeXml.getLongValue(conditionElement);
bDataType.setMinLength(value);
setRestrictionData(bDataType.getMinLengthRestriction(),
conditionElement);
bDataType.setMaxLength(value);
setRestrictionData(bDataType.getMaxLengthRestriction(),
conditionElement);
- return true;
+ } else {
+ return false;
}
+ return true;
+
}
return false;
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
