Changeset 9:b2bfc3bc9ba8 in AnnotationManagerN4J for src

Timestamp:

Jul 12, 2012, 10:54:46 AM (13 years ago)

Author:

casties

Branch:

default

Message:

new internal actor class for creator.

Location:

src/main/java/de/mpiwg/itgroup/annotations

Files:

• Actor.java (added)
• Annotation.java (modified) (3 diffs)
• Person.java (deleted)
• neo4j/AnnotationStore.java (modified) (2 diffs)
• restlet/AnnotatorResourceImpl.java (modified) (6 diffs)

src/main/java/de/mpiwg/itgroup/annotations/Annotation.java

@@ -48 +48 @@
     
     /**
-     * The URI of the creator of this annotation.
+     * The creator of this annotation.
      */
-    protected String creatorUri;
-    
-    /**
-     * The full name of the creator of this annotation.
-     */
-    protected String creatorName;
+    protected Actor creator;
     
     /**
@@ -149 +144 @@
 
     /**
+     * @return the creator
+     */
+    public Actor getCreator() {
+        return creator;
+    }
+
+    /**
+     * @param creator the creator to set
+     */
+    public void setCreator(Actor creator) {
+        this.creator = creator;
+    }
+
+    /**
      * @return the creatorUri
      */
     public String getCreatorUri() {
-        return creatorUri;
-    }
-
-    /**
-     * @param creatorUri the creatorUri to set
-     */
-    public void setCreatorUri(String creatorUri) {
-        this.creatorUri = creatorUri;
+        if (creator != null) {
+            return creator.getUri();
+        }
+        return null;
     }
 
@@ -166 +171 @@
      */
     public String getCreatorName() {
-        return creatorName;
-    }
-
-    /**
-     * @param creatorName the creatorName to set
-     */
-    public void setCreatorName(String creatorName) {
-        this.creatorName = creatorName;
+        if (creator != null) {
+            return creator.getName();
+        }
+        return null;
     }
 

src/main/java/de/mpiwg/itgroup/annotations/neo4j/AnnotationStore.java

@@ -18 +18 @@
 import org.neo4j.graphdb.index.IndexHits;
 
+import de.mpiwg.itgroup.annotations.Actor;
 import de.mpiwg.itgroup.annotations.Annotation;
 import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
@@ -95 +96 @@
                         annot.setFragmentType(FragmentTypes.valueOf(ft));
                 }
-                // get creator form relation
+                // get creator from relation
                 Iterable<Relationship> creatorRels = annotNode
                                 .getRelationships(RelationTypes.CREATED);
                 for (Relationship creatorRel : creatorRels) {
-                        Node creator = creatorRel.getStartNode();
-                        annot.setCreatorUri((String) creator.getProperty("uri", null));
-                        annot.setCreatorName((String) creator.getProperty("name", null));
+                        Node creatorNode = creatorRel.getStartNode();
+                        String uri = (String) creatorNode.getProperty("uri", null);
+                        String name = (String) creatorNode.getProperty("name", null);
+            Actor creator = new Actor(false, uri, name);
+            annot.setCreator(creator);
                         // just the first one
                         break;

src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

@@ -5 +5 @@
 
 import java.io.UnsupportedEncodingException;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
 import java.security.InvalidKeyException;
 import java.security.SignatureException;
@@ -36 +34 @@
 import org.restlet.resource.ServerResource;
 
+import de.mpiwg.itgroup.annotations.Actor;
 import de.mpiwg.itgroup.annotations.Annotation;
 import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
@@ -194 +193 @@
                 // make short user id
                 String userId = annot.getCreatorUri();
+                // remove namespace from user uri to get id
                 if (userId != null && userId.startsWith(NS.MPIWG_PERSONS_URL)) {
-                    userId = userId.replace(NS.MPIWG_PERSONS_URL, ""); // entferne
-                                                                       // NAMESPACE
-                }
-                // save as id
+                    userId = userId.replace(NS.MPIWG_PERSONS_URL, "");
+                }
+                // set as id
                 userObject.put("id", userId);
                 // get full name
@@ -390 +389 @@
              * } authUser = httpUser.getIdentifier();
              */
+        }
+        // get or create creator object
+        Actor creator = annot.getCreator();
+        if (creator == null) {
+            creator = new Actor(false, null, null);
+            annot.setCreator(creator);
         }
         // username not required, if no username given authuser will be used
@@ -414 +419 @@
         }
         // try to get full name
-        if (username != null) {
+        if (creator.getName() == null && username != null) {
             RestServer restServer = (RestServer) getApplication();
             String fullName = restServer.getFullNameFromLdap(username);
-            annot.setCreatorName(fullName);
+            creator.setName(fullName);
         }
         // userUri should be a URI, if not it will set to the MPIWG namespace
@@ -428 +433 @@
         }
         // TODO: should we overwrite the creator?
-        if (annot.getCreatorUri() == null) {
-            annot.setCreatorUri(userUri);
+        if (creator.getUri() == null) {
+            creator.setUri(userUri);
         }