[Sharpcvslib-commits] sharpcvslib/src/SharpCvsAddIn/Commands OpenSolutionFromCVS.cs,1.1,1.2

[John M. <mur...@us...>]

Update of /cvsroot/sharpcvslib/sharpcvslib/src/SharpCvsAddIn/Commands
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16220/Commands

Modified Files:
	OpenSolutionFromCVS.cs 
Log Message:
Finished up jobqueue to execute cvs operations on seperate thread. Created a job for cvs checkout

Index: OpenSolutionFromCVS.cs
===================================================================
RCS file: /cvsroot/sharpcvslib/sharpcvslib/src/SharpCvsAddIn/Commands/OpenSolutionFromCVS.cs,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OpenSolutionFromCVS.cs	7 Feb 2005 04:54:09 -0000	1.1
--- OpenSolutionFromCVS.cs	28 Feb 2005 00:09:54 -0000	1.2
***************
*** 13,16 ****
--- 13,18 ----
  using ICSharpCode.SharpCvsLib.Commands;
  
+ using SharpCvsAddIn.Jobs;
+ 
  
  namespace SharpCvsAddIn.Commands
***************
*** 29,32 ****
--- 31,40 ----
  		}
  
+ 		private void OnCheckoutComplete( object sender, object jobData )
+ 		{
+ 			CvsCheckoutJob job = (CvsCheckoutJob)jobData ;
+ 			job.FinishCheckout();
+ 		}
+ 
  		/// <summary>
  		/// Do all the stuff to open a solution
***************
*** 70,150 ****
  							string moduleName = openDlg.cvsModuleDropDown.Text;
  							string tag = openDlg.cvsTagDropDown.Text;
- 	
- 							// see if we can get the solution from cvs, if we do,
- 							// write user changes to isolated storage
- 							CVSServerConnection serverConnection = null;
- 							try
- 							{			
- 								CvsRoot root = new CvsRoot(connectionString.ToString());
- 								WorkingDirectory wd = new WorkingDirectory( root, slnLocation, moduleName );
- 								CheckoutModuleCommand cmd = new CheckoutModuleCommand( wd );
- 								serverConnection = new CVSServerConnection( wd );
- 								cont.OutputPane.RegisterCvsConnection( serverConnection );
- 								serverConnection.Connect( wd, connectionString.Password );
- 								cmd.Execute( serverConnection );
- 							}
- 							catch(Exception e )
- 							{
- 								using( new SafeCursor( Cursors.Default ) )
- 								{
- 									cont.UIShell.ExceptionMessage( e.Message );
- 								}						
- 							}
- 
- 							if( serverConnection != null ) serverConnection.Close();
- 
- 							try
- 							{
- 
- 								// find solution to open
- 								DirectoryInfo di = new DirectoryInfo( openDlg.SolutionPath );
- 
- 								FileInfo[] files = di.GetFiles( "*.sln" );
- 								string solutionName = string.Empty;
- 							
- 								// no solution file to open
- 								if( files.Length == 0 )
- 								{
- 									cont.UIShell.ExclamationMessage( "MSGBOX_MISSING_SOLUTION_FILE"  );
- 									return;
- 								}
  
- 								// two or more solution files, pick one
- 								if( files.Length > 1 )
- 								{
- 									using( new SafeCursor( Cursors.Default ) )
- 									{
- 										FormPickSolution fps = new FormPickSolution( cont, files );
- 										if( fps.ShowDialog( cont.HostWindow ) == DialogResult.OK )
- 										{
- 											solutionName = fps.SolutionFile;
- 										}
- 										else
- 										{
- 											return;
- 										}
- 									}
- 								}
- 
- 								solutionName = files[0].Name;
  
! 								// ok, if we are this far, we checked out the solution from cvs, lets open it
! 								cont.OpenSolution(Path.Combine(openDlg.SolutionPath, solutionName )); 
! 								// save user actions
! 								Module m = cont.Model.Roots.CurrentRoot.AddModule( moduleName );
! 								if( tag != string.Empty )
! 								{
! 									m.AddTag( tag );
! 								}
! 
! 								cont.Model.Save();
! 							}
! 							catch(Exception e)
! 							{
! 								using( new SafeCursor( Cursors.Default ) )
! 								{
! 									cont.UIShell.ExceptionMessage(e.Message);
! 								}
! 							}
  						}
  						// everything is successful
--- 78,94 ----
  							string moduleName = openDlg.cvsModuleDropDown.Text;
  							string tag = openDlg.cvsTagDropDown.Text;
  
  
! 							CvsCheckoutJob job = new CvsCheckoutJob( cont, 
! 								connectionString.ToString(),
! 								moduleName, 
! 								slnLocation,
! 								connectionString.Password,
! 								openDlg.SolutionPath,
! 								tag );
!                             
! 							// cvs operation will be handled in job queue thread, the remainder of solution 
! 							// open operation will be done once job is done in OnCheckoutComplete
! 							cont.Jobs.AddJob( job, new JobCompletionHandler( this.OnCheckoutComplete ) );
  						}
  						// everything is successful