Changeset 4116

Timestamp:

Jan 31, 2008, 4:39:03 PM (15 years ago)

Author:

Martin Svensson

Message:

Fixes #914 Make PluginConfigurationImporter? smarter

File:

• trunk/src/plugins/core/net/sf/basedb/plugins/PluginConfigurationImporter.java (modified) (7 diffs)

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

@@ -39 +39 @@
 import net.sf.basedb.core.Item;
 import net.sf.basedb.core.ItemContext;
+import net.sf.basedb.core.ItemNotFoundException;
 import net.sf.basedb.core.Location;
 import net.sf.basedb.core.LongParameterType;
@@ -59 +60 @@
 import net.sf.basedb.core.plugin.Request;
 import net.sf.basedb.core.plugin.Response;
+import net.sf.basedb.util.PluginConfigInfo;
 import net.sf.basedb.util.XMLUtil;
 
@@ -283 +285 @@
         is.close();
         
-        response.setDone("The configurations were imported successfully!");
+        response.setDone("Configuration import finished succesfully!");
         
       }
@@ -351 +353 @@
     throws BaseException
   {           
-    DbControl dc = null;    
+    DbControl dc = null;
     try
     {
@@ -374 +376 @@
         String description = configuration.getChildText("description");
         String pluginClassName = configuration.getAttributeValue("pluginClassName");
+        PluginDefinition pluginDefinition = null;
+        try 
+        {
+          pluginDefinition = PluginDefinition.getByClassName(dc, pluginClassName);
+          
+          boolean importConfiguration = !importAll && getConfigurationInstallOption(parameternumber);
+          if ((importConfiguration || importAll))
+          {
+            PluginConfiguration pluginConfig = PluginConfiguration.getNew(dc, pluginDefinition);
+            if (setPermissions)
+            {
+              pluginConfig.setItemKey(pluginDefinition.getItemKey());
+              pluginConfig.setProjectKey(pluginDefinition.getProjectKey());
+            }
+            pluginConfig.setName(name);
+            pluginConfig.setDescription(description);
+            dc.saveItem(pluginConfig);
+            
+            List parameters = configuration.getChildren("parameter");
+            setPluginConf(parameters, pluginConfig);
+          }
+        }
+        catch (ItemNotFoundException infex)
+        {}
         
-        boolean importConfiguration = !importAll && getConfigurationInstallOption(parameternumber);
-        if (importConfiguration || importAll)
-        {
-          PluginDefinition pluginDefinition = PluginDefinition.getByClassName(dc, pluginClassName);
-          PluginConfiguration pluginConfig = PluginConfiguration.getNew(dc, pluginDefinition);
-          if (setPermissions)
-          {
-            pluginConfig.setItemKey(pluginDefinition.getItemKey());
-            pluginConfig.setProjectKey(pluginDefinition.getProjectKey());
-          }
-          pluginConfig.setName(name);
-          pluginConfig.setDescription(description);
-          dc.saveItem(pluginConfig);
-          
-          List parameters = configuration.getChildren("parameter");
-          setPluginConf(parameters, pluginConfig);  
-        }
         parameternumber++;
       }       
@@ -457 +466 @@
         Request.COMMAND_CONFIGURE_JOB,
         "Configuration import options",
-        "Set the options to run this job",
+        "Set the options to run this job.\n" +
+        "NOTICE! Only configurations for already installed plugins will be handled.",
         parameters
       );
@@ -501 +511 @@
           String description = configElement.getChildText("description");
           String pluginName = configElement.getAttributeValue("pluginClassName");
-          
-          if (configLists.get(pluginName) == null)
+          try
           {
-            typeList = new ArrayList<PluginParameter<?>>();
-            typeList.add(new PluginParameter<Boolean>
-              (
-                  pluginName, 
-                  pluginName.substring(pluginName.lastIndexOf('.') + 1), 
-                  "Configurations for plugin: " +pluginName, 
-                  null
-              ));
+            PluginDefinition.getByClassName(dc, pluginName);
+            if (configLists.get(pluginName) == null)
+            {
+              typeList = new ArrayList<PluginParameter<?>>();
+              typeList.add(new PluginParameter<Boolean>
+                (
+                    pluginName, 
+                    pluginName.substring(pluginName.lastIndexOf('.') + 1), 
+                    "Configurations for plugin: " +pluginName, 
+                    null
+                ));
+            }
+            else
+            {
+              typeList = configLists.get(pluginName);
+            }
+            
+            PluginParameter<Boolean> configurationParameter = 
+              new PluginParameter<Boolean>(
+              "configuration"+parameternumber,
+              configName,
+              "Select if configuration should be imported or not. " +
+              "TRUE will include this configuration in the import.\n\n" + description,
+              new BooleanParameterType(null, false)
+            );
+            typeList.add(configurationParameter);
+            configLists.put(pluginName, typeList);
           }
-          else
-          {
-            typeList = configLists.get(pluginName);
-          }
-          
-          PluginParameter<Boolean> configurationParameter = 
-            new PluginParameter<Boolean>(
-            "configuration"+parameternumber,
-            configName,
-            "Select if configuration should be imported or not. " +
-            "TRUE will include this configuration in the import.\n\n" + description,
-            new BooleanParameterType(null, false)
-          );
-          typeList.add(configurationParameter);
-          configLists.put(pluginName, typeList);
+          catch (ItemNotFoundException infex){}
           parameternumber++;
         }