Changeset 7297

Timestamp:

Feb 20, 2017, 3:11:16 PM (7 years ago)

Author:

Nicklas Nordborg

Message:

References #2056: Improve API for project-specific annotations

Added support in the SnapshotManager class to force loading default of project-specific annotation values ignoring the currently active project.

File:

• trunk/src/core/net/sf/basedb/core/snapshot/SnapshotManager.java (modified) (5 diffs)

trunk/src/core/net/sf/basedb/core/snapshot/SnapshotManager.java

@@ -116 +116 @@
   {
     this.snapshots = new HashMap<Integer, AnnotationSetSnapshot>();
+  }
+  
+  private Integer projectId;
+  
+  /**
+    When a project id is set, the snapshot manager will only 
+    search for project-specific annotations explicitely belonging
+    to that project (or default values if projectId=0).
+    
+    Note that this parameter typically always need to be off (=null)
+    when searching for annotations to an annotation type that
+    doesn't have enabled project-specific annotations.
+    
+    @param projectId The project id or 0 to only search for default
+      values or null to revert to the default behaviour 
+      (which load default values if a project-specific values
+      doesn't exists)
+    @since 3.11
+  */
+  public void setProjectId(Integer projectId)
+  {
+    this.projectId = projectId;
   }
   
@@ -178 +200 @@
     
     if (filter == null) filter = new StaticFilter<AnnotationSnapshot>(true);
-    int activeProjectId = dc.getSessionControl().getActiveProjectId();
+    int activeProjectId = projectId == null ? 
+      dc.getSessionControl().getActiveProjectId() : projectId;
 
     // Needed for recursive searching of inherited annotations
@@ -196 +219 @@
     for (AnnotationSnapshot shot : snapshot.getAnnotations())
     {
+      int shotProjectId = shot.getProjectId();
+      // Ignore all annotations not belonging to the specified project
+      if (projectId != null && shotProjectId != projectId) continue;
       // Ignore project-specfic annotations not belonging to the current project
-      int projectId = shot.getProjectId();
-      if (projectId != 0 && projectId != activeProjectId) continue;
+      if (shotProjectId != 0 && shotProjectId != activeProjectId) continue;
       
       // Ignore default annotations that already have a project-specific value
@@ -214 +239 @@
           result.add(shot);
           // This is a project-specific annotation overriding a default value
-          if (projectId != 0) overridden.add(shot.getOverrideId());
+          if (shotProjectId != 0) overridden.add(shot.getOverrideId());
         }
       }
@@ -245 +270 @@
           {
             result.add(shot);
-            if (projectId != 0) overridden.add(shot.getOverrideId());
+            if (shotProjectId != 0) overridden.add(shot.getOverrideId());
           }
         }