annotate src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorAnnotations.java @ 16:794077e6288c

CLOSED - # 252: Tags for Annotations https://it-dev.mpiwg-berlin.mpg.de/tracs/mpdl-project-software/ticket/252
author casties
date Tue, 04 Sep 2012 20:02:59 +0200
parents 58357a4b86de
children 715aa11d138b
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
1 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
2 * Implements the "annotations" uri of the Annotator API. see
47b53ae385d1 merging old code
casties
parents:
diff changeset
3 * <https://github.com/okfn/annotator/wiki/Storage>
47b53ae385d1 merging old code
casties
parents:
diff changeset
4 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
5 package de.mpiwg.itgroup.annotations.restlet;
47b53ae385d1 merging old code
casties
parents:
diff changeset
6
47b53ae385d1 merging old code
casties
parents:
diff changeset
7 import java.io.IOException;
47b53ae385d1 merging old code
casties
parents:
diff changeset
8
47b53ae385d1 merging old code
casties
parents:
diff changeset
9 import org.json.JSONException;
47b53ae385d1 merging old code
casties
parents:
diff changeset
10 import org.json.JSONObject;
47b53ae385d1 merging old code
casties
parents:
diff changeset
11 import org.restlet.data.Status;
47b53ae385d1 merging old code
casties
parents:
diff changeset
12 import org.restlet.ext.json.JsonRepresentation;
47b53ae385d1 merging old code
casties
parents:
diff changeset
13 import org.restlet.representation.Representation;
47b53ae385d1 merging old code
casties
parents:
diff changeset
14 import org.restlet.resource.Delete;
47b53ae385d1 merging old code
casties
parents:
diff changeset
15 import org.restlet.resource.Get;
47b53ae385d1 merging old code
casties
parents:
diff changeset
16 import org.restlet.resource.Post;
47b53ae385d1 merging old code
casties
parents:
diff changeset
17 import org.restlet.resource.Put;
47b53ae385d1 merging old code
casties
parents:
diff changeset
18
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
19 import de.mpiwg.itgroup.annotations.Annotation;
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
20 import de.mpiwg.itgroup.annotations.Person;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
21 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
22
47b53ae385d1 merging old code
casties
parents:
diff changeset
23 /**
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
24 * Implements the "annotations" uri of the Annotator API. see
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
25 * <https://github.com/okfn/annotator/wiki/Storage>
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
26 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
27 * @author dwinter, casties
47b53ae385d1 merging old code
casties
parents:
diff changeset
28 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
29 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
30 public class AnnotatorAnnotations extends AnnotatorResourceImpl {
47b53ae385d1 merging old code
casties
parents:
diff changeset
31
47b53ae385d1 merging old code
casties
parents:
diff changeset
32 protected String getAllowedMethodsForHeader() {
47b53ae385d1 merging old code
casties
parents:
diff changeset
33 return "OPTIONS,GET,POST,PUT,DELETE";
47b53ae385d1 merging old code
casties
parents:
diff changeset
34 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
35
47b53ae385d1 merging old code
casties
parents:
diff changeset
36 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
37 * GET with JSON content-type.
47b53ae385d1 merging old code
casties
parents:
diff changeset
38 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
39 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
40 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
41 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
42 @Get("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
43 public Representation doGetJSON(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
44 logger.debug("AnnotatorAnnotations doGetJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
45 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
46 // id from URI /annotations/{id}
47b53ae385d1 merging old code
casties
parents:
diff changeset
47 String jsonId = (String) getRequest().getAttributes().get("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
48 String id = decodeJsonId(jsonId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
49 logger.debug("annotation-id=" + id);
47b53ae385d1 merging old code
casties
parents:
diff changeset
50
47b53ae385d1 merging old code
casties
parents:
diff changeset
51 // TODO: what to return without id - list of all annotations?
47b53ae385d1 merging old code
casties
parents:
diff changeset
52
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
53 // do authentication
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
54 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
55 logger.debug("request authenticated=" + authUser);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
56
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
57 AnnotationStore store = getAnnotationStore();
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
58 Annotation annot = store.getAnnotationById(id);
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
59 if (annot != null) {
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
60 if (! annot.isActionAllowed("read", authUser, store)) {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
61 setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!");
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
62 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
63 }
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
64 JSONObject result = createAnnotatorJson(annot, (authUser == null));
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
65 logger.debug("sending:");
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
66 logger.debug(result);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
67 return new JsonRepresentation(result);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
68 } else {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
69 // not found
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
70 setStatus(Status.CLIENT_ERROR_NOT_FOUND);
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
71 return null;
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
72 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
73 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
74
47b53ae385d1 merging old code
casties
parents:
diff changeset
75 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
76 * POST with JSON content-type.
47b53ae385d1 merging old code
casties
parents:
diff changeset
77 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
78 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
79 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
80 @Post("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
81 public Representation doPostJson(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
82 logger.debug("AnnotatorAnnotations doPostJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
83 // set headers
47b53ae385d1 merging old code
casties
parents:
diff changeset
84 setCorsHeaders();
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
85
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
86 // do authentication TODO: who's allowed to create?
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
87 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
88 logger.debug("request authenticated=" + authUser);
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
89 if (authUser == null) {
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
90 setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!");
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
91 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
92 }
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
93
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
94 Annotation annot = null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
95 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
96 JsonRepresentation jrep = new JsonRepresentation(entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
97 JSONObject jo = jrep.getJsonObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
98 if (jo == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
99 setStatus(Status.SERVER_ERROR_INTERNAL);
47b53ae385d1 merging old code
casties
parents:
diff changeset
100 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
101 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
102 // make sure id is not set for POST
47b53ae385d1 merging old code
casties
parents:
diff changeset
103 jo.remove("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
104 // get Annotation object from posted JSON
47b53ae385d1 merging old code
casties
parents:
diff changeset
105 annot = createAnnotation(jo, entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
106 } catch (IOException e1) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
107 setStatus(Status.SERVER_ERROR_INTERNAL);
47b53ae385d1 merging old code
casties
parents:
diff changeset
108 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
109 } catch (JSONException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
110 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
111 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
112 }
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
113 if (annot == null) {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
114 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
115 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
116 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
117 Annotation storedAnnot;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
118 // store Annotation
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
119 storedAnnot = getAnnotationStore().storeAnnotation(annot);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
120 /*
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
121 * according to https://github.com/okfn/annotator/wiki/Storage we should
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
122 * return 303: see other. For now we return the annotation.
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
123 */
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
124 JSONObject jo = createAnnotatorJson(storedAnnot, (authUser == null));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
125 JsonRepresentation retRep = new JsonRepresentation(jo);
47b53ae385d1 merging old code
casties
parents:
diff changeset
126 return retRep;
47b53ae385d1 merging old code
casties
parents:
diff changeset
127 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
128
47b53ae385d1 merging old code
casties
parents:
diff changeset
129 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
130 * PUT with JSON content-type.
47b53ae385d1 merging old code
casties
parents:
diff changeset
131 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
132 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
133 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
134 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
135 @Put("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
136 public Representation doPutJSON(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
137 logger.debug("AnnotatorAnnotations doPutJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
138 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
139 // id from URI /annotations/{id}
47b53ae385d1 merging old code
casties
parents:
diff changeset
140 String jsonId = (String) getRequest().getAttributes().get("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
141 String id = decodeJsonId(jsonId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
142 logger.debug("annotation-id=" + id);
47b53ae385d1 merging old code
casties
parents:
diff changeset
143
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
144 // do authentication
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
145 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
146 logger.debug("request authenticated=" + authUser);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
147
47b53ae385d1 merging old code
casties
parents:
diff changeset
148 Annotation annot = null;
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
149 AnnotationStore store = getAnnotationStore();
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
150 try {
47b53ae385d1 merging old code
casties
parents:
diff changeset
151 JsonRepresentation jrep = new JsonRepresentation(entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
152 JSONObject jo = jrep.getJsonObject();
47b53ae385d1 merging old code
casties
parents:
diff changeset
153 if (jo == null) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
154 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
155 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
156 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
157 // get stored Annotation
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
158 Annotation storedAnnot = store.getAnnotationById(id);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
159 if (storedAnnot == null) {
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
160 setStatus(Status.CLIENT_ERROR_NOT_FOUND);
47b53ae385d1 merging old code
casties
parents:
diff changeset
161 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
162 }
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
163 if (! storedAnnot.isActionAllowed("update", authUser, store)) {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
164 setStatus(Status.CLIENT_ERROR_FORBIDDEN);
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
165 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
166 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
167 // update from posted JSON
47b53ae385d1 merging old code
casties
parents:
diff changeset
168 annot = updateAnnotation(storedAnnot, jo, entity);
47b53ae385d1 merging old code
casties
parents:
diff changeset
169 // store Annotation
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
170 storedAnnot = store.storeAnnotation(annot);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
171 /*
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
172 * according to https://github.com/okfn/annotator/wiki/Storage we
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
173 * should return 303: see other. but the client doesn't like it
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
174 * setStatus(Status.REDIRECTION_SEE_OTHER); // go to same URL as
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
175 * this one Reference thisUrl = this.getReference();
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
176 * this.getResponse().setLocationRef(thisUrl);
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
177 */
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
178 // return new annotation
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
179 jo = createAnnotatorJson(storedAnnot, (authUser == null));
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
180 JsonRepresentation retRep = new JsonRepresentation(jo);
47b53ae385d1 merging old code
casties
parents:
diff changeset
181 return retRep;
47b53ae385d1 merging old code
casties
parents:
diff changeset
182 } catch (JSONException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
183 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
184 setStatus(Status.CLIENT_ERROR_BAD_REQUEST);
47b53ae385d1 merging old code
casties
parents:
diff changeset
185 } catch (IOException e) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
186 e.printStackTrace();
47b53ae385d1 merging old code
casties
parents:
diff changeset
187 setStatus(Status.SERVER_ERROR_INTERNAL, "Other Error");
47b53ae385d1 merging old code
casties
parents:
diff changeset
188 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
189 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
190 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
191
47b53ae385d1 merging old code
casties
parents:
diff changeset
192 /**
47b53ae385d1 merging old code
casties
parents:
diff changeset
193 * DELETE with JSON content-type.
47b53ae385d1 merging old code
casties
parents:
diff changeset
194 *
47b53ae385d1 merging old code
casties
parents:
diff changeset
195 * @param entity
47b53ae385d1 merging old code
casties
parents:
diff changeset
196 * @return
47b53ae385d1 merging old code
casties
parents:
diff changeset
197 */
47b53ae385d1 merging old code
casties
parents:
diff changeset
198 @Delete("json")
47b53ae385d1 merging old code
casties
parents:
diff changeset
199 public Representation doDeleteJSON(Representation entity) {
47b53ae385d1 merging old code
casties
parents:
diff changeset
200 logger.debug("AnnotatorAnnotations doDeleteJSON!");
47b53ae385d1 merging old code
casties
parents:
diff changeset
201 setCorsHeaders();
47b53ae385d1 merging old code
casties
parents:
diff changeset
202 // id from URI /annotations/{id}
47b53ae385d1 merging old code
casties
parents:
diff changeset
203 String jsonId = (String) getRequest().getAttributes().get("id");
47b53ae385d1 merging old code
casties
parents:
diff changeset
204 String id = decodeJsonId(jsonId);
47b53ae385d1 merging old code
casties
parents:
diff changeset
205 logger.debug("annotation-id=" + id);
47b53ae385d1 merging old code
casties
parents:
diff changeset
206
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
207 // do authentication
15
58357a4b86de ASSIGNED - # 249: Annotations shared in groups
casties
parents: 14
diff changeset
208 Person authUser = Person.createPersonWithId(this.checkAuthToken(entity));
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
209 logger.debug("request authenticated=" + authUser);
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
210 AnnotationStore store = getAnnotationStore();
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
211 Annotation annot = store.getAnnotationById(id);
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
212 if (annot != null) {
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
213 if (! annot.isActionAllowed("delete", authUser, store)) {
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
214 setStatus(Status.CLIENT_ERROR_FORBIDDEN, "Not Authorized!");
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
215 return null;
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
216 }
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
217 }
14
629e15b345aa permissions mostly work. need more server-side checking.
casties
parents: 4
diff changeset
218
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
219 // delete annotation
16
794077e6288c CLOSED - # 252: Tags for Annotations
casties
parents: 15
diff changeset
220 store.deleteById(id);
4
3599b29c393f store seems to work now :-)
casties
parents: 3
diff changeset
221 setStatus(Status.SUCCESS_NO_CONTENT);
3
47b53ae385d1 merging old code
casties
parents:
diff changeset
222 return null;
47b53ae385d1 merging old code
casties
parents:
diff changeset
223 }
47b53ae385d1 merging old code
casties
parents:
diff changeset
224
47b53ae385d1 merging old code
casties
parents:
diff changeset
225 }