[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/actions CheckOutAction.java, 1.36, 1.37

[Mikael P. <er...@us...>]

Update of /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/actions
In directory vz-cvs-4.sog:/tmp/cvs-serv17895/src/net/sourceforge/eclipseccase/ui/actions

Modified Files:
	CheckOutAction.java 
Log Message:
Commited fix for handling refactor and "automatic checkout".

Index: CheckOutAction.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/actions/CheckOutAction.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** CheckOutAction.java	25 Nov 2011 12:36:28 -0000	1.36
--- CheckOutAction.java	16 Dec 2011 15:01:44 -0000	1.37
***************
*** 19,30 ****
  	@Override
  	public void execute(IAction action) {
! 		
  		final IResource[] resources = getSelectedResources();
  		final ClearCaseProvider provider = ClearCaseProvider.getClearCaseProvider(resources[0]);
! 		
! 		if (PreventCheckoutHelper.isPreventedFromCheckOut(provider, resources, ClearCasePreferences.isSilentPrevent())){
! 			return;
! 		}
! 		
  
  		String maybeComment = "";
--- 19,36 ----
  	@Override
  	public void execute(IAction action) {
! 
  		final IResource[] resources = getSelectedResources();
  		final ClearCaseProvider provider = ClearCaseProvider.getClearCaseProvider(resources[0]);
! 		IWorkspaceRunnable myRunnable = new IWorkspaceRunnable() {
! 
! 			public void run(IProgressMonitor monitor) throws CoreException {
! 				if (PreventCheckoutHelper.isPreventedFromCheckOut(provider, resources, ClearCasePreferences.isSilentPrevent())) {
! 					return;
! 				}
! 
! 			}
! 		};
! 
! 		executeInBackground(myRunnable, "Checking files prevented from checkout ...");
  
  		String maybeComment = "";
***************
*** 41,51 ****
  		final String comment = maybeComment;
  		final int depth = maybeDepth;
  
! 		// UCM checkout.
! 		if (ClearCasePreferences.isUCM() && !ClearCasePreferences.isUseClearDlg()) {
! 			if (!UcmActivity.checkoutWithActivity(provider, resources, getShell()))
! 				// no checkout
! 				return;
! 		}
  
  		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {
--- 47,66 ----
  		final String comment = maybeComment;
  		final int depth = maybeDepth;
+ 		
+ 		
+ 		IWorkspaceRunnable my2Runnable = new IWorkspaceRunnable() {
  
! 			public void run(IProgressMonitor monitor) throws CoreException {
! 				// UCM checkout.
! 				if (ClearCasePreferences.isUCM() && !ClearCasePreferences.isUseClearDlg()) {
! 					if (!UcmActivity.checkoutWithActivity(provider, resources, getShell()))
! 						// no checkout
! 						return;
! 				}
! 
! 			}
! 		};
! 
! 		executeInBackground(my2Runnable, "UCM checkout ...");
  
  		IWorkspaceRunnable runnable = new IWorkspaceRunnable() {