Changeset 5836 for DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java

Timestamp:

11/18/14 17:52:24 (10 years ago)

Author:

olhsha@mpi.nl

Message:

refactoring. Adding ALL as an access mode.

File:

• DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java (modified) (6 diffs)

DASISH/t5.6/backend/annotator-backend/trunk/annotator-backend/src/main/java/eu/dasish/annotation/backend/dao/AnnotationDao.java

@@ -58 +58 @@
      
   
-    public List<Number> getAnnotationIDsForPermission(Number principalID, Access acess);
-    
-    public List<Number> getAnnotationIDsForPublicAccess(Access access);
+    public List<Number> getAnnotationIDsPermissionAtLeast(Number principalID, Access acess);
+    
+   
+    public List<Number> getAnnotationIDsPublicAtLeast(Access access);
     
    
@@ -85 +86 @@
     public List<String> getAnnotationREFs(List<Number> annotationIDs); 
     
-   
-    
-    
-    
-       /**
-     * 
-     * @param annotationID
-     * @return the list of the internal IDs of all the target Targets of "annotationID".
-     */
-    //public List<Number> retrieveTargetIDs(Number annotationID);   
-    
+  
     
     public Number  getOwner(Number annotationID);
@@ -106 +97 @@
      */ 
     public Access  getAccess(Number annotationID, Number principalID);
+    
+    public boolean  hasExplicitAccess(Number annotationID, Number principalID);
     
     
@@ -148 +141 @@
      * Sets the "access" for the "principalID" w.r.t. the annotation with "annotationID".
      */
-    public int addAnnotationPrincipalAccess(Number annotationID, Number principalID, Access access);
+    public int addPermission(Number annotationID, Number principalID, Access access);
     
     
@@ -187 +180 @@
      * Sets the "access" for the "principalID" w.r.t. the annotation with "annotationID".
      */
-    public int updateAnnotationPrincipalAccess(Number annotationID, Number principalID, Access access);
-    
-    
-    public int updatePublicAttribute(Number annotationID, Access access);
+    public int updatePermission(Number annotationID, Number principalID, Access access);
+    
+    
+    public int updatePublicAccess(Number annotationID, Access access);
     
     
@@ -222 +215 @@
     * @throws SQLException 
     */
-    public int deleteAnnotationPermissions(Number annotationID);
-    
-    public int deleteAnnotationPrincipalAccess(Number annotationID, Number principalID);
+    public int deletePermissions(Number annotationID);
+    
+    public int deletePermission(Number annotationID, Number principalID);
     
     public int deleteAnnotationFromAllNotebooks(Number annotationID);