projects
/
lgpl
/
argeo-commons.git
/ blobdiff
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allows to return HTML from serializing views
[lgpl/argeo-commons.git]
/
server
/
runtime
/
org.argeo.server.json
/
src
/
main
/
java
/
org
/
argeo
/
server
/
json
/
GenericJsonDeserializer.java
diff --git
a/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java
b/server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java
index 18c7d3e520bb1472c1c31d1d180652bbb84c6ea3..5c865af961b845b5662efa05c68b75fd1130cbc5 100644
(file)
--- a/
server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java
+++ b/
server/runtime/org.argeo.server.json/src/main/java/org/argeo/server/json/GenericJsonDeserializer.java
@@
-7,7
+7,7
@@
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.argeo.
server.ArgeoServer
Exception;
+import org.argeo.
Argeo
Exception;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonNode;
import org.codehaus.jackson.JsonFactory;
import org.codehaus.jackson.JsonGenerator;
import org.codehaus.jackson.JsonNode;
@@
-61,7
+61,7
@@
public class GenericJsonDeserializer<T> extends JsonDeserializer<T> {
objectFactory = defaultObjectFactory;
if (objectFactory == null || !objectFactory.supports(type))
objectFactory = defaultObjectFactory;
if (objectFactory == null || !objectFactory.supports(type))
- throw new Argeo
Server
Exception(
+ throw new ArgeoException(
"Cannot find JSON object factory for type " + type);
return (T) objectFactory.readValue(type, str);
"Cannot find JSON object factory for type " + type);
return (T) objectFactory.readValue(type, str);