Mercurial > hg > AnnotationManagerN4J
changeset 8:c3cc6a41dd1c
under construction
author | casties |
---|---|
date | Thu, 12 Jul 2012 11:14:39 +0200 |
parents | 798a65338565 |
children | b2bfc3bc9ba8 |
files | src/main/java/de/mpiwg/itgroup/annotations/Annotation.java src/main/java/de/mpiwg/itgroup/annotations/Person.java src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java |
diffstat | 3 files changed, 20 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/annotations/Annotation.java Wed Jul 11 17:17:32 2012 +0200 +++ b/src/main/java/de/mpiwg/itgroup/annotations/Annotation.java Thu Jul 12 11:14:39 2012 +0200 @@ -61,6 +61,8 @@ */ protected String created; + protected String adminPermission; + /** * @return the uri */
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/mpiwg/itgroup/annotations/Person.java Thu Jul 12 11:14:39 2012 +0200 @@ -0,0 +1,12 @@ +/** + * + */ +package de.mpiwg.itgroup.annotations; + +/** + * @author casties + * + */ +public class Person { + +}
--- a/src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java Wed Jul 11 17:17:32 2012 +0200 +++ b/src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java Thu Jul 12 11:14:39 2012 +0200 @@ -37,7 +37,7 @@ protected List<Index<Node>> nodeIndexes; public static enum RelationTypes implements RelationshipType { - ANNOTATES, CREATED + ANNOTATES, CREATED, PERMITS } public static String ANNOTATION_URI_BASE = "http://entities.mpiwg-berlin.mpg.de/annotations/"; @@ -64,7 +64,7 @@ */ public Annotation getAnnotationById(String id) { Node annotNode = getNodeIndex(NodeTypes.ANNOTATION).get("id", id).getSingle(); - Annotation annot = createAnnotation(annotNode); + Annotation annot = createAnnotationFromNode(annotNode); return annot; } @@ -74,7 +74,7 @@ * @param annotNode * @return */ - public Annotation createAnnotation(Node annotNode) { + public Annotation createAnnotationFromNode(Node annotNode) { Annotation annot = new Annotation(); annot.setUri((String) annotNode.getProperty("id", null)); annot.setBodyText((String) annotNode.getProperty("bodyText", null)); @@ -187,7 +187,7 @@ } // re-read and return annotation - Annotation storedAnnot = createAnnotation(annotNode); + Annotation storedAnnot = createAnnotationFromNode(annotNode); return storedAnnot; } @@ -220,7 +220,6 @@ tx.finish(); } } - } /** @@ -244,7 +243,7 @@ for (Relationship relation : relations) { Node ann = relation.getStartNode(); if (ann.getProperty("TYPE", "").equals("ANNOTATION")) { - Annotation annot = createAnnotation(ann); + Annotation annot = createAnnotationFromNode(ann); annotations.add(annot); } else { logger.error("ANNOTATES relation does not start with ANNOTATION: " @@ -262,7 +261,7 @@ for (Relationship relation : relations) { Node ann = relation.getEndNode(); if (ann.getProperty("TYPE", "").equals("ANNOTATION")) { - Annotation annot = createAnnotation(ann); + Annotation annot = createAnnotationFromNode(ann); annotations.add(annot); } else { logger.error("CREATED relation does not end with ANNOTATION: "