Changeset 3547 for trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginEditor.cs

Timestamp:

04/27/10 21:30:24 (14 years ago)

Author:

gkronber

Message:

Implemented review comments in plugin manager. #989 (Implement review comments in plugin infrastructure)

File:

• trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginEditor.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.PluginInfrastructure/Advanced/PluginEditor.cs

@@ -39 +39 @@
     private BackgroundWorker updateServerPluginsWorker;
 
+    private PluginManager pluginManager;
+    public PluginManager PluginManager {
+      get { return pluginManager; }
+      set {
+        // if (value == null) throw new ArgumentNullException();
+        pluginManager = value;
+      }
+    }
+
     public PluginEditor() {
       InitializeComponent();
@@ -58 +67 @@
     #region refresh plugins from server backgroundworker
     void updateServerPluginsWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
-      if (!e.Cancelled && e.Result != null) {
+      if (e.Error != null) {
+        MessageBox.Show("There was an error while connecting to the server." + Environment.NewLine +
+                   "Please check your connection settings and user credentials.");
+        UpdateControlsDisconnectedState();
+      } else {
         // refresh local plugins
         localAndServerPlugins.Clear();
-        foreach (var plugin in ApplicationManager.Manager.Plugins) {
+        foreach (var plugin in pluginManager.Plugins) {
           localAndServerPlugins.Add(plugin, null);
         }
@@ -88 +101 @@
         listView.CheckBoxes = true;
         UpdateControlsConnectedState();
-      } else {
-        UpdateControlsDisconnectedState();
       }
       // make sure cursor is set correctly
@@ -96 +107 @@
 
     void updateServerPluginsWorker_DoWork(object sender, DoWorkEventArgs e) {
-      try {
-        var client = DeploymentService.UpdateClientFactory.CreateClient();
-        e.Result = client.GetPlugins();
-        e.Cancel = false;
-      }
-      catch (EndpointNotFoundException) {
-        e.Result = null;
-        e.Cancel = true;
-      }
-      catch (FaultException) {
-        e.Result = null;
-        e.Cancel = true;
-      }
+      var client = DeploymentService.UpdateClientFactory.CreateClient();
+      e.Result = client.GetPlugins();
     }
     #endregion
@@ -115 +115 @@
     void pluginUploadWorker_RunWorkerCompleted(object sender, RunWorkerCompletedEventArgs e) {
       Cursor = Cursors.Default;
-      if (e.Cancelled) {
+      if (e.Error != null) {
+        MessageBox.Show("There was an error while connecting to the server." + Environment.NewLine +
+                   "Please check your connection settings and user credentials.");
         UpdateControlsDisconnectedState();
       } else {
@@ -125 +127 @@
 
     void pluginUploadWorker_DoWork(object sender, DoWorkEventArgs e) {
-      try {
-        var selectedPlugins = (IEnumerable<IPluginDescription>)e.Argument;
-        DeploymentService.AdminClient adminClient = DeploymentService.AdminClientFactory.CreateClient();
-
-        foreach (var plugin in IteratePlugins(selectedPlugins)) {
-          SetMainFormStatusBar("Uploading", plugin);
-          adminClient.DeployPlugin(MakePluginDescription(plugin), CreateZipPackage(plugin));
-        }
-        e.Cancel = false;
-      }
-      catch (EndpointNotFoundException) {
-        e.Cancel = true;
-      }
-      catch (FaultException) {
-        e.Cancel = true;
+      var selectedPlugins = (IEnumerable<IPluginDescription>)e.Argument;
+      DeploymentService.AdminClient adminClient = DeploymentService.AdminClientFactory.CreateClient();
+
+      foreach (var plugin in IteratePlugins(selectedPlugins)) {
+        SetMainFormStatusBar("Uploading", plugin);
+        adminClient.DeployPlugin(MakePluginDescription(plugin), CreateZipPackage(plugin));
       }
     }