← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/monodevelop/oneiric

« back to all changes in this revision

Viewing changes to src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Deployment/WebDeployService.cs

  • Committer: Bazaar Package Importer
  • Author(s): Jo Shields
  • Date: 2011-06-27 17:03:13 UTC
  • mto: (1.8.1 upstream)
  • mto: This revision was merged to the branch mainline in revision 54.
  • Revision ID: james.westby@ubuntu.com-20110627170313-6cvz3s19x6e9hqe9
Import upstream version 2.5.92+dfsg

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/addins/AspNet/MonoDevelop.AspNet/MonoDevelop.AspNet.Deployment/WebDeployService.cs
68
68
                                taskAliases.Add (target.LocationName, target.GetMarkup ());
69
69
                        }
70
70
                        
71
 
                        MultiTaskDialogProgressMonitor monitor = new MultiTaskDialogProgressMonitor (true, true, true, taskAliases);
 
71
                        var monitor = new MultiTaskDialogProgressMonitor (true, true, true, taskAliases);
72
72
                        monitor.SetDialogTitle (MonoDevelop.Core.GettextCatalog.GetString ("Web Deployment Progress"));
73
73
                        monitor.SetOperationTitle (MonoDevelop.Core.GettextCatalog.GetString ("Deploying {0}...", project.Name));
74
74
                        threadParams.Monitor = monitor;
81
81
                
82
82
                static void DoDeploy (object o)
83
83
                {
84
 
                        DeployThreadParams threadParams = (DeployThreadParams) o;
 
84
                        var threadParams = (DeployThreadParams) o;
85
85
                        try {
86
86
                                IFileReplacePolicy replacePolicy = new DialogFileReplacePolicy ();
87
87
                                
104
104
                                }
105
105
                        } catch (Exception e) {
106
106
                                MonoDevelop.Core.LoggingService.LogError ("Unhandled exception in the web deploy thread", e);
107
 
                                 MonoDevelop.Ide.MessageService.ShowException (e, "Web deploy failed due to unhandled exception");
 
107
                                MonoDevelop.Ide.MessageService.ShowException (e, "Web deploy failed due to unhandled exception");
108
108
                        } finally {
109
 
                                threadParams.Monitor.Dispose ();
 
109
                                try {
 
110
                                        threadParams.Monitor.Dispose ();
 
111
                                } catch (Exception ex2) {
 
112
                                        MonoDevelop.Core.LoggingService.LogError ("Unhandled exception disposing the web deploy thread", ex2);
 
113
                                }
110
114
                        }
111
115
                }
112
116
                
115
119
                        var dialog = new WebDeployLaunchDialog (project) {
116
120
                                Modal = true,
117
121
                        };
118
 
                        dialog.Show ();
119
122
                        
120
123
                        ICollection<WebDeployTarget> targets = null;
121
124