Changeset 2167

Timestamp:

Apr 19, 2006, 4:05:58 PM (17 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #193: Nullpointer exception when running an AutoDetectImporter? plugin

Location:

trunk/www

Files:

• common/import/index.jsp (modified) (4 diffs)
• include/scripts/plugin.js (modified) (5 diffs)

trunk/www/common/import/index.jsp

@@ -153 +153 @@
     int pluginConfigurationId = Values.getInt(request.getParameter("pluginconfiguration_id"));
     
-    if (pluginDefinitionId == 0 || pluginConfigurationId == 0)
+    if (pluginDefinitionId == -1 || pluginConfigurationId == -1)
     {
       // Auto-detect was selected
@@ -181 +181 @@
     int pluginDefinitionId = Values.getInt(request.getParameter("plugindefinition_id"));
     PluginDefinition plugin = null;
-    if (pluginDefinitionId != 0)
+    if (pluginDefinitionId != -1)
     {
       plugin = PluginDefinition.getById(dc, pluginDefinitionId);
@@ -202 +202 @@
         plugin = plugins.entrySet().iterator().next().getKey();
         List<PluginConfiguration> configList = plugins.get(plugin);
-        if (configList.size() == 1)
-        {
-          // TODO - case when configList == 0
+        if (configList != null && configList.size() > 1)
+        {
+          // Multiple configurations matches
+          matches = configList.size();
+        }
+        else
+        {
+          // 0 or 1 configuration matched
+          PluginConfiguration pc = null;
+          if (configList != null && configList.size() == 1)
+          {
+            pc = configList.get(0);
+          }
           redirect = "../plugin/index.jsp?ID="+ID+
-            "&cmd=NewJob&pluginconfiguration_id="+configList.get(0).getId()+
+            "&cmd=NewJob" + 
+            (pc == null ? "" : "&pluginconfiguration_id="+ pc.getId()) +
             "&plugindefinition_id="+plugin.getId()+
             "&title="+request.getParameter("title")+
@@ -215 +226 @@
             "&context_type="+context.getType().name();
         }
-        else
-        {
-          matches = configList.size();
-        }
       }
       if (matches > 1)

trunk/www/include/scripts/plugin.js

@@ -3 +3 @@
   BioArray Software Environment (BASE) - http://base.thep.lu.se/
   Copyright (C) 2002-2004 Lao Saal, Carl Troein,
-  Johan Vallon-Christersson, Jari Häkkinen, Nicklas Nordborg
+  Johan Vallon-Christersson, Jari H?kkinen, Nicklas Nordborg
 
   This file is part of BASE.
@@ -36 +36 @@
   this.populateLists = function(pluginList, configurationList)
   {
-    pluginList[pluginList.length] = new Option('- auto detect -', 0);
+    pluginList[pluginList.length] = new Option('- auto detect -', '-1');
     var numAutodetecting = 0;
     for (var i = 0; i < this.allPlugins.length; i++)
@@ -44 +44 @@
       if (plugin.autodetection) 
       {
-        option.text += ' '+String.fromCharCode(215); // 215 = × (multiplication sign)
+        option.text += ' '+String.fromCharCode(215); // 215 = x (multiplication sign)
         numAutodetecting++;
       }
@@ -64 +64 @@
       if (plugin.autodetection)
       {
-        list[list.length] = new Option('- auto detect -', 0);
+        list[list.length] = new Option('- auto detect -', '-1');
       }
       for (var i = 0; i < plugin.configurations.length; i++)
@@ -74 +74 @@
     else
     {
-      list[list.length] = new Option('- auto detect -', 0);
+      list[list.length] = new Option('- auto detect -', '-1');
     }
   }