Changeset 13363 for branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure

Timestamp:

11/24/15 16:34:17 (9 years ago)

Author:

gkronber

Message:

#2522: improvements to new PluginInformationDialog and removed obsolete classes

Location:

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3

Files:

• Interfaces/IPluginDescription.cs (modified) (1 diff)
• PluginValidator.cs (modified) (5 diffs)

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/Interfaces/IPluginDescription.cs

@@ -60 +60 @@
     /// </summary>
     string LicenseText { get; }
+    /// <summary>
+    /// Gets or sets the plugin state.
+    /// </summary>
+    PluginState PluginState { get; }
+    /// <summary>
+    /// Gets the error message why this plugin has been disabled.
+    /// </summary>
+    string LoadingErrorInformation { get; }
   }
 }

branches/RefactorPluginInfrastructure-2522/HeuristicLab.PluginInfrastructure/3.3/PluginValidator.cs

@@ -183 +183 @@
           RegisterLoadedAssembly(asm);
           assemblies.Add(asm);
-        }
-        catch (BadImageFormatException) { } // just ignore the case that the .dll file is not a CLR assembly (e.g. a native dll)
-        catch (FileLoadException) { }
-        catch (SecurityException) { }
-        catch (ReflectionTypeLoadException) { } // referenced assemblies are missing
+        } catch (BadImageFormatException) { } // just ignore the case that the .dll file is not a CLR assembly (e.g. a native dll)
+        catch (FileLoadException) { } catch (SecurityException) { } catch (ReflectionTypeLoadException) { } // referenced assemblies are missing
       }
       return assemblies;
@@ -216 +213 @@
             desc.Disable(errorStrBuiler.ToString());
           }
-        }
-        catch (BadImageFormatException ex) {
+        } catch (BadImageFormatException ex) {
           // disable the plugin
           desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "BadImageFormatException: " + ex.Message);
-        }
-        catch (FileNotFoundException ex) {
+        } catch (FileNotFoundException ex) {
           // disable the plugin
           desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "FileNotFoundException: " + ex.Message);
-        }
-        catch (FileLoadException ex) {
+        } catch (FileLoadException ex) {
           // disable the plugin
           desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "FileLoadException: " + ex.Message);
-        }
-        catch (ArgumentException ex) {
+        } catch (ArgumentException ex) {
           // disable the plugin
           desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "ArgumentException: " + ex.Message);
-        }
-        catch (SecurityException ex) {
+        } catch (SecurityException ex) {
           // disable the plugin
           desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "SecurityException: " + ex.Message);
@@ -258 +250 @@
           pluginDescriptions.AddRange(assemblyPluginDescriptions);
         }
-        // ignore exceptions. Just don't yield a plugin description when an exception is thrown
+          // ignore exceptions. Just don't yield a plugin description when an exception is thrown
         catch (FileNotFoundException) {
-        }
-        catch (FileLoadException) {
-        }
-        catch (InvalidPluginException) {
-        }
-        catch (TypeLoadException) {
-        }
-        catch (MissingMemberException) {
+        } catch (FileLoadException) {
+        } catch (InvalidPluginException) {
+        } catch (TypeLoadException) {
+        } catch (MissingMemberException) {
         }
       }
@@ -339 +327 @@
           try {
             version = new Version((string)dependencyAttr.ConstructorArguments[1].Value); // might throw FormatException
-          }
-          catch (FormatException ex) {
+          } catch (FormatException ex) {
             throw new InvalidPluginException("Invalid version format of dependency " + name + " in plugin " + pluginType.ToString(), ex);
           }
@@ -519 +506 @@
               Assembly.Load(assemblyName);
               assemblyNames.Add(assemblyName);
-            }
-            catch (BadImageFormatException) {
+            } catch (BadImageFormatException) {
               desc.Disable(Path.GetFileName(assemblyLocation) + " is not a valid assembly.");
-            }
-            catch (FileLoadException) {
+            } catch (FileLoadException) {
               desc.Disable("Can't load file " + Path.GetFileName(assemblyLocation));
-            }
-            catch (FileNotFoundException) {
+            } catch (FileNotFoundException) {
               desc.Disable("File " + Path.GetFileName(assemblyLocation) + " is missing.");
-            }
-            catch (SecurityException) {
+            } catch (SecurityException) {
               desc.Disable("File " + Path.GetFileName(assemblyLocation) + " can't be loaded because of security constraints.");
-            }
-            catch (NotSupportedException ex) {
+            } catch (NotSupportedException ex) {
               // disable the plugin
               desc.Disable("Problem while loading plugin assemblies:" + Environment.NewLine + "NotSupportedException: " + ex.Message);