Changeset 3569

Timestamp:

Jul 19, 2007, 8:29:50 AM (16 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #684: AbstractAnalysisPlugin? should not include [Item.BIOASSAYS, Type.LIST] in it's GuiContext:s

Location:

trunk/src

Files:

• core/net/sf/basedb/core/plugin/AbstractAnalysisPlugin.java (modified) (4 diffs)
• plugins/core/net/sf/basedb/plugins/FormulaFilter.java (modified) (3 diffs)

trunk/src/core/net/sf/basedb/core/plugin/AbstractAnalysisPlugin.java

@@ -24 +24 @@
 package net.sf.basedb.core.plugin;
 
-import java.util.Arrays; 
 import java.util.Collections; 
-import java.util.HashSet; 
 import java.util.Set; 
 
@@ -56 +54 @@
   
   /**
+    GuiContext = [Item.BIOASSAYSET, GuiContext.Type.ITEM]
+    @since 2.4
+  */
+  protected static final GuiContext CONTEXT_BIOASSAYSET = 
+    new GuiContext(Item.BIOASSAYSET, GuiContext.Type.ITEM);
+
+  /**
+    GuiContext = [Item.BIOASSAY, GuiContext.Type.LIST]
+    @since 2.4
+  */
+  protected static final GuiContext CONTEXT_BIOASSAYS = 
+    new GuiContext(Item.BIOASSAY, GuiContext.Type.LIST);
+  
+  /**
     The default gui contexts where it makes sense to use an analysis plugin. 
     Override for the {@link InteractivePlugin#getGuiContexts()} method to
-    specify other contexts. This set can't be modified.
+    specify other contexts. This set can't be modified. This set only
+    includes the {@link #CONTEXT_BIOASSAYSET}.
   */
   protected static final Set<GuiContext> defaultGuiContexts = 
-    Collections.unmodifiableSet(new HashSet<GuiContext>(
-        Arrays.asList(
-          new GuiContext(Item.BIOASSAYSET, GuiContext.Type.ITEM),
-          new GuiContext(Item.BIOASSAY, GuiContext.Type.LIST)
-        )
-      ));
+    Collections.singleton(CONTEXT_BIOASSAYSET);
   
   /**
@@ -126 +134 @@
   }
   /**
-    Check that the item is a bioassayset.
+    Check that the item is a bioassayset and that the logged in user has 
+    permission to use the current experiment.
     @return null if the item is a bioassayset, an error message otherwise
-    @throws PermissionDeniedException If the logged in user dosent have
-      permission to use the Experiment.
+    @throws PermissionDeniedException If the logged in user dosen't have
+      permission to use the Experiment
   */
   public String isInContext(GuiContext context, Object item)
   {
     String message = null;
-    if (defaultGuiContexts.contains(context))
+    Experiment e = null;
+    if (context.equals(CONTEXT_BIOASSAYSET))
     {
       if (item == null)
@@ -147 +157 @@
       {
         BioAssaySet bas = (BioAssaySet)item;
-        Experiment e = bas.getExperiment();
-        e.checkPermission(Permission.USE);
-      }
-    }
+        e = bas.getExperiment();
+      }
+    }
+    else
+    {
+      DbControl dc = sc.newDbControl();
+      try
+      {
+        e = getCurrentExperiment(dc);
+      }
+      finally
+      {
+        if (dc != null) dc.close();
+      }
+    }
+    if (e != null) e.checkPermission(Permission.USE);
     return message;
   }

trunk/src/plugins/core/net/sf/basedb/plugins/FormulaFilter.java

@@ -56 +56 @@
 import java.util.Arrays;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.EnumSet;
 import java.util.HashSet;
@@ -92 +93 @@
 
   private static final Set<Permissions> permissions = new HashSet<Permissions>();
+  private static final Set<GuiContext> guiContexts = Collections.unmodifiableSet(
+    new HashSet<GuiContext>(Arrays.asList(CONTEXT_BIOASSAYSET, CONTEXT_BIOASSAYS))
+  );
 
   private RequestInformation configureJob;
@@ -208 +212 @@
     -------------------------------------------
   */
+  @Override
+  public Set<GuiContext> getGuiContexts()
+  {
+    return guiContexts;
+  }
   public RequestInformation getRequestInformation(GuiContext context, String command) 
     throws BaseException