Changeset 61:b8ef15c8c4a5 in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResources.java

Timestamp:

Nov 22, 2012, 4:38:53 PM (11 years ago)

Author:

casties

Branch:

default

Message:

implemented new shape format for image annotations.
minor cleanups.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResources.java (modified) (4 diffs)

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

@@ -18 +18 @@
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
 
-
 /**
- * API for accessing tags in the Annotation store.
+ * API for accessing resource objects in the Annotation store.
  * 
  * @author dwinter
- *
+ * 
  */
 public class AnnotatorResources extends AnnotatorResourceImpl {
@@ -31 +30 @@
 
     /**
-     * GET with JSON content-type.
-     * Parameters: 
-     *   user: short user name
-     *   uri: user uri
-     *   
+     * GET with JSON content-type. 
+     * Parameters: user: short user name uri: user uri
+     * 
      * @param entity
      * @return
@@ -41 +38 @@
     @Get("json")
     public Representation doGetJSON(Representation entity) {
-        logger.debug("AnnotatorGroups doGetJSON!");
+        logger.debug("AnnotatorResources doGetJSON!");
         setCorsHeaders();
-       
+
         String jsonId = (String) getRequest().getAttributes().get("id");
         String uri = decodeJsonId(jsonId);
-        
+
         logger.debug("resources-id=" + uri);
 
-        if (uri==null){
-        return getAllResources();
+        if (uri == null) {
+            return getAllResources();
         } else {
-
-                return getResource(uri);
+            return getResource(uri);
         }
     }
-    
-    protected Representation getResource(String uri){
-          AnnotationStore store = getAnnotationStore();
-          //String tagUri=NS.MPIWG_TAGS_URL+id;
-          Node tagNode = store.getResourceNodeByUri(uri);
-          Resource resource = store.createResourceFromNode(tagNode);
-          JSONObject jo = new JSONObject();
-          try {
-              jo.put("id", encodeJsonId(resource.getUri()));
-              jo.put("uri", resource.getUri());
-          } catch (JSONException e) {
-          }
-          
-          return new JsonRepresentation(jo);
+
+    protected Representation getResource(String uri) {
+        AnnotationStore store = getAnnotationStore();
+        Node resNode = store.getResourceNodeByUri(uri);
+        Resource resource = store.createResourceFromNode(resNode);
+        JSONObject jo = new JSONObject();
+        try {
+            jo.put("id", encodeJsonId(resource.getUri()));
+            jo.put("uri", resource.getUri());
+        } catch (JSONException e) {
+        }
+
+        return new JsonRepresentation(jo);
     }
-        protected Representation getAllResources() {
-                JSONArray results = new JSONArray();
+
+    protected Representation getAllResources() {
+        JSONArray results = new JSONArray();
         AnnotationStore store = getAnnotationStore();
-        
-       
-            List<Resource> resources = store.getResources(null, null);
-            for (Resource resource : resources) {
-                JSONObject jo = new JSONObject();
-                try {
-                         jo.put("id", encodeJsonId(resource.getUri()));
-                     jo.put("uri", resource.getUri());
-                } catch (JSONException e) {
-                }
-                results.put(jo);
+
+        List<Resource> resources = store.getResources(null, null);
+        for (Resource resource : resources) {
+            JSONObject jo = new JSONObject();
+            try {
+                jo.put("id", encodeJsonId(resource.getUri()));
+                jo.put("uri", resource.getUri());
+            } catch (JSONException e) {
             }
-        
+            results.put(jo);
+        }
+
         // assemble result object
         JSONObject result = new JSONObject();
@@ -99 +94 @@
         logger.debug(result);
         return new JsonRepresentation(result);
-        }               
-        
+    }
 
-    
 }