eclipse-ccase-cvs — CVS commits

[eclipse-ccase-cvs] net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase ClearCaseCLIImpl.java, 1.126, 1.127

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

Update of /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase
In directory vz-cvs-4.sog:/tmp/cvs-serv9576/src/commandline/net/sourceforge/clearcase

Modified Files:
	ClearCaseCLIImpl.java 
Log Message:
Added message to error unspecified.


Index: ClearCaseCLIImpl.java
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/ClearCaseCLIImpl.java,v
retrieving revision 1.126
retrieving revision 1.127
diff -C2 -d -r1.126 -r1.127
*** ClearCaseCLIImpl.java	2 Dec 2011 07:19:28 -0000	1.126
--- ClearCaseCLIImpl.java	20 Dec 2011 15:28:00 -0000	1.127
***************
*** 1499,1503 ****
  				break;
  			default:
! 				ClearCase.error(ClearCase.ERROR_UNSPECIFIED);
  				break;
  			}
--- 1499,1503 ----
  				break;
  			default:
! 				ClearCase.error(ClearCase.ERROR_UNSPECIFIED,cce.getMessage());
  				break;
  			}

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui.test/src/net/sourceforge/eclipseccase/ui/test ClearCaseUIModificationHandlerTest.java, NONE, 1.1

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

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

Added Files:
	ClearCaseUIModificationHandlerTest.java 
Log Message:
Adding initial version

--- NEW FILE: ClearCaseUIModificationHandlerTest.java ---
package net.sourceforge.eclipseccase.ui.test;

import static org.junit.Assert.*;

import java.util.HashMap;


import net.sourceforge.clearcase.ClearCaseInterface;
import net.sourceforge.eclipseccase.ClearCasePlugin;
import net.sourceforge.eclipseccase.ClearCasePreferences;

import org.easymock.EasyMock;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.powermock.api.easymock.PowerMock;
import org.powermock.core.classloader.annotations.PrepareForTest;
import org.powermock.modules.junit4.PowerMockRunner;

@RunWith(PowerMockRunner.class)
@PrepareForTest( { ClearCasePreferences.class })
public class ClearCaseUIModificationHandlerTest {
	
	// mock instance
	private ClearCasePreferences ccpMock;
	
	//class under test
	

	@Test
	public final void testValidateEditIFileArrayFileModificationValidationContext() {
		fail("Not yet implemented");
	}

	@Test
	public void testValidateSaveIFile() {
		ccpMock = PowerMock.createMock(ClearCasePreferences.class);
		
		//uiModHandler = new ClearCaseUIModificationHandler();
		
		

		EasyMock.expect(ccpMock.isCheckoutAutoNever()).andReturn(false);
		
		// Verify behavior for all mock objects.
		PowerMock.verifyAll();
	}

}

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui.test/src/net/sourceforge - New directory

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

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

Log Message:
Directory /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui.test/src/net/sourceforge added to the repository

[eclipse-ccase-cvs] net.sourceforge.eclipseccase/META-INF CHANGELOG.txt, 1.26, 1.27

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

Update of /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase/META-INF
In directory vz-cvs-4.sog:/tmp/cvs-serv17920/META-INF

Modified Files:
	CHANGELOG.txt 
Log Message:
Commited fix for handling refactor and "automatic checkout".

Index: CHANGELOG.txt
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase/META-INF/CHANGELOG.txt,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -d -r1.26 -r1.27
*** CHANGELOG.txt	25 Nov 2011 12:36:25 -0000	1.26
--- CHANGELOG.txt	16 Dec 2011 15:01:48 -0000	1.27
***************
*** 3,6 ****
--- 3,13 ----
  ===============================================================================
  2.2.13 (( to be released).
+ ======
+ 
+ Bugs:
+ 3451495 Renaming Class caused ArrayIndexOutOfBoundsException - 0
+ 
+ Feature:
+ 3414983 	Automatic diff when checking in files
  
  2.2.12 

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui UcmActivity.java, 1.9, 1.10 ClearCaseUIModificationHandler.java, 1.18, 1.19

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

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

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

Index: ClearCaseUIModificationHandler.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/ClearCaseUIModificationHandler.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** ClearCaseUIModificationHandler.java	6 Dec 2011 09:11:40 -0000	1.18
--- ClearCaseUIModificationHandler.java	16 Dec 2011 15:01:44 -0000	1.19
***************
*** 65,74 ****
  	 */
  	private IStatus checkout(final IFile[] files, final Shell shell) {
  		final ClearCaseProvider provider = getProvider(files);
  		if (PreventCheckoutHelper.isPreventedFromCheckOut(provider, files, true))
  			return CANCEL;
! 		
  		final IResource[] resources = PreventCheckoutHelper.isCheckedOut(provider, files);
! 		if(resources.length == 0 || resources == null){
  			return CANCEL;
  		}
--- 65,75 ----
  	 */
  	private IStatus checkout(final IFile[] files, final Shell shell) {
+ 		System.out.println(getClass().getName()+"checkout()");
  		final ClearCaseProvider provider = getProvider(files);
  		if (PreventCheckoutHelper.isPreventedFromCheckOut(provider, files, true))
  			return CANCEL;
! 
  		final IResource[] resources = PreventCheckoutHelper.isCheckedOut(provider, files);
! 		if (resources.length == 0 || resources == null) {
  			return CANCEL;
  		}
***************
*** 85,90 ****
  		final boolean askForComment = ClearCasePreferences.isCommentCheckout() && !ClearCasePreferences.isCommentCheckoutNeverOnAuto();
  
! 		// UCM checkout.
! 		if (ClearCasePreferences.isUCM() && !ClearCasePreferences.isUseClearDlg()) {
  			if (!UcmActivity.checkoutWithActivity(provider, resources, shell))
  				// no checkout
--- 86,91 ----
  		final boolean askForComment = ClearCasePreferences.isCommentCheckout() && !ClearCasePreferences.isCommentCheckoutNeverOnAuto();
  
! 		// UCM Show ActivityDialog with comment
! 		if (ClearCasePreferences.isUCM() && !ClearCasePreferences.isUseClearDlg() && askForComment) {
  			if (!UcmActivity.checkoutWithActivity(provider, resources, shell))
  				// no checkout
***************
*** 177,181 ****
  
  	/*
! 	 * (non-Javadoc)
  	 * 
  	 * @see
--- 178,182 ----
  
  	/*
! 	 * This is used by "refactoring" and "auto checkout". (non-Javadoc)
  	 * 
  	 * @see
***************
*** 187,208 ****
  	public IStatus validateEdit(final IFile[] files, final FileModificationValidationContext context) {
  		if (ClearCasePreferences.isCheckoutAutoNever())
  			return CANCEL;
  		final Shell shell = getShell(context);
  		final boolean askForComment = ClearCasePreferences.isCommentCheckout() && !ClearCasePreferences.isCommentCheckoutNeverOnAuto();
  		if (null == shell || !askForComment) {
! 
! 			// UCM checkout we need to use a ActivityDialog.
! 			if (ClearCasePreferences.isUCM() && !ClearCasePreferences.isUseClearDlg()) {
! 				if (null == shell) {
! 					return checkout(files,PlatformUI.getWorkbench().getDisplay().getActiveShell());
! 				} else {
! 					return checkout(files, shell);
! 				}
! 			}
! 
! 			
! 
  			return super.validateEdit(files, context);
  		}
  		try {
  			this.validateEditLock.acquire();
--- 188,202 ----
  	public IStatus validateEdit(final IFile[] files, final FileModificationValidationContext context) {
  		if (ClearCasePreferences.isCheckoutAutoNever())
+ 			// FIXME: We need to inform user that Auto checkout is never
+ 			// allowed.
  			return CANCEL;
+ 		// We are allowed to checkout file.
  		final Shell shell = getShell(context);
  		final boolean askForComment = ClearCasePreferences.isCommentCheckout() && !ClearCasePreferences.isCommentCheckoutNeverOnAuto();
  		if (null == shell || !askForComment) {
! 			System.out.println("Shell is set to "+shell+" and askForComment is "+askForComment);
  			return super.validateEdit(files, context);
  		}
+ 
  		try {
  			this.validateEditLock.acquire();

Index: UcmActivity.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/UcmActivity.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** UcmActivity.java	14 Nov 2011 12:09:52 -0000	1.9
--- UcmActivity.java	16 Dec 2011 15:01:44 -0000	1.10
***************
*** 12,15 ****
--- 12,17 ----
  package net.sourceforge.eclipseccase.ui;
  
+ import org.eclipse.swt.widgets.Display;
+ 
  import net.sourceforge.eclipseccase.ClearCaseProvider;
  import net.sourceforge.eclipseccase.ui.dialogs.ActivityDialog;
***************
*** 25,28 ****
--- 27,82 ----
   */
  public class UcmActivity {
+ 	
+ 	
+ 	//private class
+ 	private static class ActivityDialogRunnable implements Runnable {
+ 
+ 		private Shell shell;
+ 
+ 		private ClearCaseProvider provider;
+ 
+ 		private IResource[] resources;
+ 
+ 		private boolean checkout;
+ 
+ 		public ActivityDialogRunnable(ClearCaseProvider provider,  IResource[] resources,  Shell shell) {
+ 			this.provider = provider;
+ 			this.resources = resources;
+ 			this.shell = shell;
+ 		}
+ 
+ 		public void run() {
+ 			final IResource resource = resources[0];
+ 			if (resource != null) {
+ 				final String view = ClearCaseProvider.getViewName(resource);
+ 				ActivityDialog dlg = new ActivityDialog(shell, provider, resource);
+ 				dlg.setBlockOnOpen(true);
+ 				if (dlg.open() == Window.OK) {
+ 
+ 					String activity = dlg.getSelectedActivity();
+ 					if (activity != null) {
+ 						provider.setActivity(activity, view);
+ 						setCheckout(true);
+ 					}
+ 
+ 				} else {
+ 					// Answer was N or Cancel.
+ 					setCheckout(false);
+ 				}
+ 
+ 			}
+ 			// resource null don't check-out.
+ 			setCheckout(false);
+ 		}
+ 
+ 		public void setCheckout(boolean checkout) {
+ 			this.checkout = checkout;
+ 		}
+ 
+ 		public boolean getCheckout() {
+ 			return checkout;
+ 		}
+ 
+ 	}
  
  	/**
***************
*** 33,57 ****
  	 * @return
  	 */
! 	public static boolean checkoutWithActivity(ClearCaseProvider provider, IResource[] resources, Shell shell) {
! 
! 		IResource resource = resources[0];
! 		if (resource != null) {
! 			String view = ClearCaseProvider.getViewName(resource);
! 			ActivityDialog dlg = new ActivityDialog(shell, provider, resource);
! 			if (dlg.open() == Window.OK) {
! 				String activity = dlg.getSelectedActivity();
! 				if (activity != null) {
! 					provider.setActivity(activity, view);
! 					return true;
! 				}
  
! 			} else
! 				// Answer was N or Cancel.
! 				return false;
  
- 			return true;
- 		}
- 		// resource null don't check-out.
- 		return false;
  	}
  
--- 87,96 ----
  	 * @return
  	 */
! 	public static boolean checkoutWithActivity( ClearCaseProvider provider, IResource[] resources, Shell shell) {
  
! 		ActivityDialogRunnable activityDialog = new ActivityDialogRunnable(provider, resources, shell);
! 		Display.getDefault().syncExec(activityDialog);
! 		return activityDialog.getCheckout();
  
  	}
  

[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() {

[eclipse-ccase-cvs] net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/output/strategy SuccessfulMove.java, 1.7, 1.8

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

Update of /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/output/strategy
In directory vz-cvs-4.sog:/tmp/cvs-serv17919/src/commandline/net/sourceforge/clearcase/commandline/output/strategy

Modified Files:
	SuccessfulMove.java 
Log Message:
Fix for Bug 3451495

Index: SuccessfulMove.java
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/output/strategy/SuccessfulMove.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** SuccessfulMove.java	19 Feb 2010 09:07:55 -0000	1.7
--- SuccessfulMove.java	14 Dec 2011 12:25:19 -0000	1.8
***************
*** 34,38 ****
  	@Override
  	protected String getPattern() {
! 		return "Moved\\s\"(\\S+)\"\\sto\\s\"(\\S+)\".";
  	}
  
--- 34,38 ----
  	@Override
  	protected String getPattern() {
! 		return "Moved\\s\"(.*)\"\\sto\\s\"(.*)\".";
  	}
  

[eclipse-ccase-cvs] net.sourceforge.clearcase.test/src/net/sourceforge/clearcase/tests/output MoveOutputScenarioTest.java, 1.1, 1.2

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

Update of /cvsroot/clearcase-java/net.sourceforge.clearcase.test/src/net/sourceforge/clearcase/tests/output
In directory vz-cvs-4.sog:/tmp/cvs-serv17911/src/net/sourceforge/clearcase/tests/output

Modified Files:
	MoveOutputScenarioTest.java 
Log Message:
Fix for Bug 3451495

Index: MoveOutputScenarioTest.java
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase.test/src/net/sourceforge/clearcase/tests/output/MoveOutputScenarioTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MoveOutputScenarioTest.java	30 Sep 2011 05:26:26 -0000	1.1
--- MoveOutputScenarioTest.java	14 Dec 2011 12:25:16 -0000	1.2
***************
*** 43,45 ****
--- 43,98 ----
  	}
  
+ 	/**
+ 	 * Make sure a move can handle paths containg space.
+ 	 */
+ 	public void testMoveWithSpaceInPath() {
+ 		try {
+ 
+ 			String[] cleartoolOutput = new String[] { "Moved \"\\vob\\test\\app mde\\hello.c\" to \"\\vob\\test\\app mde\\src\\hello.c\"." };
+ 			ClearCaseElementState[] cces = getClearCaseCLI().parserCCOutput(
+ 					cleartoolOutput);
+ 			assertNotNull("State output should not be null", cces);
+ 			assertEquals("Expected 1 element in states", 1, cces.length);
+ 			assertTrue(cces[0].state == ClearCase.MOVED);
+ 			assertEquals("\\vob\\test\\app mde\\hello.c", cces[0].element);
+ 
+ 		} catch (Exception e) {
+ 			fail();
+ 		}
+ 	}
+ 	/**
+ 	 * Make sure we can have numbers in path.
+ 	 */
+ 	public void testMoveWithNumberInPath() {
+ 		try {
+ 
+ 			String[] cleartoolOutput = new String[] { "Moved \"\\vob\\test\\appmde1\\hello.c\" to \"\\vob\\test\\appmde1\\src\\hello.c\"." };
+ 			ClearCaseElementState[] cces = getClearCaseCLI().parserCCOutput(
+ 					cleartoolOutput);
+ 			assertNotNull("State output should not be null", cces);
+ 			assertEquals("Expected 1 element in states", 1, cces.length);
+ 			assertTrue(cces[0].state == ClearCase.MOVED);
+ 			assertEquals("\\vob\\test\\appmde1\\hello.c", cces[0].element);
+ 
+ 		} catch (Exception e) {
+ 			fail();
+ 		}
+ 	}
+ 	
+ 	public void testMoveWithMixOfCharactersInPath() {
+ 		try {
+ 
+ 			String[] cleartoolOutput = new String[] { "Moved \"\\vob\\test\\appmde1_2\\hello.c\" to \"\\vob\\test\\appmde1_2\\src\\hello.c\"." };
+ 			ClearCaseElementState[] cces = getClearCaseCLI().parserCCOutput(
+ 					cleartoolOutput);
+ 			assertNotNull("State output should not be null", cces);
+ 			assertEquals("Expected 1 element in states", 1, cces.length);
+ 			assertTrue(cces[0].state == ClearCase.MOVED);
+ 			assertEquals("\\vob\\test\\appmde1_2\\hello.c", cces[0].element);
+ 
+ 		} catch (Exception e) {
+ 			fail();
+ 		}
+ 	}
+ 
  }

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/dialogs ActivityDialog.java, 1.39, 1.40

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

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

Modified Files:
	ActivityDialog.java 
Log Message:
Fix for name i Checkout Dialog.

Index: ActivityDialog.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/dialogs/ActivityDialog.java,v
retrieving revision 1.39
retrieving revision 1.40
diff -C2 -d -r1.39 -r1.40
*** ActivityDialog.java	5 Dec 2011 13:18:14 -0000	1.39
--- ActivityDialog.java	6 Dec 2011 11:04:29 -0000	1.40
***************
*** 67,71 ****
  	@Override
  	protected Control createDialogArea(Composite parent) {
! 		getShell().setText(Messages.getString("ActivityDialog.title"+" "+resource.getName()));
  		Composite composite = new Composite(parent, SWT.NULL);
  		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
--- 67,71 ----
  	@Override
  	protected Control createDialogArea(Composite parent) {
! 		getShell().setText(Messages.getString("ActivityDialog.title")+" "+resource.getName());
  		Composite composite = new Composite(parent, SWT.NULL);
  		composite.setLayoutData(new GridData(GridData.FILL_BOTH));

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui ClearCaseUIModificationHandler.java, 1.17, 1.18

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

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

Modified Files:
	ClearCaseUIModificationHandler.java 
Log Message:
Checkedout files should not be checkedout again .

Index: ClearCaseUIModificationHandler.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/ClearCaseUIModificationHandler.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** ClearCaseUIModificationHandler.java	1 Dec 2011 07:19:05 -0000	1.17
--- ClearCaseUIModificationHandler.java	6 Dec 2011 09:11:40 -0000	1.18
***************
*** 66,70 ****
--- 66,76 ----
  	private IStatus checkout(final IFile[] files, final Shell shell) {
  		final ClearCaseProvider provider = getProvider(files);
+ 		if (PreventCheckoutHelper.isPreventedFromCheckOut(provider, files, true))
+ 			return CANCEL;
  		
+ 		final IResource[] resources = PreventCheckoutHelper.isCheckedOut(provider, files);
+ 		if(resources.length == 0 || resources == null){
+ 			return CANCEL;
+ 		}
  		// check for provider
  		if (null == provider) {
***************
*** 78,82 ****
  		final boolean useClearDlg = ClearCasePreferences.isUseClearDlg();
  		final boolean askForComment = ClearCasePreferences.isCommentCheckout() && !ClearCasePreferences.isCommentCheckoutNeverOnAuto();
! 		
  		try {
  			// use workbench window as preferred runnable context
--- 84,95 ----
  		final boolean useClearDlg = ClearCasePreferences.isUseClearDlg();
  		final boolean askForComment = ClearCasePreferences.isCommentCheckout() && !ClearCasePreferences.isCommentCheckoutNeverOnAuto();
! 
! 		// UCM checkout.
! 		if (ClearCasePreferences.isUCM() && !ClearCasePreferences.isUseClearDlg()) {
! 			if (!UcmActivity.checkoutWithActivity(provider, resources, shell))
! 				// no checkout
! 				return CANCEL;
! 		}
! 
  		try {
  			// use workbench window as preferred runnable context
***************
*** 93,109 ****
  				public void run(final IProgressMonitor monitor) throws InvocationTargetException, InterruptedException {
  					try {
- 						
- 						if (PreventCheckoutHelper.isPreventedFromCheckOut(provider, files, true))
- 							//return CANCEL;
- 							throw new InterruptedException("Operation canceled by user.");
- 						
- 						// UCM checkout.
- 						if (ClearCasePreferences.isUCM() && !ClearCasePreferences.isUseClearDlg()) {
- 							if (!UcmActivity.checkoutWithActivity(provider, files, shell))
- 								// no checkout
- 								//return CANCEL;
- 								throw new InterruptedException("Operation canceled by user.");	
- 						}
- 						
  						String comment = null;
  
--- 106,109 ----
***************
*** 122,129 ****
  							boolean refreshing = setResourceRefreshing(provider, false);
  							try {
! 								monitor.beginTask(Messages.getString("ClearCaseUIModificationHandler.task.checkout"), files.length); //$NON-NLS-1$
  								if (ClearCasePreferences.isUseClearDlg()) {
  									monitor.subTask("Executing ClearCase user interface...");
! 									ClearDlgHelper.checkout(files);
  								} else {
  									if (null != comment) {
--- 122,129 ----
  							boolean refreshing = setResourceRefreshing(provider, false);
  							try {
! 								monitor.beginTask(Messages.getString("ClearCaseUIModificationHandler.task.checkout"), resources.length); //$NON-NLS-1$
  								if (ClearCasePreferences.isUseClearDlg()) {
  									monitor.subTask("Executing ClearCase user interface...");
! 									ClearDlgHelper.checkout(resources);
  								} else {
  									if (null != comment) {
***************
*** 131,138 ****
  									}
  
! 									for (int i = 0; i < files.length; i++) {
! 										IFile file = files[i];
  										monitor.subTask(file.getName());
! 										provider.checkout(new IFile[] { file }, IResource.DEPTH_ZERO, null);
  										file.refreshLocal(IResource.DEPTH_ZERO, null);
  										monitor.worked(i);
--- 131,138 ----
  									}
  
! 									for (int i = 0; i < resources.length; i++) {
! 										IResource file = resources[i];
  										monitor.subTask(file.getName());
! 										provider.checkout(new IResource[] { file }, IResource.DEPTH_ZERO, null);
  										file.refreshLocal(IResource.DEPTH_ZERO, null);
  										monitor.worked(i);
***************
*** 148,152 ****
  					}
  				}
! 			}, new MultiRule(files));
  		} catch (InvocationTargetException e) {
  			ClearCasePlugin.log(Messages.getString("ClearCaseUIModificationHandler.error.checkout") //$NON-NLS-1$
--- 148,152 ----
  					}
  				}
! 			}, new MultiRule(resources));
  		} catch (InvocationTargetException e) {
  			ClearCasePlugin.log(Messages.getString("ClearCaseUIModificationHandler.error.checkout") //$NON-NLS-1$
***************
*** 188,192 ****
  		if (ClearCasePreferences.isCheckoutAutoNever())
  			return CANCEL;
- 		final ClearCaseProvider provider = getProvider(files);
  		final Shell shell = getShell(context);
  		final boolean askForComment = ClearCasePreferences.isCommentCheckout() && !ClearCasePreferences.isCommentCheckoutNeverOnAuto();
--- 188,191 ----
***************
*** 202,208 ****
  			}
  
! 			if (PreventCheckoutHelper.isPreventedFromCheckOut(provider, files, ClearCasePreferences.isSilentPrevent())) {
! 				return CANCEL;
! 			}
  
  			return super.validateEdit(files, context);
--- 201,205 ----
  			}
  
! 			
  
  			return super.validateEdit(files, context);

[eclipse-ccase-cvs] net.sourceforge.eclipseccase/src/net/sourceforge/eclipseccase PreventCheckoutHelper.java, 1.2, 1.3

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

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

Modified Files:
	PreventCheckoutHelper.java 
Log Message:
Checkedout files should not be checkedout again .

Index: PreventCheckoutHelper.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase/src/net/sourceforge/eclipseccase/PreventCheckoutHelper.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** PreventCheckoutHelper.java	25 Nov 2011 12:36:24 -0000	1.2
--- PreventCheckoutHelper.java	6 Dec 2011 09:11:35 -0000	1.3
***************
*** 6,9 ****
--- 6,12 ----
  
  
+ import java.util.ArrayList;
+ import java.util.Arrays;
+ 
  import org.eclipse.core.resources.IResource;
  import org.eclipse.ui.PlatformUI;
***************
*** 34,38 ****
  	}
  	
! 	
  
  }
--- 37,50 ----
  	}
  	
! 	public static IResource[] isCheckedOut(ClearCaseProvider provider, IResource[] resources){
! 		ArrayList<IResource> toBeCheckedout = new ArrayList<IResource>(Arrays.asList(resources)); 
! 		for (final IResource resource : resources) {
! 			if(provider.isCheckedOut(resource)){
! 				toBeCheckedout.remove(resource);
! 			}
! 			
! 		}
! 		return (IResource[])toBeCheckedout.toArray( new IResource[toBeCheckedout.size() ]);
! 	}
  
  }

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/dialogs ActivityDialog.java, 1.38, 1.39

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

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

Modified Files:
	ActivityDialog.java 
Log Message:
Added name of file to checkout in Dialog.

Index: ActivityDialog.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/src/net/sourceforge/eclipseccase/ui/dialogs/ActivityDialog.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -C2 -d -r1.38 -r1.39
*** ActivityDialog.java	21 Nov 2011 11:03:11 -0000	1.38
--- ActivityDialog.java	5 Dec 2011 13:18:14 -0000	1.39
***************
*** 67,71 ****
  	@Override
  	protected Control createDialogArea(Composite parent) {
! 		getShell().setText(Messages.getString("ActivityDialog.title"));
  		Composite composite = new Composite(parent, SWT.NULL);
  		composite.setLayoutData(new GridData(GridData.FILL_BOTH));
--- 67,71 ----
  	@Override
  	protected Control createDialogArea(Composite parent) {
! 		getShell().setText(Messages.getString("ActivityDialog.title"+" "+resource.getName()));
  		Composite composite = new Composite(parent, SWT.NULL);
  		composite.setLayoutData(new GridData(GridData.FILL_BOTH));

[eclipse-ccase-cvs] net.sourceforge.eclipseccase/src/net/sourceforge/eclipseccase ClearCaseProvider.java, 1.74, 1.75

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

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

Modified Files:
	ClearCaseProvider.java 
Log Message:
Refactor method name.

Index: ClearCaseProvider.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase/src/net/sourceforge/eclipseccase/ClearCaseProvider.java,v
retrieving revision 1.74
retrieving revision 1.75
diff -C2 -d -r1.74 -r1.75
*** ClearCaseProvider.java	1 Dec 2011 07:19:23 -0000	1.74
--- ClearCaseProvider.java	2 Dec 2011 07:19:31 -0000	1.75
***************
*** 638,642 ****
  			String activitySelector, String path) throws ClearCaseException {
  		ClearCaseElementState[] cces = ClearCasePlugin.getEngine()
! 				.createActivity(
  						ClearCase.HEADLINE | ClearCase.FORCE | ClearCase.NSET,
  						headline, activitySelector, path);
--- 638,642 ----
  			String activitySelector, String path) throws ClearCaseException {
  		ClearCaseElementState[] cces = ClearCasePlugin.getEngine()
! 				.mkActivity(
  						ClearCase.HEADLINE | ClearCase.FORCE | ClearCase.NSET,
  						headline, activitySelector, path);

[eclipse-ccase-cvs] net.sourceforge.clearcase/src/common/net/sourceforge/clearcase ClearCaseInterface.java, 1.49, 1.50

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

Update of /cvsroot/clearcase-java/net.sourceforge.clearcase/src/common/net/sourceforge/clearcase
In directory vz-cvs-4.sog:/tmp/cvs-serv3112/src/common/net/sourceforge/clearcase

Modified Files:
	ClearCaseInterface.java 
Log Message:
Refactor method name.

Index: ClearCaseInterface.java
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase/src/common/net/sourceforge/clearcase/ClearCaseInterface.java,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** ClearCaseInterface.java	28 Nov 2011 08:50:31 -0000	1.49
--- ClearCaseInterface.java	2 Dec 2011 07:19:27 -0000	1.50
***************
*** 1464,1468 ****
       *                      Set activity "create_directories" in view "webo_integ".
  	 */
! 	public abstract ClearCaseElementState [] createActivity(int flags,String headline,String activitySelector, String path) throws ClearCaseException;
  	
  	
--- 1464,1468 ----
       *                      Set activity "create_directories" in view "webo_integ".
  	 */
! 	public abstract ClearCaseElementState [] mkActivity(int flags,String headline,String activitySelector, String path) throws ClearCaseException;
  	
  	

[eclipse-ccase-cvs] net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10 objenesis-1.2.jar, NONE, 1.1 powermock-easymock-1.4.10-full.jar, NONE, 1.1 easymock-3.0.jar, NONE, 1.1 javassist-3.15.0-GA.jar, NONE, 1.1 cglib-nodep-2.2.jar, NONE, 1.1 junit-4.8.2.jar, NONE, 1.1

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

Update of /cvsroot/clearcase-java/net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10
In directory vz-cvs-4.sog:/tmp/cvs-serv15827/3rdparty/powermock-easymock-junit-1.4.10

Added Files:
	objenesis-1.2.jar powermock-easymock-1.4.10-full.jar 
	easymock-3.0.jar javassist-3.15.0-GA.jar cglib-nodep-2.2.jar 
	junit-4.8.2.jar 
Log Message:
Upgrade of PowerMock

--- NEW FILE: objenesis-1.2.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: powermock-easymock-1.4.10-full.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: javassist-3.15.0-GA.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: easymock-3.0.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cglib-nodep-2.2.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: junit-4.8.2.jar ---
(This appears to be a binary file; contents omitted.)

[eclipse-ccase-cvs] net.sourceforge.clearcase.test .classpath, 1.1, 1.2

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

Update of /cvsroot/clearcase-java/net.sourceforge.clearcase.test
In directory vz-cvs-4.sog:/tmp/cvs-serv15818

Modified Files:
	.classpath 
Log Message:
Upgrade of PowerMock

Index: .classpath
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase.test/.classpath,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .classpath	29 Sep 2011 06:20:39 -0000	1.1
--- .classpath	1 Dec 2011 10:41:59 -0000	1.2
***************
*** 3,6 ****
--- 3,12 ----
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
  	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ 	<classpathentry exported="true" kind="lib" path="/net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10/cglib-nodep-2.2.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="/net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10/easymock-3.0.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="/net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10/javassist-3.15.0-GA.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="/net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10/junit-4.8.2.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="/net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10/powermock-easymock-1.4.10-full.jar"/>
+ 	<classpathentry exported="true" kind="lib" path="/net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10/objenesis-1.2.jar"/>
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="output" path="bin"/>

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui/lib/powermock-easymock-junit-1.4.10 powermock-easymock-1.4.10-full.jar, NONE, 1.1 cglib-nodep-2.2.jar, NONE, 1.1 junit-4.8.2.jar, NONE, 1.1 easymock-3.0.jar, NONE, 1.1 javassist-3.15.0-GA.jar, NONE, 1.1 objenesis-1.2.jar, NONE, 1.1

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

Update of /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/lib/powermock-easymock-junit-1.4.10
In directory vz-cvs-4.sog:/tmp/cvs-serv15795/lib/powermock-easymock-junit-1.4.10

Added Files:
	powermock-easymock-1.4.10-full.jar cglib-nodep-2.2.jar 
	junit-4.8.2.jar easymock-3.0.jar javassist-3.15.0-GA.jar 
	objenesis-1.2.jar 
Log Message:
Upgrade of PowerMock

--- NEW FILE: objenesis-1.2.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: powermock-easymock-1.4.10-full.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: javassist-3.15.0-GA.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: easymock-3.0.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: cglib-nodep-2.2.jar ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: junit-4.8.2.jar ---
(This appears to be a binary file; contents omitted.)

[eclipse-ccase-cvs] net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10 - New directory

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

Update of /cvsroot/clearcase-java/net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10
In directory vz-cvs-4.sog:/tmp/cvs-serv15788/3rdparty/powermock-easymock-junit-1.4.10

Log Message:
Directory /cvsroot/clearcase-java/net.sourceforge.clearcase/3rdparty/powermock-easymock-junit-1.4.10 added to the repository

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui/lib/powermock-easymock-junit-1.4.10 - New directory

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

Update of /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/lib/powermock-easymock-junit-1.4.10
In directory vz-cvs-4.sog:/tmp/cvs-serv15780/lib/powermock-easymock-junit-1.4.10

Log Message:
Directory /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui/lib/powermock-easymock-junit-1.4.10 added to the repository

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.ui.test .classpath, 1.1, 1.2

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

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

Modified Files:
	.classpath 
Log Message:
Change in classpath

Index: .classpath
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.ui.test/.classpath,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .classpath	29 Sep 2011 06:32:14 -0000	1.1
--- .classpath	1 Dec 2011 09:16:05 -0000	1.2
***************
*** 3,7 ****
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
  	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
- 	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>
--- 3,6 ----

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.test/src/net/sourceforge/eclipseccase/test ClearCaseProviderTest.java, 1.2, 1.3

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

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

Modified Files:
	ClearCaseProviderTest.java 
Log Message:
Added negative test for ClearCaseProvider.getActivitySelectors()

Index: ClearCaseProviderTest.java
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.test/src/net/sourceforge/eclipseccase/test/ClearCaseProviderTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** ClearCaseProviderTest.java	1 Dec 2011 08:43:12 -0000	1.2
--- ClearCaseProviderTest.java	1 Dec 2011 08:53:33 -0000	1.3
***************
*** 121,123 ****
--- 121,157 ----
  		PowerMock.verifyAll();
  	}
+ 	
+ 	/**
+ 	 * Test method for
+ 	 * {@link net.sourceforge.eclipseccase.ClearCaseProvider#getPvobTag(java.lang.String)}
+ 	 * Checks that when there is no activities it returns an empty array.
+ 	 */
+ 	@Test
+ 	public void testgetActivitySelectorsNoActivities() {
+ 		final String VIEW_NAME = "myview";
+ 		HashMap<Integer, String> args = new HashMap<Integer, String>();
+ 		args.put(Integer.valueOf(ClearCase.FORMAT), "%[activities]CXp");
+ 		args.put(Integer.valueOf(ClearCase.VIEW), VIEW_NAME);
+ 		// Set expectations on mocks.
+ 
+ 		EasyMock.expect(ClearCasePlugin.getEngine()).andReturn(cciMock);
+ 		EasyMock
+ 				.expect(
+ 						cciMock.getStream(ClearCase.FORMAT | ClearCase.VIEW,
+ 								args))
+ 				.andStubReturn(
+ 						new String[] {});
+ 
+ 		// Only add those not created by PowerMock.
+ 		PowerMock.replayAll(cciMock);
+ 
+ 		String[] activitySelectors = provider.getActivitySelectors(VIEW_NAME);
+ 		assertArrayEquals(
+ 				"Array is not empty",
+ 				new String[] {},
+ 				activitySelectors);
+ 	
+ 		// Verify behavior for all mock objects.
+ 		PowerMock.verifyAll();
+ 	}
  }

[eclipse-ccase-cvs] net.sourceforge.eclipseccase.test .classpath, 1.1, 1.2

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

Update of /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.test
In directory vz-cvs-4.sog:/tmp/cvs-serv23641

Modified Files:
	.classpath 
Log Message:
Added mocked testcase for ClearCaseProvider.getActivitySelectors()

Index: .classpath
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase.test/.classpath,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** .classpath	29 Sep 2011 06:11:16 -0000	1.1
--- .classpath	1 Dec 2011 08:43:11 -0000	1.2
***************
*** 3,6 ****
--- 3,12 ----
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
  	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
+ 	<classpathentry kind="lib" path="/net.sourceforge.eclipseccase/lib/powermock-easymock-junit-1.4.10/cglib-nodep-2.2.jar"/>
+ 	<classpathentry kind="lib" path="/net.sourceforge.eclipseccase/lib/powermock-easymock-junit-1.4.10/easymock-3.0.jar"/>
+ 	<classpathentry kind="lib" path="/net.sourceforge.eclipseccase/lib/powermock-easymock-junit-1.4.10/javassist-3.15.0-GA.jar"/>
+ 	<classpathentry kind="lib" path="/net.sourceforge.eclipseccase/lib/powermock-easymock-junit-1.4.10/junit-4.8.2.jar"/>
+ 	<classpathentry kind="lib" path="/net.sourceforge.eclipseccase/lib/powermock-easymock-junit-1.4.10/objenesis-1.2.jar"/>
+ 	<classpathentry kind="lib" path="/net.sourceforge.eclipseccase/lib/powermock-easymock-junit-1.4.10/powermock-easymock-1.4.10-full.jar"/>
  	<classpathentry kind="src" path="src"/>
  	<classpathentry kind="output" path="bin"/>

[eclipse-ccase-cvs] net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase ClearCaseCLIImpl.java, 1.124, 1.125

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

Update of /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase
In directory vz-cvs-4.sog:/tmp/cvs-serv16022/src/commandline/net/sourceforge/clearcase

Modified Files:
	ClearCaseCLIImpl.java 
Log Message:
Removed debug


Index: ClearCaseCLIImpl.java
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/ClearCaseCLIImpl.java,v
retrieving revision 1.124
retrieving revision 1.125
diff -C2 -d -r1.124 -r1.125
*** ClearCaseCLIImpl.java	1 Dec 2011 07:19:11 -0000	1.124
--- ClearCaseCLIImpl.java	1 Dec 2011 07:59:37 -0000	1.125
***************
*** 85,89 ****
  
  	private boolean useSingleprocessLauncher = false;
! 	private static int debugLevel = 1;
  
  	public boolean isUseSingleprocessLauncher() {
--- 85,89 ----
  
  	private boolean useSingleprocessLauncher = false;
! 	private static int debugLevel = 0;
  
  	public boolean isUseSingleprocessLauncher() {

[eclipse-ccase-cvs] net.sourceforge.eclipseccase .classpath, 1.21, 1.22

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

Update of /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase
In directory vz-cvs-4.sog:/tmp/cvs-serv10144

Modified Files:
	.classpath 
Log Message:
Update creating of activity as well as updating PowerMock.

Index: .classpath
===================================================================
RCS file: /cvsroot/eclipse-ccase/net.sourceforge.eclipseccase/.classpath,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** .classpath	24 Feb 2010 15:51:23 -0000	1.21
--- .classpath	1 Dec 2011 07:19:23 -0000	1.22
***************
*** 5,10 ****
  	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- 	<classpathentry kind="lib" path="lib/powermock-easymock-junit-1.3.5/junit-4.7.jar"/>
  	<classpathentry combineaccessrules="false" kind="src" path="/net.sourceforge.clearcase"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>
--- 5,10 ----
  	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
  	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
  	<classpathentry combineaccessrules="false" kind="src" path="/net.sourceforge.clearcase"/>
+ 	<classpathentry kind="lib" path="lib/powermock-easymock-junit-1.4.10/junit-4.8.2.jar"/>
  	<classpathentry kind="output" path="bin"/>
  </classpath>

[eclipse-ccase-cvs] net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline SingleProcessCommandLauncher.java, 1.17, 1.18

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

Update of /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline
In directory vz-cvs-4.sog:/tmp/cvs-serv10126/src/commandline/net/sourceforge/clearcase/commandline

Modified Files:
	SingleProcessCommandLauncher.java 
Log Message:
Update creating of activity as well as updating PowerMock.

Index: SingleProcessCommandLauncher.java
===================================================================
RCS file: /cvsroot/clearcase-java/net.sourceforge.clearcase/src/commandline/net/sourceforge/clearcase/commandline/SingleProcessCommandLauncher.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** SingleProcessCommandLauncher.java	21 Nov 2011 11:10:59 -0000	1.17
--- SingleProcessCommandLauncher.java	1 Dec 2011 07:19:11 -0000	1.18
***************
*** 210,214 ****
  							// special handling if not at line start
  							int index = line.indexOf("Command ");
! 							String actual = line.substring(0, index - 1);
  							String command = line.substring(index);
  							if (ClearCaseCLIImpl.getDebugLevel() > 0) {
--- 210,214 ----
  							// special handling if not at line start
  							int index = line.indexOf("Command ");
! 							String actual = line.substring(0, index);
  							String command = line.substring(index);
  							if (ClearCaseCLIImpl.getDebugLevel() > 0) {
***************
*** 224,228 ****
  							synchronized (lines) {
  								lines.add(actual);
- 								lines.add(command);
  							}
  						}
--- 224,227 ----