Changeset 18:aafa3884b2c4 in AnnotationManagerN4J for src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java

Timestamp:

Sep 5, 2012, 4:05:54 PM (12 years ago)

Author:

casties

Branch:

default

Message:

new AnnotationStore? restlet for HTML-UI.
reorganisation of classes.

File:

• src/main/java/de/mpiwg/itgroup/annotations/restlet/AnnotatorResourceImpl.java (modified) (5 diffs)

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

@@ -38 +38 @@
 import de.mpiwg.itgroup.annotations.Actor;
 import de.mpiwg.itgroup.annotations.Annotation;
+import de.mpiwg.itgroup.annotations.NS;
 import de.mpiwg.itgroup.annotations.Annotation.FragmentTypes;
 import de.mpiwg.itgroup.annotations.Group;
 import de.mpiwg.itgroup.annotations.Person;
 import de.mpiwg.itgroup.annotations.neo4j.AnnotationStore;
-import de.mpiwg.itgroup.annotations.old.NS;
 
 /**
@@ -65 +65 @@
                     .get("org.restlet.ext.servlet.ServletContext");
             logger.debug("Getting AnnotationStore from Context");
-            store = (AnnotationStore) sc.getAttribute(RestServer.ANNSTORE_KEY);
+            store = (AnnotationStore) sc.getAttribute(BaseRestlet.ANNSTORE_KEY);
         }
         return store;
@@ -149 +149 @@
         String consumerKey = token.getParamAsPrimitive("consumerKey").getAsString();
         // get stored consumer secret for key
-        RestServer restServer = (RestServer) getApplication();
+        BaseRestlet restServer = (BaseRestlet) getApplication();
         String consumerSecret = restServer.getConsumerSecret(consumerKey);
         logger.debug("requested consumer key=" + consumerKey + " secret=" + consumerSecret);
@@ -208 +208 @@
                 String userName = creator.getName();
                 if (userName == null) {
-                    RestServer restServer = (RestServer) getApplication();
+                    BaseRestlet restServer = (BaseRestlet) getApplication();
                     userName = restServer.getFullNameFromLdap(userId);
                 }
@@ -500 +500 @@
         // try to get full name
         if (creator.getName() == null && username != null) {
-            RestServer restServer = (RestServer) getApplication();
+            BaseRestlet restServer = (BaseRestlet) getApplication();
             String fullName = restServer.getFullNameFromLdap(username);
             creator.setName(fullName);