Changeset 5687 for trunk/www/views/rawbioassays/edit_rawbioassay.jsp

Timestamp:

Aug 9, 2011, 1:39:40 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1597: Subtypes of items

Smarter selection of default subtypes and related items (protocols, etc) have now been implemented in the other important edit dialogs.

Added support for also loading and displaying project default items dynamically based on the selected subtype.

File:

• trunk/www/views/rawbioassays/edit_rawbioassay.jsp (modified) (8 diffs)

trunk/www/views/rawbioassays/edit_rawbioassay.jsp

@@ -85 +85 @@
   boolean deniedPlatform = false;
   Platform currentPlatform = null;
-  Platform defaultPlatform = null;
+  List<Platform> defaultPlatforms = null;
   PlatformVariant currentVariant = null;
-  PlatformVariant defaultVariant = null;
+  List<PlatformVariant> defaultVariants = null;
   
   boolean readCurrentBioAssay = true;
@@ -95 +95 @@
   boolean readCurrentProtocol = true;
   Protocol currentProtocol = null;
-  Protocol defaultProtocol = null;
+  List<Protocol> defaultProtocols = null;
   boolean readCurrentSoftware = true;
   Software currentSoftware = null;
-  Software defaultSoftware = null;
+  List<Software> defaultSoftware = null;
   boolean readCurrentArrayDesign = true;
   ArrayDesign currentArrayDesign = null;
-  ArrayDesign defaultArrayDesign = null;
+  List<ArrayDesign> defaultArrayDesigns = null;
   RawDataType currentRawDataType = null;
   RawDataType defaultRawDataType = null;
@@ -119 +119 @@
     try
     {
-      defaultProtocol = (Protocol)activeProject.findDefaultItem(dc, 
+      defaultProtocols = (List<Protocol>)activeProject.findDefaultItems(dc, 
           ItemSubtype.getById(dc, SystemItems.getId(Protocol.FEATURE_EXTRACTION)), false);
-    }
-    catch (PermissionDeniedException pdex)
-    {
-      defaultProtocol = null;
-    }
-    try
-    {
-      defaultSoftware = (Software)activeProject.findDefaultItem(dc, 
-          ItemSubtype.getById(dc, SystemItems.getId(Software.FEATURE_EXTRACTION)), false);
-    }
-    catch (PermissionDeniedException pdex)
-    {
-      defaultSoftware = null;
-    }
-    try
-    {
-      defaultArrayDesign = (ArrayDesign)activeProject.findDefaultItem(dc, Item.ARRAYDESIGN);
-    }
-    catch (PermissionDeniedException pdex)
-    {
-      defaultArrayDesign = null;
-    }
-    try
-    {
-      defaultPlatform = (Platform)activeProject.findDefaultItem(dc, Item.PLATFORM);
     }
     catch (PermissionDeniedException pdex)
@@ -151 +126 @@
     try
     {
-      defaultVariant = (PlatformVariant)activeProject.findDefaultItem(dc, Item.PLATFORMVARIANT);
+      defaultSoftware = (List<Software>)activeProject.findDefaultItems(dc, 
+          ItemSubtype.getById(dc, SystemItems.getId(Software.FEATURE_EXTRACTION)), false);
+    }
+    catch (PermissionDeniedException pdex)
+    {}
+    try
+    {
+      defaultArrayDesigns = (List<ArrayDesign>)activeProject.findDefaultItems(dc, Item.ARRAYDESIGN, true);
+    }
+    catch (PermissionDeniedException pdex)
+    {}
+    try
+    {
+      defaultPlatforms = (List<Platform>)activeProject.findDefaultItems(dc, Item.PLATFORM, true);
+    }
+    catch (PermissionDeniedException pdex)
+    {}
+    try
+    {
+      defaultVariants = (List<PlatformVariant>)activeProject.findDefaultItems(dc, Item.PLATFORMVARIANT, true);
     }
     catch (PermissionDeniedException pdex)
@@ -176 +170 @@
     catch (Throwable t)
     {}
-    if (currentPlatform == null) currentPlatform = defaultPlatform;
-    if (currentVariant == null) currentVariant = defaultVariant;
+    if (currentPlatform == null && defaultPlatforms.size() > 0) 
+    {
+      currentPlatform = defaultPlatforms.get(0);
+    }
+    if (currentVariant == null && defaultVariants.size() > 0)
+    {
+      currentVariant = defaultVariants.get(0);
+    }
     
     currentRawDataType = RawDataTypes.getRawDataType(cc.getPropertyValue("rawDataType"));
@@ -772 +772 @@
             denied="<%=!readCurrentArrayDesign%>"
             recent="<%=recentArrayDesigns%>"
-            defaultitem="<%=defaultArrayDesign%>"
+            defaultitems="<%=defaultArrayDesigns%>"
             newitem="<%=rawBioAssay == null%>"
             onselect="selectArrayDesignOnClick()"
@@ -804 +804 @@
             denied="<%=!readCurrentProtocol%>"
             recent="<%=recentProtocols%>"
-            defaultitem="<%=defaultProtocol%>"
+            defaultitems="<%=defaultProtocols%>"
             newitem="<%=rawBioAssay == null%>"
             onselect="selectProtocolOnClick()"
@@ -821 +821 @@
             denied="<%=!readCurrentSoftware%>"
             recent="<%=recentSoftware%>"
-            defaultitem="<%=defaultSoftware%>"
+            defaultitems="<%=defaultSoftware%>"
             newitem="<%=rawBioAssay == null%>"
             onselect="selectSoftwareOnClick()"