Attachment #82864 for bug #206811

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Lines 1-6 Link Here

(-).classpath (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>	3	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
4	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	4	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5	<classpathentry kind="output" path="bin"/>	5	<classpathentry kind="output" path="bin"/>
6	</classpath>	6	</classpath>

Lines 1-8 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-5 / +5 lines)
1	#Wed Dec 20 11:55:59 EST 2006	1	#Sun Nov 11 13:12:56 EST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5	org.eclipse.jdt.core.compiler.compliance=1.4	5	org.eclipse.jdt.core.compiler.compliance=1.5
6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error	6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8	org.eclipse.jdt.core.compiler.source=1.4	8	org.eclipse.jdt.core.compiler.source=1.5

Lines 7-10 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"	8	Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
9	Eclipse-LazyStart: true	9	Eclipse-LazyStart: true
10	Bundle-RequiredExecutionEnvironment: J2SE-1.4	10	Bundle-RequiredExecutionEnvironment: J2SE-1.5




		final IUndoContext undoContext = new UndoContext();
		
		domain.addResourceSetListener(new ResourceSetListenerImpl() {
			@Override
			public boolean isPrecommitOnly() {
				return true;
			}
			
			@Override
			public Command transactionAboutToCommit(ResourceSetChangeEvent event)
				throws RollbackException {
				
				IUndoableOperation op = new AbstractOperation("") { //$NON-NLS-1$
					@Override
					public IStatus execute(IProgressMonitor monitor, IAdaptable info)
						throws ExecutionException {
						return Status.OK_STATUS;
					}
	
					@Override
					public IStatus redo(IProgressMonitor monitor, IAdaptable info)
						throws ExecutionException {
						return Status.OK_STATUS;
					}
	
					@Override
					public IStatus undo(IProgressMonitor monitor, IAdaptable info)
						throws ExecutionException {
						return Status.OK_STATUS;

		IUndoContext resCtx = new ResourceUndoContext(domain, r);
        
		AbstractEMFOperation op = new AbstractEMFOperation(domain, "") { //$NON-NLS-1$
			@Override
			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
				throws ExecutionException {
				

		}
		
		assertNotNull(op.getContexts());
        List<IUndoContext> opContexts = Arrays.asList(op.getContexts());
		assertTrue(opContexts.contains(resCtx));
        assertTrue(opContexts.contains(undoContext));
		

		
		Command op = new RecordingCommand(domain) {

			@Override
			protected void doExecute() {
				r.getContents().add(EXTLibraryFactory.eINSTANCE.createLibrary());
				

        final RuntimeException error = new RuntimeException();
        
        ResourceSetListener testListener = new TriggerListener() {
        	@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
        		return new RecordingCommand(domain, "Error") { //$NON-NLS-1$
        			@Override
					protected void doExecute() {
        				throw error;
        			}};
        	}};

            domain.addResourceSetListener(testListener);
            
            domain.getCommandStack().execute(new RecordingCommand(domain) {
                @Override
				protected void doExecute() {
                    root.getWriters().clear();
                    root.getStock().clear();
                    root.getBranches().clear();

        final RuntimeException error = new OperationCanceledException();
        
        ResourceSetListener testListener = new TriggerListener() {
        	@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
        		return new RecordingCommand(domain, "Error") { //$NON-NLS-1$
        			@Override
					protected void doExecute() {
        				throw error;
        			}};
        	}};

            domain.addResourceSetListener(testListener);
            
            domain.getCommandStack().execute(new RecordingCommand(domain) {
                @Override
				protected void doExecute() {
                    root.getWriters().clear();
                    root.getStock().clear();
                    root.getBranches().clear();

        final RuntimeException error = new RuntimeException();
        
        ResourceSetListener testListener = new TriggerListener() {
        	@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
        		return new RecordingCommand(domain, "Error") { //$NON-NLS-1$
        			@Override
					protected void doExecute() {
        				throw error;
        			}};
        	}};

            
            try {
	            IStatus status = new AbstractEMFOperation(domain, "test") { //$NON-NLS-1$
	                @Override
					protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) {
	                    root.getWriters().clear();
	                    root.getStock().clear();
	                    root.getBranches().clear();

        final RuntimeException error = new OperationCanceledException();
        
        ResourceSetListener testListener = new TriggerListener() {
        	@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
        		return new RecordingCommand(domain, "Error") { //$NON-NLS-1$
        			@Override
					protected void doExecute() {
        				throw error;
        			}};
        	}};

            
            try {
	            IStatus status = new AbstractEMFOperation(domain, "test") { //$NON-NLS-1$
	                @Override
					protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) {
	                    root.getWriters().clear();
	                    root.getStock().clear();
	                    root.getBranches().clear();

    public void test_recordingCommandsAsTriggers_bug157103() {
        // one trigger sets default library names
        domain.addResourceSetListener(new LibraryDefaultNameTrigger() {
            @Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
                Command result = null;
                
                final Library newLibrary = (Library) notification.getNewValue();
                if ((newLibrary.getName() == null) || (newLibrary.getName().length() == 0)) {
                    result = new RecordingCommand(domain) {
                        @Override
						protected void doExecute() {
                            newLibrary.setName("New Library"); //$NON-NLS-1$
                        }};
                }

        
        IUndoContext ctx = new UndoContext();
        IUndoableOperation operation = new AbstractEMFOperation(domain, "Test") { //$NON-NLS-1$
            @Override
			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) {
                newLibrary[0] = EXTLibraryFactory.eINSTANCE.createLibrary();
                root.getBranches().add(newLibrary[0]);
                

        SelfOpeningEMFCompositeOperation operation = new SelfOpeningEMFCompositeOperation(
            domain) {

            @Override
			protected IStatus doExecute(IOperationHistory history,
                    IProgressMonitor monitor, IAdaptable info)
                throws ExecutionException {

                return history.execute(
                    new AbstractEMFOperation(domain, "Test") { //$NON-NLS-1$

                        @Override
						protected IStatus doExecute(IProgressMonitor monitor,
                                IAdaptable info) {
                            root.getBranches().add(
                                EXTLibraryFactory.eINSTANCE.createLibrary());

	// Fixture methods
	//
	
	@Override
	protected void doSetUp() throws Exception {
		super.doSetUp();
		
		defaultContext = ((IWorkspaceCommandStack) getCommandStack()).getDefaultUndoContext();
	}
	
	@Override
	protected void doTearDown() throws Exception {
		defaultContext = null;
		




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.emf.examples.extlibrary.Person;
import org.eclipse.emf.examples.extlibrary.Writer;
import org.eclipse.emf.examples.extlibrary.util.EXTLibrarySwitch;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalCommandStack;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
import org.eclipse.emf.transaction.impl.InternalTransaction;
import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
import org.eclipse.emf.validation.model.IConstraintStatus;
import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
import org.osgi.framework.Bundle;


	protected static final String TEST_RESOURCE_NAME = "test_model.extlibrary"; //$NON-NLS-1$
	
	private final List<InternalTransaction> transactionStack =
		new java.util.ArrayList<InternalTransaction>();
	
	public AbstractTest() {
		super();

	// Test configuration methods
	//
	
	@Override
	protected final void setUp()
		throws Exception {
		

				history);
	}

	@Override
	protected final void tearDown()
		throws Exception {
		

			file.create(input, true, null);
			
			result = domain.createResource(
				URI.createPlatformResourceURI(file.getFullPath().toString(), true).toString());
		} catch (Exception e) {
			e.printStackTrace();
			fail("Exception creating test resource: " + e.getLocalizedMessage()); //$NON-NLS-1$

			String name = names[i];
			result = null;
			
			for (Iterator<EObject> iter = getContents(current).iterator(); iter.hasNext();) {
				EObject child = iter.next();
				
				if (name.equals(getName(child))) {
					result = child;

	 * @return its name
	 */
	private String getName(EObject object) {
		return GetName.INSTANCE.doSwitch(object);
	}
	
	/**

	 * @param object an object, which may be a resource or an element
	 * @return its immediate contents (children)
	 */
	private List<EObject> getContents(Object object) {
		if (object instanceof EObject) {
			return ((EObject) object).eContents();
		} else if (object instanceof Resource) {
			return ((Resource) object).getContents();
		} else {
			return Collections.emptyList();
		}
	}
	

	 *
	 * @author Christian W. Damus (cdamus)
	 */
	private static final class GetName extends EXTLibrarySwitch<String> {
		static final GetName INSTANCE = new GetName();
		
		private GetName() {

			return object.getTitle();
		}

		@Override
		public String caseBook(Book object) {
			return object.getTitle();
		}

		@Override
		public String caseLibrary(Library object) {
			return object.getName();
		}

		@Override
		public String casePeriodical(Periodical object) {
			return object.getTitle();
		}
		
		@Override
		public String caseWriter(Writer object) {
			return object.getName();
		}

		@Override
		public String casePerson(Person object) {
			if (object.getFirstName() == null) {
				if (object.getLastName() == null) {
					return ""; //$NON-NLS-1$

			}
		}

		@Override
		public String defaultCase(EObject object) {
			return ""; //$NON-NLS-1$
		}
	}

	 * 
	 * @param options the options
	 */
	protected void startWriting(Map<?, ?> options) {
		try {
			transactionStack.add(
					((InternalTransactionalEditingDomain) domain).startTransaction(false, options));

	 * 
	 * @param options the options
	 */
	protected void startReading(Map<?, ?> options) {
		try {
			transactionStack.add(
					((InternalTransactionalEditingDomain) domain).startTransaction(true, options));

	 * 
	 * @return the map
	 */
	protected Map<?, ?> makeOptions(String option) {
		return makeOptions(option, true);
	}
	
	/**

	 * 
	 * @return the map
	 */
	protected Map<?, ?> makeOptions(String option, Object value) {
		if (value == null) {
			return Collections.EMPTY_MAP;
		}

	/**
	 * Makes a map from multiple options, as key-value pairs.
	 * 
	 * @param option an option
	 * @param value the <tt>option</tt> value
	 * @param options a pairwise list of additional options and values
	 * 
	 * @return the map
	 */
	protected Map<?, ?> makeOptions(Object option, Object value, Object... options) {
		Map<Object, Object> result = new java.util.HashMap<Object, Object>();
		
		result.put(option, value);
		
		for (int i = 0; i < options.length - 1; i += 2) {
			result.put(options[i], options[i + 1]);
			
			for (int i = 0; i < options.length - 1; i += 2) {
				result.put(options[i], options[i + 1]);
			}
		}
		
		return result;




import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.NullProgressMonitor;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.ecore.change.ChangeDescription;
import org.eclipse.emf.examples.extlibrary.Book;
import org.eclipse.emf.examples.extlibrary.EXTLibraryFactory;
import org.eclipse.emf.examples.extlibrary.Library;

		child2.addContext(ctx1);
		child3.addContext(ctx3);
		
		ListIterator<IUndoableOperation> iter = composite.listIterator();
		
		// no contexts, yet
		assertEquals(

		CompositeEMFOperation composite = new CompositeEMFOperation(domain, "Composite"); //$NON-NLS-1$
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
			}});

		composite.add(new ChangeExternalData(externalData, book));
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				newAuthor.getBooks().add(book);
			}});

		CompositeEMFOperation composite = new CompositeEMFOperation(domain, "Composite"); //$NON-NLS-1$
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
			}});

		
		// EMF change in the nested non-transactional composite
		composite2.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				newAuthor.getBooks().add(book);
			}});

		CompositeEMFOperation composite = new CompositeEMFOperation(domain, "Composite"); //$NON-NLS-1$
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				newAuthor.getBooks().add(book);
			}});

		
		// EMF change in the nested non-transactional composite
		composite2.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				book.setTitle(null);  // will not pass validation
			}});

		CompositeEMFOperation composite = new CompositeEMFOperation(domain, "Composite"); //$NON-NLS-1$
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library.  Our triggers will set a default name and book
				newLibrary[0] = EXTLibraryFactory.eINSTANCE.createLibrary();

		
		assertEquals("New Library", newLibrary[0].getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary[0].getBooks().size());
		assertEquals("New Book", newLibrary[0].getBooks().get(0).getTitle()); //$NON-NLS-1$
		assertEquals("New Book", externalData[0]); //$NON-NLS-1$
		
		commit();

		assertTrue(root.getBranches().contains(newLibrary[0]));
		assertEquals("New Library", newLibrary[0].getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary[0].getBooks().size());
		assertEquals("New Book", newLibrary[0].getBooks().get(0).getTitle()); //$NON-NLS-1$
		assertEquals("New Book", externalData[0]); //$NON-NLS-1$
		
		commit();

		CompositeEMFOperation composite = new CompositeEMFOperation(domain, "Composite"); //$NON-NLS-1$
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library.  Our triggers will set a default name and book
				newLibrary[0] = EXTLibraryFactory.eINSTANCE.createLibrary();

		
		assertEquals("New Library", newLibrary[0].getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary[0].getBooks().size());
		assertEquals("New Book", newLibrary[0].getBooks().get(0).getTitle()); //$NON-NLS-1$
		
		commit();


		assertTrue(root.getBranches().contains(newLibrary[0]));
		assertEquals("New Library", newLibrary[0].getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary[0].getBooks().size());
		assertEquals("New Book", newLibrary[0].getBooks().get(0).getTitle()); //$NON-NLS-1$
		
		commit();
	}

		CompositeEMFOperation composite = new CompositeEMFOperation(domain, "Composite"); //$NON-NLS-1$
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
			}});

		composite.add(new ChangeExternalData(externalData, book));
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				newAuthor.getBooks().add(book);
			}});

		composite.setTransactionNestingEnabled(false);
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library
				root.getBranches().add(EXTLibraryFactory.eINSTANCE.createLibrary());


		CompositeEMFOperation nestedComposite = new CompositeEMFOperation(domain, "Nested"); //$NON-NLS-1$
		nestedComposite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library
				root.getBranches().add(EXTLibraryFactory.eINSTANCE.createLibrary());
			}});
		nestedComposite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library
				root.getBranches().add(EXTLibraryFactory.eINSTANCE.createLibrary());

		assertNotNull(transaction);
		
		// only one transaction (contributing one change description to the composite)
		Collection<ChangeDescription> changes = getChanges(transaction);
		assertEquals(1, changes.size());
		
		capture.clear();

		composite.setTransactionNestingEnabled(false);
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library
				root.getBranches().add(EXTLibraryFactory.eINSTANCE.createLibrary());

		CompositeEMFOperation nestedComposite = new CompositeEMFOperation(domain, "Nested"); //$NON-NLS-1$
		nestedComposite.add(new ChangeExternalData(externalData, book));  // non-EMF change
		nestedComposite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library
				root.getBranches().add(EXTLibraryFactory.eINSTANCE.createLibrary());
			}});
		nestedComposite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library
				root.getBranches().add(EXTLibraryFactory.eINSTANCE.createLibrary());

		//    before the non-EMF changes, one change for the non-EMF changes,
		//    and one change for everything after.  We would have 4 changes
		//    without the no-nesting hint
		Collection<ChangeDescription> changes = getChanges(transaction);
		assertEquals(3, changes.size());
		
		capture.clear();

		composite.setTransactionNestingEnabled(false);
		
		composite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library
				root.getBranches().add(EXTLibraryFactory.eINSTANCE.createLibrary());

		nestedComposite.add(new TestOperation(domain,
				// this transaction has different options
				Collections.singletonMap(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE)) {
			@Override
			protected void doExecute() {
				// add a new library
				root.getBranches().add(EXTLibraryFactory.eINSTANCE.createLibrary());
			}});
		nestedComposite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library
				root.getBranches().add(EXTLibraryFactory.eINSTANCE.createLibrary());
			}});
		nestedComposite.add(new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library
				root.getBranches().add(EXTLibraryFactory.eINSTANCE.createLibrary());

		//    before the different options, one change for the different options,
		//    and one change for everything after.  We would have 4 changes
		//    without the no-nesting hint
		Collection<ChangeDescription> changes = getChanges(transaction);
		assertEquals(3, changes.size());
		
		capture.clear();

	 * Does a reflective hack to get the private <tt>changes</tt> field of a
	 * composite change description.
	 */
	@SuppressWarnings("unchecked")
	private Collection<ChangeDescription> getChanges(Transaction tx) {
		Collection<ChangeDescription> result = null;
		CompositeChangeDescription composite = (CompositeChangeDescription) tx.getChangeDescription();
		
		try {
			Field changes = composite.getClass().getDeclaredField("changes"); //$NON-NLS-1$
			changes.setAccessible(true);
			result = (Collection<ChangeDescription>) changes.get(composite);
		} catch (Exception e) {
			fail("Could not access private changes field of CompositeChangeDescription: " + e.getLocalizedMessage()); //$NON-NLS-1$
		}

			this.library = library;
		}
		
		@Override
		public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
			oldData = externalData[0];
			
			// can safely read in the enclosing composite's write transaction
			if (book == null) {
				// get the book from the new library, then
				book = library[0].getBooks().get(0);
			}
			
			externalData[0] = book.getTitle();

			return Status.OK_STATUS;
		}
		
		@Override
		public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
			externalData[0] = oldData;
			return Status.OK_STATUS;
		}
		
		@Override
		public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
			externalData[0] = book.getTitle();
			return Status.OK_STATUS;

	}
	
	private static class FailCancelOperation extends AbstractOperation {
		private final IStatus executeStatus;
		private final IStatus undoStatus;
		private final IStatus redoStatus;
		private final boolean cancelMonitor;
		
		FailCancelOperation(IStatus exec, IStatus undo, IStatus redo, boolean cancel) {
			super("Fail/Cancel Operation"); //$NON-NLS-1$

			this.cancelMonitor = cancel;
		}
		
		@Override
		public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
			if ((executeStatus.getSeverity() == IStatus.CANCEL) && cancelMonitor) {
				monitor.setCanceled(true);

			return executeStatus;
		}
		
		@Override
		public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
			if ((undoStatus.getSeverity() == IStatus.CANCEL) && cancelMonitor) {
				monitor.setCanceled(true);

			return undoStatus;
		}
		
		@Override
		public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
			if ((redoStatus.getSeverity() == IStatus.CANCEL) && cancelMonitor) {
				monitor.setCanceled(true);

			wasRedone = false;
		}
		
		@Override
		public IStatus execute(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
			wasExecuted = true;
			return Status.OK_STATUS;
		}
		
		@Override
		public IStatus undo(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
			wasUndone = true;
			return Status.OK_STATUS;
		}
		
		@Override
		public IStatus redo(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
			wasRedone = true;

	private static class TransactionCapture extends ResourceSetListenerImpl {
		private Transaction transaction;
		
		@Override
		public boolean isPostcommitOnly() {
			return true;
		}
		
		@Override
		public void resourceSetChanged(ResourceSetChangeEvent event) {
			if (transaction == null) {
				transaction = event.getTransaction();




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

		IUndoContext ctx = new TestUndoContext();
		
		IUndoableOperation oper = new TestOperation(domain) {
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
				newAuthor.getBooks().add(book);

			fail(e);
		}
		
		Set<Resource> affected = ResourceUndoContext.getAffectedResources(oper);
		
		assertNotNull(affected);
		assertEquals(Collections.singleton(testResource), affected);

		IUndoContext ctx = new TestUndoContext();
		
		IUndoableOperation oper = new TestOperation(domain) {
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
				newAuthor.getBooks().add(book);

			fail(e);
		}
		
		Set<Resource> affected = ResourceUndoContext.getAffectedResources(oper);
		
		assertNotNull(affected);
		
		Set<Resource> expected = new java.util.HashSet<Resource>();
		expected.add(testResource);
		expected.add(res2);
		




package org.eclipse.emf.workspace.tests;

import java.util.Collections;
import java.util.Iterator;
import java.util.List;

import junit.framework.Test;

import org.eclipse.emf.examples.extlibrary.Book;
import org.eclipse.emf.examples.extlibrary.EXTLibraryFactory;
import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalCommandStack;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
import org.eclipse.emf.workspace.tests.fixtures.TestListener;


		
		// check that we got the expected events
		assertNotNull(listener.postcommit);
		List<Notification> notifications = listener.postcommit.getNotifications();
		assertFalse(notifications.isEmpty());
		
		// look for an event indicating resource was loaded and one indicating

		Notification rootAdded = null;
		Notification resLoaded = null;
		
		for (Notification next : notifications) {
			Notification next = (Notification) iter.next();
			
			if (next.getNotifier() == res) {
				if (next.getFeatureID(null) == Resource.RESOURCE__IS_LOADED) {
					if (next.getNewBooleanValue()) {

		Notification rootRemoved = null;
		Notification resUnloaded = null;
		
		for (Notification next : notifications) {
			Notification next = (Notification) iter.next();
			
			if (next.getNotifier() == res) {
				if (next.getFeatureID(null) == Resource.RESOURCE__IS_LOADED) {
					if (!next.getNewBooleanValue()) {




import junit.framework.TestSuite;
import junit.textui.TestRunner;

import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;

/**
 * Master JUnit test suite for the <em>EMF Workbench API</em>.

 */
public class AllTests
	extends TestCase
	implements IApplication {

	public AllTests() {
		super(""); //$NON-NLS-1$

		return suite;
	}

	public Object start(IApplicationContext context)
		throws Exception {

		TestRunner.run(suite());
		return Arrays
			.asList(new String[] {"Please see raw test suite output for details."}); //$NON-NLS-1$
	}
	
	public void stop() {
		// nothing to do
	}
}




import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.EReference;
import org.eclipse.emf.ecore.change.ChangeDescription;
import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.edit.command.CommandParameter;

        assertTrue(level1.eAdapters().contains(xrefAdapter));
        
        Command cmd = new RemoveCommand(domain, root, EXTLibraryPackage.Literals.LIBRARY__BRANCHES, level1) {
            @Override
			public void doDispose() {
                if (feature instanceof EReference && ((EReference) feature).isContainment()) {
                    for (Object o : collection) {
                        EObject next = (EObject) o;
                        
                        // clear adapters on the removed object if it is still removed
                        if (next.eContainer() != owner) {

        assertTrue(level1.eAdapters().contains(xrefAdapter));
        
        Command cmd = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$
            @Override
			protected void doExecute() {
                root.getBranches().remove(level1);        
            }};
        

        assertTrue(level1.eAdapters().contains(xrefAdapter));
        
        final Command trigger = new RemoveCommand(domain, root, EXTLibraryPackage.Literals.LIBRARY__BRANCHES, level1) {
            @Override
			public void doDispose() {
                if (feature instanceof EReference && ((EReference) feature).isContainment()) {
                    for (Object o : collection) {
                        EObject next = (EObject) o;
                        
                        // clear adapters on the removed object if it is still removed
                        if (next.eContainer() != owner) {

            }};
        
        domain.addResourceSetListener(new TriggerListener() {
            @Override
			protected Command trigger(TransactionalEditingDomain domain,
                    Notification notification) {
                // trigger on the name change only
                if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {

        assertTrue(level1.eAdapters().contains(xrefAdapter));
        
        final Command trigger = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$
            @Override
			protected void doExecute() {
                root.getBranches().remove(level1);        
            }};
        
        domain.addResourceSetListener(new TriggerListener() {
            @Override
			protected Command trigger(TransactionalEditingDomain domain,
                    Notification notification) {
                // trigger on the name change only
                if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {

        assertTrue(level1.eAdapters().contains(xrefAdapter));
        
        IUndoableOperation oper = new AbstractEMFOperation(domain, "Remove Branch") { //$NON-NLS-1$
            @Override
			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
                throws ExecutionException {
                
                root.getBranches().remove(level1);

        assertTrue(level1.eAdapters().contains(xrefAdapter));
        
        final Command trigger = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$
            @Override
			protected void doExecute() {
                root.getBranches().remove(level1);        
            }};
        
        domain.addResourceSetListener(new TriggerListener() {
            @Override
			protected Command trigger(TransactionalEditingDomain domain,
                    Notification notification) {
                // trigger on the name change only
                if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {

            }});
        
        IUndoableOperation oper = new AbstractEMFOperation(domain, "Rename Library") { //$NON-NLS-1$
            @Override
			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
                throws ExecutionException {
                
                root.setName("newname"); //$NON-NLS-1$

        assertTrue(level1.eAdapters().contains(xrefAdapter));
        
        IUndoableOperation triggerOper = new AbstractEMFOperation(domain, "Remove Branch") { //$NON-NLS-1$
            @Override
			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
                throws ExecutionException {
                
                root.getBranches().remove(level1);  

        final Command trigger = new EMFOperationCommand(domain, triggerOper);
        
        domain.addResourceSetListener(new TriggerListener() {
            @Override
			protected Command trigger(TransactionalEditingDomain domain,
                    Notification notification) {
                // trigger on the name change only
                if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {

            }});
        
        IUndoableOperation oper = new AbstractEMFOperation(domain, "Rename Library") { //$NON-NLS-1$
            @Override
			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
                throws ExecutionException {
                
                root.setName("newname"); //$NON-NLS-1$

    //
    
    private static class TransactionSniffer extends ResourceSetListenerImpl {
        private final TransactionalEditingDomain domain;
        private final List<ChangeDescription> changes =
        	new java.util.ArrayList<ChangeDescription>();
        
        TransactionSniffer(TransactionalEditingDomain domain) {
            this.domain = domain;
            domain.addResourceSetListener(this);
        }
        
        @Override
		public boolean isPostcommitOnly() {
            return true;
        }
        
        @Override
		public void resourceSetChanged(ResourceSetChangeEvent event) {
            Transaction tx = event.getTransaction();
            
            if ((tx != null) && (tx.getChangeDescription()) != null) {

            // stop listening, now
            domain.removeResourceSetListener(this);
            
            for (Iterator<EObject> iter = EcoreUtil.getAllContents(changes); iter.hasNext();) {
                EObject next = iter.next();
                assertEquals("Adapters not cleared.", 0, next.eAdapters().size()); //$NON-NLS-1$
            }
        }




		IUndoContext ctx = new TestUndoContext();
		
		IUndoableOperation oper = new TestOperation(domain) {
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
				newAuthor.getBooks().add(book);

		// one trigger sets the external data
		domain.addResourceSetListener(new TriggerListener() {
		
			@Override
			protected Command trigger(TransactionalEditingDomain domain,
					Notification notification) {
				if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {

		IUndoContext ctx = new TestUndoContext();
		
		IUndoableOperation oper = new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library.  Our triggers will set a default name and book
				newLibrary[0] = EXTLibraryFactory.eINSTANCE.createLibrary();

		IUndoContext ctx = new TestUndoContext();
		
		IUndoableOperation oper = new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library.  Our triggers will set a default name and book
				newLibrary[0] = EXTLibraryFactory.eINSTANCE.createLibrary();

		
		assertEquals("New Library", newLibrary[0].getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary[0].getBooks().size());
		assertEquals("New Book", newLibrary[0].getBooks().get(0).getTitle()); //$NON-NLS-1$
		
		commit();


		assertTrue(root.getBranches().contains(newLibrary[0]));
		assertEquals("New Library", newLibrary[0].getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary[0].getBooks().size());
		assertEquals("New Book", newLibrary[0].getBooks().get(0).getTitle()); //$NON-NLS-1$
		
		commit();
	}

		IUndoContext ctx = new TestUndoContext();
		
		IUndoableOperation oper = new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// add a new library.  Our triggers will set a default name and book
				newLibrary[0] = EXTLibraryFactory.eINSTANCE.createLibrary();

		
		// the book is created by the first trigger
		assertEquals(1, newLibrary[0].getBooks().size());
		Book book = newLibrary[0].getBooks().get(0);
		assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
		
		// the publication date is created by the cascaded trigger

		// verify that the changes were redone
		assertTrue(root.getBranches().contains(newLibrary[0]));
		assertEquals(1, newLibrary[0].getBooks().size());
		book = newLibrary[0].getBooks().get(0);
		assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
		assertNotNull(book.getPublicationDate());
		

		IUndoContext ctx = new TestUndoContext();
		
		IUndoableOperation oper = new TestOperation(domain) {
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
				newAuthor.getBooks().add(book);

		
		IUndoableOperation oper = new TestOperation(
				domain,
				makeOptions(
					Transaction.OPTION_NO_NOTIFICATIONS, true,
					Transaction.OPTION_NO_TRIGGERS, true,
					Transaction.OPTION_NO_VALIDATION, true)) {
			
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
				newAuthor.getBooks().add(book);

	public void test_rollbackNestingTransactionOnException_135673() {
		CompositeEMFOperation outer = new CompositeEMFOperation(domain, ""); //$NON-NLS-1$
		AbstractEMFOperation inner = new AbstractEMFOperation(domain, "") { //$NON-NLS-1$
			@Override
			public boolean canExecute() {
				return true;
			}
			@Override
			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
					throws ExecutionException {
				// start some nested transactions

		assertNotNull(book);
		
		final AbstractEMFOperation emfOperation = new AbstractEMFOperation(domain, "") { //$NON-NLS-1$
			@Override
			public boolean canExecute() {
				return true;
			}
			
			@Override
			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
				throws ExecutionException {
				

		};
		
		AbstractEMFOperation root = new AbstractEMFOperation(domain, "") { //$NON-NLS-1$
			@Override
			public boolean canExecute() {
				return true;
			}
			
			@Override
			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
				throws ExecutionException {
				

    public void test_nullProgressMonitors_bug150033() {
        IUndoableOperation operation = new AbstractEMFOperation(domain, "Test") { //$NON-NLS-1$
        
            @Override
			protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info)
                throws ExecutionException {
                
                monitor.isCanceled();

                return super.doUndo(monitor, info);
            }
        
            @Override
			protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info)
                throws ExecutionException {
                
                monitor.isCanceled();

                return super.doRedo(monitor, info);
            }
        
            @Override
			protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
                throws ExecutionException {
                
                monitor.isCanceled();




		
		domain.addResourceSetListener(new TriggerListener() {
		
			@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
				Command result = null;
				

		
		domain.addResourceSetListener(new TriggerListener() {
		
			@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
				Command result = null;
				

		
		Command cmd = new RecordingCommand(domain, "Testing") { //$NON-NLS-1$
		
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
			}};
		
		domain.addResourceSetListener(new TriggerListener() {
		
			@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
				Command result = null;
				

	 */
	public void test_nonredoableOperation_138287() {
		IUndoableOperation operation = new TestOperation(domain) {
			@Override
			protected void doExecute() {
				// nothing to do
			}
			
			@Override
			public boolean canRedo() {
				return false;
			}};

	// Test fixtures
	//
	
	@Override
	protected void doSetUp()
		throws Exception {
		

		validationEnabled = true;
	}
	
	@Override
	protected void doTearDown()
		throws Exception {
		




		
		assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary.getBooks().size());
		assertEquals("New Book", newLibrary.getBooks().get(0).getTitle()); //$NON-NLS-1$
		
		commit();


		assertTrue(root.getBranches().contains(newLibrary));
		assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary.getBooks().size());
		assertEquals("New Book", newLibrary.getBooks().get(0).getTitle()); //$NON-NLS-1$
		
		commit();
	}

		
		// the book is created by the first trigger
		assertEquals(1, newLibrary.getBooks().size());
		Book book = newLibrary.getBooks().get(0);
		assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
		
		// the publication date is created by the cascaded trigger

		// verify that the changes were redone
		assertTrue(root.getBranches().contains(newLibrary));
		assertEquals(1, newLibrary.getBooks().size());
		book = newLibrary.getBooks().get(0);
		assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
		assertNotNull(book.getPublicationDate());
		

		IUndoContext ctx = new TestUndoContext();
		
		Command cmd = new RecordingCommand(domain) {
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
				newAuthor.getBooks().add(book);

		
		// add a new library.  Our triggers will set a default name and book
		Command cmd = new RecordingCommand(domain) {
			@Override
			protected void doExecute() {
				root.getBranches().add(newLibrary);
			}};

		
		assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary.getBooks().size());
		assertEquals("New Book", newLibrary.getBooks().get(0).getTitle()); //$NON-NLS-1$
		
		commit();


		assertTrue(root.getBranches().contains(newLibrary));
		assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary.getBooks().size());
		assertEquals("New Book", newLibrary.getBooks().get(0).getTitle()); //$NON-NLS-1$
		
		commit();
	}

				// nothing to do
			}
		
			@Override
			public boolean canRedo() {
				return false;
			}};

	public void test_nonredoableTriggerCommand_138287() {
		// add a trigger command that is not redoable
		domain.addResourceSetListener(new TriggerListener() {
			@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
				return new TestCommand.Redoable() {
					public void execute() {
						// nothing to do
					}
				
					@Override
					public boolean canRedo() {
						return false;
					}};




public class TestsPlugin extends Plugin {
	public static TestsPlugin instance;
	
	@Override
	public void start(BundleContext context) throws Exception {
		super.start(context);
		
		instance = this;
	}
	
	@Override
	public void stop(BundleContext context) throws Exception {
		instance = null;
		

Lines 8-18 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
8	Require-Bundle: org.junit;bundle-version="[3.8.1,4.0.0)",	8	Require-Bundle: org.junit;bundle-version="[3.8.1,4.0.0)",
9	org.eclipse.emf.workspace;bundle-version="1.2.0",	9	org.eclipse.emf.workspace;bundle-version="1.2.0",
10	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",	10	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
11	org.eclipse.emf.examples.library;bundle-version="[2.2.0,3.0.0)"	11	org.eclipse.emf.examples.library;bundle-version="[2.3.0,3.0.0)"
12	Export-Package: org.eclipse.emf.workspace.tests,	12	Export-Package: org.eclipse.emf.workspace.tests,
13	org.eclipse.emf.workspace.tests.constraints,	13	org.eclipse.emf.workspace.tests.constraints,
14	org.eclipse.emf.workspace.tests.fixtures,	14	org.eclipse.emf.workspace.tests.fixtures,
15	org.eclipse.emf.workspace.util.tests	15	org.eclipse.emf.workspace.util.tests
16	Eclipse-LazyStart: true	16	Eclipse-LazyStart: true
17	Bundle-Activator: org.eclipse.emf.workspace.tests.TestsPlugin	17	Bundle-Activator: org.eclipse.emf.workspace.tests.TestsPlugin
18	Bundle-RequiredExecutionEnvironment: J2SE-1.4	18	Bundle-RequiredExecutionEnvironment: J2SE-1.5




public abstract class TestCommand
	extends AbstractCommand {

	@Override
	protected boolean prepare() {
		return true;
	}
	
	@Override
	public void undo() {
		// do nothing
	}

Lines 43-48 Link Here

(-)src/org/eclipse/emf/workspace/tests/fixtures/TestListener.java (+2 lines)
43	super(filter);	43	super(filter);
44	}	44	}
45		45
		46	@Override
46	public Command transactionAboutToCommit(ResourceSetChangeEvent event)	47	public Command transactionAboutToCommit(ResourceSetChangeEvent event)
47	throws RollbackException {	48	throws RollbackException {
48		49
Lines 51-56 Link Here
51	return null;	52	return null;
52	}	53	}
53		54
		55	@Override
54	public void resourceSetChanged(ResourceSetChangeEvent event) {	56	public void resourceSetChanged(ResourceSetChangeEvent event) {
55	postcommit = event;	57	postcommit = event;
56	}	58	}

Lines 45-50 Link Here

(-)src/org/eclipse/emf/workspace/tests/fixtures/LibraryDefaultNameTrigger.java (+2 lines)
45	this.isAggregate = isAggregate;	45	this.isAggregate = isAggregate;
46	}	46	}
47		47
		48	@Override
48	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	49	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
49	Command result = null;	50	Command result = null;
50		51
Lines 60-65 Link Here
60	return result;	61	return result;
61	}	62	}
62		63
		64	@Override
63	public boolean isAggregatePrecommitListener() {	65	public boolean isAggregatePrecommitListener() {
64	return isAggregate;	66	return isAggregate;
65	}	67	}




 */
package org.eclipse.emf.workspace.tests.fixtures;

import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;


		extends AbstractOperation
		implements ICompositeOperation {
	
	private final List<IUndoableOperation> children = new java.util.ArrayList<IUndoableOperation>();
	
	public NonEMFCompositeOperation() {
		super("Non-EMF Composite"); //$NON-NLS-1$
	}
	
	// Documentation copied from the inherited specification
	@Override
	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
		
		monitor.beginTask(getLabel(), children.size());
		
		try {
			for (IUndoableOperation next : children) {
				next.execute(new SubProgressMonitor(monitor, 1), info);
						new SubProgressMonitor(monitor, 1),
						info);
			}
		} finally {
			monitor.done();

	}

	// Documentation copied from the inherited specification
	@Override
	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
		
		monitor.beginTask(getLabel(), children.size());
		
		try {
			for (IUndoableOperation next : children) {
				next.redo(new SubProgressMonitor(monitor, 1), info);
						new SubProgressMonitor(monitor, 1),
						info);
			}
		} finally {
			monitor.done();

	}

	// Documentation copied from the inherited specification
	@Override
	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
		
		monitor.beginTask(getLabel(), children.size());
		
		try {
			for (ListIterator<IUndoableOperation> iter = children.listIterator(children.size());
					iter.hasPrevious();) {
				iter.previous().undo(new SubProgressMonitor(monitor, 1), info);
						info);
			}
		} finally {
			monitor.done();

Lines 25-30 Link Here

(-)src/org/eclipse/emf/workspace/tests/fixtures/NullCommand.java (+2 lines)
25	*/	25	*/
26	public class NullCommand extends AbstractCommand {	26	public class NullCommand extends AbstractCommand {
27		27
		28	@Override
28	protected boolean prepare() {	29	protected boolean prepare() {
29	return true;	30	return true;
30	}	31	}
Lines 35-40 Link Here
35	}	36	}
36		37
37	/** Does nothing. */	38	/** Does nothing. */
		39	@Override
38	public void undo() {	40	public void undo() {
39	// nothing to do	41	// nothing to do
40	}	42	}




 */
package org.eclipse.emf.workspace.tests.fixtures;

import java.util.Iterator;
import java.util.List;
import java.util.Set;


    extends AbstractEMFOperation
    implements ICompositeOperation {

    private final List<IUndoableOperation> children = new java.util.ArrayList<IUndoableOperation>();

    public SelfOpeningEMFCompositeOperation(TransactionalEditingDomain domain) {
        super(domain, "EMF Composite"); //$NON-NLS-1$
    }

    @Override
	protected final IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
        throws ExecutionException {

        IStatus result;

     * 
     * @return my children
     */
    public List<IUndoableOperation> getChildren() {
        return children;
    }


            removeContext(current[i]);
        }
        
        Set<IUndoContext> newContexts = new java.util.HashSet<IUndoContext>();
        for (IUndoableOperation child : children) {
            IUndoContext[] next = child.getContexts();
            for (IUndoContext ctx : next) {
                if (!newContexts.add(ctx)) {
                    addContext(ctx);
                }
            }
        }

Lines 38-43 Link Here

(-)src/org/eclipse/emf/workspace/tests/fixtures/ItemDefaultPublicationDateTrigger.java (+1 lines)
38	Notification.ADD)));	38	Notification.ADD)));
39	}	39	}
40		40
		41	@Override
41	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	42	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
42	Command result = null;	43	Command result = null;
43		44

Lines 48-53 Link Here

(-)src/org/eclipse/emf/workspace/tests/fixtures/LibraryDefaultBookTrigger.java (+2 lines)
48	this.isAggregate = isAggregate;	48	this.isAggregate = isAggregate;
49	}	49	}
50		50
		51	@Override
51	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	52	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
52	Command result = null;	53	Command result = null;
53		54
Lines 64-69 Link Here
64	return result;	65	return result;
65	}	66	}
66		67
		68	@Override
67	public boolean isAggregatePrecommitListener() {	69	public boolean isAggregatePrecommitListener() {
68	return isAggregate;	70	return isAggregate;
69	}	71	}




		this.isRedoable = isRedoable;
	}
	
	@Override
	public boolean canExecute() {
		return isExecutable;
	}
	
	@Override
	public boolean canUndo() {
		return isUndoable;
	}
	
	@Override
	public boolean canRedo() {
		return isRedoable;
	}
	
	// Documentation copied from the inherited specification
	@Override
	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
		return Status.OK_STATUS;
	}

	// Documentation copied from the inherited specification
	@Override
	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
		return Status.OK_STATUS;
	}

	// Documentation copied from the inherited specification
	@Override
	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
		return Status.OK_STATUS;




		this.newValue = newValue;
	}
	
	@Override
	public IStatus execute(IProgressMonitor monitor, IAdaptable info) {
		// change the external (non-EMF) data
		oldValue = externalData[0];

		return Status.OK_STATUS;
	}
	
	@Override
	public IStatus undo(IProgressMonitor monitor, IAdaptable info) {
		externalData[0] = oldValue;
		
		return Status.OK_STATUS;
	}
	
	@Override
	public IStatus redo(IProgressMonitor monitor, IAdaptable info) {
		externalData[0] = newValue;
		

Lines 36-41 Link Here

(-)src/org/eclipse/emf/workspace/tests/fixtures/ExternalDataCommand.java (+2 lines)
36	this.newValue = newValue;	36	this.newValue = newValue;
37	}	37	}
38		38
		39	@Override
39	protected boolean prepare() {	40	protected boolean prepare() {
40	return true;	41	return true;
41	}	42	}
Lines 46-51 Link Here
46	externalData[0] = newValue;	47	externalData[0] = newValue;
47	}	48	}
48		49
		50	@Override
49	public void undo() {	51	public void undo() {
50	externalData[0] = oldValue;	52	externalData[0] = oldValue;
51	}	53	}




/**
 * <copyright>
 *
 * Copyright (c) 2006, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


import java.util.List;

import junit.framework.Assert;

import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;

		}};
	private final TransactionalCommandStack stack;
	
	private final List<IStatus> logs = new java.util.ArrayList<IStatus>();
	private IStatus lastLog;
	
	/**

	 * 
	 * @return a list (possibly empty) of {@link IStatus}es
	 */
	public List<IStatus> getLogs() {
		return logs;
	}
	

	 */
	public void assertLogged(Throwable throwable) {
        IStatus log = getLastLog();
        Assert.assertNotNull(log);
        log = findStatus(log, throwable);
        Assert.assertNotNull(log);
	}
	
	private void record(IStatus log) {




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

		super(domain, "Testing"); //$NON-NLS-1$
	}

	public TestOperation(TransactionalEditingDomain domain, Map<?, ?> options) {
		super(domain, "Testing", options); //$NON-NLS-1$
	}

	@Override
	protected final IStatus doExecute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
		doExecute();
		

Lines 20-24 Link Here

(-)build.properties (-2 / +2 lines)
20	test_models/,\	20	test_models/,\
21	about.html	21	about.html
22	src.includes = about.html	22	src.includes = about.html
23	javacSource = 1.4	23	javacSource = 1.5
24	javacTarget = 1.4	24	javacTarget = 1.5

Lines 1-7 Link Here

(-).classpath (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="src" path="src"/>	3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>	4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6	<classpathentry kind="output" path="bin"/>	6	<classpathentry kind="output" path="bin"/>
7	</classpath>	7	</classpath>

Lines 30-35 Link Here

(-)src/org/eclipse/emf/workspace/tests/constraints/BookTitleConstraint.java (-1 / +2 lines)
30	public class BookTitleConstraint	30	public class BookTitleConstraint
31	extends AbstractModelConstraint {	31	extends AbstractModelConstraint {
32		32
		33	@Override
33	public IStatus validate(IValidationContext ctx) {	34	public IStatus validate(IValidationContext ctx) {
34	EMFEventType eType = ctx.getEventType();	35	EMFEventType eType = ctx.getEventType();
35		36
Lines 38-44 Link Here
38		39
39	if (newValue == null	40	if (newValue == null
40	\|\| ((String)newValue).length() == 0) {	41	\|\| ((String)newValue).length() == 0) {
41	return ctx.createFailureStatus(null);	42	return ctx.createFailureStatus();
42	}	43	}
43	}	44	}
44		45




				"moveDestination.extlibrary"); //$NON-NLS-1$
		
		Job job = new WorkspaceJob("Modify Workspace") { //$NON-NLS-1$
			@Override
			public IStatus runInWorkspace(IProgressMonitor monitor)
					throws CoreException {
				// make two copies

			// make the workspace changes in a single job so that all deltas
			//    are fired in one batch
			job = new WorkspaceJob("Modify Workspace") { //$NON-NLS-1$
				@Override
				public IStatus runInWorkspace(IProgressMonitor monitor)
						throws CoreException {
					// delete one file

	// Fixture methods
	//
	
	@Override
	protected void doSetUp()
		throws Exception {
		

		synch = new WorkspaceSynchronizer(domain, delegate);
	}
	
	@Override
	protected void doTearDown()
		throws Exception {
		

				setSystem(true);
			}
			
			@Override
			protected IStatus run(IProgressMonitor monitor) {
				synchronized (lock) {
					lock.notify();

	 * @author Christian W. Damus (cdamus)
	 */
	static class TestDelegate implements WorkspaceSynchronizer.Delegate {
		final List<Resource> deletedResources = new java.util.ArrayList<Resource>();
		final Map<Resource, URI> movedResources = new java.util.LinkedHashMap<Resource, URI>();
		final List<Resource> changedResources = new java.util.ArrayList<Resource>();
		
		boolean defaultBehaviour = false;
		




    
    private Book book;
    
    private final Command cmd = new TestCommand() {
        public void execute() {
            try {
                book.setTitle(newTitle);

	// Fixture methods
	//
	
	@Override
	protected void doSetUp()
		throws Exception {
		

        assertNotNull(book);
	}
	
	@Override
	protected void doTearDown()
		throws Exception {
		

	}
	
	void setValidateEdit() {
        TransactionalEditingDomain.DefaultOptions defaults = TransactionUtil
            .getAdapter(domain, TransactionalEditingDomain.DefaultOptions.class);
        
        defaults.setDefaultTransactionOptions(Collections.singletonMap(

Lines 103-108 Link Here

(-)src/org/eclipse/emf/workspace/util/tests/OperationChangeDescriptionTest.java (+2 lines)
103	// Fixture methods	103	// Fixture methods
104	//	104	//
105		105
		106	@Override
106	protected void setUp()	107	protected void setUp()
107	throws Exception {	108	throws Exception {
108		109
Lines 116-121 Link Here
116	assertEquals(newValue, externalData[0]);	117	assertEquals(newValue, externalData[0]);
117	}	118	}
118		119
		120	@Override
119	protected void tearDown()	121	protected void tearDown()
120	throws Exception {	122	throws Exception {
121		123




import junit.framework.TestSuite;
import junit.textui.TestRunner;

import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;

/**
 * JUnit suite for the <code>org.eclipse.emf.workspace.util</code> package.

 */
public class AllTests
	extends TestCase
	implements IApplication {

	public AllTests() {
		super(""); //$NON-NLS-1$

		return suite;
	}

	public Object start(IApplicationContext context)
		throws Exception {

		TestRunner.run(suite());
		return Arrays
			.asList(new String[] {"Please see raw test suite output for details."}); //$NON-NLS-1$
	}
	
	public void stop() {
		// nothing to do
	}
}




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import org.eclipse.emf.examples.extlibrary.Book;
import org.eclipse.emf.examples.extlibrary.BookOnTape;
import org.eclipse.emf.examples.extlibrary.EXTLibraryFactory;
import org.eclipse.emf.examples.extlibrary.Employee;
import org.eclipse.emf.examples.extlibrary.Library;
import org.eclipse.emf.examples.extlibrary.Person;
import org.eclipse.emf.examples.extlibrary.Writer;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.workspace.ResourceUndoContext;

		
		assertFalse(listener.notifications.isEmpty());
		
		Set<Resource> affected = ResourceUndoContext.getAffectedResources(
				listener.notifications);
		
		assertEquals(Collections.singleton(res1), affected);

		BookOnTape book = EXTLibraryFactory.eINSTANCE.createBookOnTape();
		library.getStock().add(book);
		
		Employee person = EXTLibraryFactory.eINSTANCE.createEmployee();
		library.getEmployees().add(person);
		
		// forget the events so far

		
		assertFalse(listener.notifications.isEmpty());
		
		Set<Resource> affected = ResourceUndoContext.getAffectedResources(
				listener.notifications);
		
		assertEquals(Collections.singleton(res1), affected);

		
		assertFalse(listener.notifications.isEmpty());
		
		Set<Resource> affected = ResourceUndoContext.getAffectedResources(
				listener.notifications);
		
		Set<Resource> expected = new java.util.HashSet<Resource>();
		expected.add(res1);
		expected.add(res2);
		

		BookOnTape book = EXTLibraryFactory.eINSTANCE.createBookOnTape();
		library1.getStock().add(book);
		
		Employee person = EXTLibraryFactory.eINSTANCE.createEmployee();
		library2.getEmployees().add(person);
		
		// forget the events so far

		
		assertFalse(listener.notifications.isEmpty());
		
		Set<Resource> affected = ResourceUndoContext.getAffectedResources(
				listener.notifications);
		
		Set<Resource> expected = new java.util.HashSet<Resource>();
		expected.add(res1);
		expected.add(res2);
		

		BookOnTape book = EXTLibraryFactory.eINSTANCE.createBookOnTape();
		library1.getStock().add(book);
		
		Employee person = EXTLibraryFactory.eINSTANCE.createEmployee();
		library2.getEmployees().add(person);
		
		book.setReader(person);

		
		assertFalse(listener.notifications.isEmpty());
		
		Set<Resource> affected = ResourceUndoContext.getAffectedResources(
				listener.notifications);
		
		Set<Resource> expected = new java.util.HashSet<Resource>();
		expected.add(res1);
		expected.add(res2);
		

	// Fixture methods
	//
	
	@Override
	protected void setUp()
		throws Exception {
		

		rset.eAdapters().add(listener);
	}
	
	@Override
	protected void tearDown()
		throws Exception {
		

	}
	
	private static class Listener extends EContentAdapter {
		final List<Notification> notifications = new java.util.ArrayList<Notification>();
		
		@Override
		public void notifyChanged(Notification notification) {
			notifications.add(notification);
			

Lines 1-8 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-5 / +5 lines)
1	#Wed Dec 20 11:54:28 EST 2006	1	#Sun Nov 11 17:39:35 EST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5	org.eclipse.jdt.core.compiler.compliance=1.4	5	org.eclipse.jdt.core.compiler.compliance=1.5
6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error	6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8	org.eclipse.jdt.core.compiler.source=1.4	8	org.eclipse.jdt.core.compiler.source=1.5

Lines 6-9 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
6	Bundle-Vendor: %Plugin.providerName	6	Bundle-Vendor: %Plugin.providerName
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Eclipse-LazyStart: true	8	Eclipse-LazyStart: true
9	Bundle-RequiredExecutionEnvironment: J2SE-1.4	9	Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 20-24 Link Here

(-)build.properties (-2 / +2 lines)
20	META-INF/,\	20	META-INF/,\
21	modeling32.png	21	modeling32.png
22	src.includes = about.html	22	src.includes = about.html
23	javacSource = 1.4	23	javacSource = 1.5
24	javacTarget = 1.4	24	javacTarget = 1.5

Lines 20-24 Link Here

(-)build.properties (-2 / +2 lines)
20	jars.compile.order = .	20	jars.compile.order = .
21	source.. = src/	21	source.. = src/
22	output.. = bin/	22	output.. = bin/
23	javacSource = 1.4	23	javacSource = 1.5
24	javacTarget = 1.4	24	javacTarget = 1.5

Lines 1-7 Link Here

(-).classpath (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="src" path="src"/>	3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>	4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6	<classpathentry kind="output" path="bin"/>	6	<classpathentry kind="output" path="bin"/>
7	</classpath>	7	</classpath>

Lines 1-5 Link Here

(-)src/org/eclipse/emf/workspace/examples/extlibrary/presentation/EXTLibraryEditor.java (-19 / +54 lines)
1	/**	1	/**
2	* <copyright>	2	* <copyright>
		3	*
		4	* Copyright (c) 2005, 2007 IBM Corporation and others.
		5	* All rights reserved. This program and the accompanying materials
		6	* are made available under the terms of the Eclipse Public License v1.0
		7	* which accompanies this distribution, and is available at
		8	* http://www.eclipse.org/legal/epl-v10.html
		9	*
		10	* Contributors:
		11	* IBM - Initial API and implementation
		12	*
3	* </copyright>	13	* </copyright>
4	*	14	*
5	* $Id: EXTLibraryEditor.java,v 1.6 2007/10/03 20:17:42 cdamus Exp $	15	* $Id: EXTLibraryEditor.java,v 1.6 2007/10/03 20:17:42 cdamus Exp $
Lines 214-220 Link Here
214	* <!-- end-user-doc -->	224	* <!-- end-user-doc -->
215	* @generated	225	* @generated
216	*/	226	*/
217	protected Collection selectionChangedListeners = new ArrayList();	227	protected Collection<ISelectionChangedListener> selectionChangedListeners =
		228	new ArrayList<ISelectionChangedListener>();
218		229
219	/**	230	/**
220	* This keeps track of the selection of the editor as a whole.	231	* This keeps track of the selection of the editor as a whole.
Lines 251-262 Link Here
251	}	262	}
252	}	263	}
253	public void partBroughtToTop(IWorkbenchPart p) {	264	public void partBroughtToTop(IWorkbenchPart p) {
		265	// nothing to do
254	}	266	}
255	public void partClosed(IWorkbenchPart p) {	267	public void partClosed(IWorkbenchPart p) {
		268	// nothing to do
256	}	269	}
257	public void partDeactivated(IWorkbenchPart p) {	270	public void partDeactivated(IWorkbenchPart p) {
		271	// nothing to do
258	}	272	}
259	public void partOpened(IWorkbenchPart p) {	273	public void partOpened(IWorkbenchPart p) {
		274	// nothing to do
260	}	275	}
261	};	276	};
262		277
Lines 264-295 Link Here
264	* Resources that have been removed since last activation.	279	* Resources that have been removed since last activation.
265	* @generated	280	* @generated
266	*/	281	*/
267	Collection removedResources = new ArrayList();	282	Collection<Resource> removedResources = new ArrayList<Resource>();
268		283
269	/**	284	/**
270	* Resources that have been changed since last activation.	285	* Resources that have been changed since last activation.
271	* @generated	286	* @generated
272	*/	287	*/
273	Collection changedResources = new ArrayList();	288	Collection<Resource> changedResources = new ArrayList<Resource>();
274		289
275	/**	290	/**
276	* Resources that have been moved since last activation.	291	* Resources that have been moved since last activation.
277	* Maps {@link Resource resource} to {@link URI new URI}	292	* Maps {@link Resource resource} to {@link URI new URI}
278	*/	293	*/
279	Map movedResources = new HashMap();	294	Map<Resource, URI> movedResources = new HashMap<Resource, URI>();
280		295
281	/**	296	/**
282	* Resources that have been saved.	297	* Resources that have been saved.
283	* @generated	298	* @generated
284	*/	299	*/
285	Collection savedResources = new ArrayList();	300	Collection<Resource> savedResources = new ArrayList<Resource>();
286		301
287	private boolean dirty;	302	private boolean dirty;
288		303
289	private IOperationHistoryListener historyListener = new IOperationHistoryListener() {	304	private final IOperationHistoryListener historyListener = new IOperationHistoryListener() {
290	public void historyNotification(final OperationHistoryEvent event) {	305	public void historyNotification(final OperationHistoryEvent event) {
291	if (event.getEventType() == OperationHistoryEvent.DONE) {	306	if (event.getEventType() == OperationHistoryEvent.DONE) {
292	Set affectedResources = ResourceUndoContext.getAffectedResources(	307	Set<Resource> affectedResources = ResourceUndoContext.getAffectedResources(
293	event.getOperation());	308	event.getOperation());
294		309
295	if (affectedResources.contains(getResource())) {	310	if (affectedResources.contains(getResource())) {
Lines 362-368 Link Here
362	getOperationHistory().dispose(undoContext, true, true, true);	377	getOperationHistory().dispose(undoContext, true, true, true);
363		378
364	// change saved resource's URI and remove from map	379	// change saved resource's URI and remove from map
365	res.setURI((URI) movedResources.remove(res));	380	res.setURI(movedResources.remove(res));
366		381
367	// must change my editor input	382	// must change my editor input
368	IEditorInput newInput = new FileEditorInput(	383	IEditorInput newInput = new FileEditorInput(
Lines 467-473 Link Here
467	protected void handleMovedResource() {	482	protected void handleMovedResource() {
468	if (!isDirty() \|\| handleDirtyConflict()) {	483	if (!isDirty() \|\| handleDirtyConflict()) {
469	Resource res = getResource();	484	Resource res = getResource();
470	URI newURI = (URI) movedResources.get(res);	485	URI newURI = movedResources.get(res);
471		486
472	if (newURI != null) {	487	if (newURI != null) {
473	if (res.isLoaded()) {	488	if (res.isLoaded()) {
Lines 504-510 Link Here
504		519
505	// Create an adapter factory that yields item providers.	520	// Create an adapter factory that yields item providers.
506	//	521	//
507	List factories = new ArrayList();	522	List<AdapterFactory> factories = new ArrayList<AdapterFactory>();
508	factories.add(new ResourceItemProviderAdapterFactory());	523	factories.add(new ResourceItemProviderAdapterFactory());
509	factories.add(new EXTLibraryItemProviderAdapterFactory());	524	factories.add(new EXTLibraryItemProviderAdapterFactory());
510	factories.add(new ReflectiveItemProviderAdapterFactory());	525	factories.add(new ReflectiveItemProviderAdapterFactory());
Lines 527-532 Link Here
527	*	542	*
528	* @generated	543	* @generated
529	*/	544	*/
		545	@Override
530	protected void firePropertyChange(int action) {	546	protected void firePropertyChange(int action) {
531	super.firePropertyChange(action);	547	super.firePropertyChange(action);
532	}	548	}
Lines 537-544 Link Here
537	*	553	*
538	* @generated	554	* @generated
539	*/	555	*/
540	public void setSelectionToViewer(Collection collection) {	556	public void setSelectionToViewer(Collection<?> collection) {
541	final Collection theSelection = collection;	557	final Collection<?> theSelection = collection;
542	// Make sure it's okay.	558	// Make sure it's okay.
543	//	559	//
544	if (theSelection != null && !theSelection.isEmpty()) {	560	if (theSelection != null && !theSelection.isEmpty()) {
Lines 582-602 Link Here
582	super((TransactionalEditingDomain) getEditingDomain(), adapterFactory);	598	super((TransactionalEditingDomain) getEditingDomain(), adapterFactory);
583	}	599	}
584		600
		601	@Override
585	public Object [] getElements(Object object) {	602	public Object [] getElements(Object object) {
586	Object parent = super.getParent(object);	603	Object parent = super.getParent(object);
587	return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();	604	return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
588	}	605	}
589		606
		607	@Override
590	public Object [] getChildren(Object object) {	608	public Object [] getChildren(Object object) {
591	Object parent = super.getParent(object);	609	Object parent = super.getParent(object);
592	return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();	610	return (parent == null ? Collections.EMPTY_SET : Collections.singleton(parent)).toArray();
593	}	611	}
594		612
		613	@Override
595	public boolean hasChildren(Object object) {	614	public boolean hasChildren(Object object) {
596	Object parent = super.getParent(object);	615	Object parent = super.getParent(object);
597	return parent != null;	616	return parent != null;
598	}	617	}
599		618
		619	@Override
600	public Object getParent(Object object) {	620	public Object getParent(Object object) {
601	return null;	621	return null;
602	}	622	}
Lines 718-723 Link Here
718	* <!-- end-user-doc -->	738	* <!-- end-user-doc -->
719	* @generated	739	* @generated
720	*/	740	*/
		741	@Override
721	public void createPartControl(Composite parent) {	742	public void createPartControl(Composite parent) {
722	// Creates the model from the editor input	743	// Creates the model from the editor input
723	//	744	//
Lines 743-748 Link Here
743	* <!-- begin-user-doc -->	764	* <!-- begin-user-doc -->
744	* <!-- end-user-doc -->	765	* <!-- end-user-doc -->
745	*/	766	*/
		767	@Override
		768	@SuppressWarnings("unchecked")
746	public Object getAdapter(Class key) {	769	public Object getAdapter(Class key) {
747	if (key.equals(IContentOutlinePage.class)) {	770	if (key.equals(IContentOutlinePage.class)) {
748	return getContentOutlinePage();	771	return getContentOutlinePage();
Lines 772-777 Link Here
772	// The content outline is just a tree.	795	// The content outline is just a tree.
773	//	796	//
774	class MyContentOutlinePage extends ContentOutlinePage {	797	class MyContentOutlinePage extends ContentOutlinePage {
		798	@Override
775	public void createControl(Composite parent) {	799	public void createControl(Composite parent) {
776	super.createControl(parent);	800	super.createControl(parent);
777	contentOutlineViewer = getTreeViewer();	801	contentOutlineViewer = getTreeViewer();
Lines 796-812 Link Here
796	if (!editingDomain.getResourceSet().getResources().isEmpty()) {	820	if (!editingDomain.getResourceSet().getResources().isEmpty()) {
797	// Select the root object in the view.	821	// Select the root object in the view.
798	//	822	//
799	ArrayList selection = new ArrayList();	823	ArrayList<Object> selection = new ArrayList<Object>();
800	selection.add(getResource());	824	selection.add(getResource());
801	contentOutlineViewer.setSelection(new StructuredSelection(selection), true);	825	contentOutlineViewer.setSelection(new StructuredSelection(selection), true);
802	}	826	}
803	}	827	}
804		828
		829	@Override
805	public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {	830	public void makeContributions(IMenuManager menuManager, IToolBarManager toolBarManager, IStatusLineManager statusLineManager) {
806	super.makeContributions(menuManager, toolBarManager, statusLineManager);	831	super.makeContributions(menuManager, toolBarManager, statusLineManager);
807	contentOutlineStatusLineManager = statusLineManager;	832	contentOutlineStatusLineManager = statusLineManager;
808	}	833	}
809		834
		835	@Override
810	public void setActionBars(IActionBars actionBars) {	836	public void setActionBars(IActionBars actionBars) {
811	super.setActionBars(actionBars);	837	super.setActionBars(actionBars);
812	getActionBarContributor().shareGlobalActions(this, actionBars);	838	getActionBarContributor().shareGlobalActions(this, actionBars);
Lines 839-849 Link Here
839	if (propertySheetPage == null) {	865	if (propertySheetPage == null) {
840	propertySheetPage =	866	propertySheetPage =
841	new ExtendedPropertySheetPage(editingDomain) {	867	new ExtendedPropertySheetPage(editingDomain) {
842	public void setSelectionToViewer(List selection) {	868	@Override
		869	public void setSelectionToViewer(List<?> selection) {
843	EXTLibraryEditor.this.setSelectionToViewer(selection);	870	EXTLibraryEditor.this.setSelectionToViewer(selection);
844	EXTLibraryEditor.this.setFocus();	871	EXTLibraryEditor.this.setFocus();
845	}	872	}
846		873
		874	@Override
847	public void setActionBars(IActionBars actionBars) {	875	public void setActionBars(IActionBars actionBars) {
848	super.setActionBars(actionBars);	876	super.setActionBars(actionBars);
849	getActionBarContributor().shareGlobalActions(this, actionBars);	877	getActionBarContributor().shareGlobalActions(this, actionBars);
Lines 862-874 Link Here
862	*/	890	*/
863	public void handleContentOutlineSelection(ISelection selection) {	891	public void handleContentOutlineSelection(ISelection selection) {
864	if (!selection.isEmpty() && selection instanceof IStructuredSelection) {	892	if (!selection.isEmpty() && selection instanceof IStructuredSelection) {
865	Iterator selectedElements = ((IStructuredSelection)selection).iterator();	893	Iterator<?> selectedElements = ((IStructuredSelection)selection).iterator();
866	if (selectedElements.hasNext()) {	894	if (selectedElements.hasNext()) {
867	// Get the first selected element.	895	// Get the first selected element.
868	//	896	//
869	Object selectedElement = selectedElements.next();	897	Object selectedElement = selectedElements.next();
870		898
871	ArrayList selectionList = new ArrayList();	899	ArrayList<Object> selectionList = new ArrayList<Object>();
872	selectionList.add(selectedElement);	900	selectionList.add(selectedElement);
873	while (selectedElements.hasNext()) {	901	while (selectedElements.hasNext()) {
874	selectionList.add(selectedElements.next());	902	selectionList.add(selectedElements.next());
Lines 886-891 Link Here
886	* <!-- begin-user-doc -->	914	* <!-- begin-user-doc -->
887	* <!-- end-user-doc -->	915	* <!-- end-user-doc -->
888	*/	916	*/
		917	@Override
889	public boolean isDirty() {	918	public boolean isDirty() {
890	return dirty;	919	return dirty;
891	}	920	}
Lines 895-900 Link Here
895	* <!-- begin-user-doc -->	924	* <!-- begin-user-doc -->
896	* <!-- end-user-doc -->	925	* <!-- end-user-doc -->
897	*/	926	*/
		927	@Override
898	public void doSave(IProgressMonitor progressMonitor) {	928	public void doSave(IProgressMonitor progressMonitor) {
899	// Do the work within an operation because this is a long running activity	929	// Do the work within an operation because this is a long running activity
900	// that modifies the workbench. Moreover, we must do this in a read-only	930	// that modifies the workbench. Moreover, we must do this in a read-only
Lines 904-909 Link Here
904	new WorkspaceModifyOperation() {	934	new WorkspaceModifyOperation() {
905	// This is the method that gets invoked when the operation runs.	935	// This is the method that gets invoked when the operation runs.
906	//	936	//
		937	@Override
907	public void execute(IProgressMonitor monitor) {	938	public void execute(IProgressMonitor monitor) {
908	try {	939	try {
909	((TransactionalEditingDomain) getEditingDomain()).runExclusive(new Runnable() {	940	((TransactionalEditingDomain) getEditingDomain()).runExclusive(new Runnable() {
Lines 949-954 Link Here
949	* <!-- end-user-doc -->	980	* <!-- end-user-doc -->
950	* @generated	981	* @generated
951	*/	982	*/
		983	@Override
952	public boolean isSaveAsAllowed() {	984	public boolean isSaveAsAllowed() {
953	return true;	985	return true;
954	}	986	}
Lines 959-964 Link Here
959	* <!-- end-user-doc -->	991	* <!-- end-user-doc -->
960	* @generated	992	* @generated
961	*/	993	*/
		994	@Override
962	public void doSaveAs() {	995	public void doSaveAs() {
963	SaveAsDialog saveAsDialog= new SaveAsDialog(getSite().getShell());	996	SaveAsDialog saveAsDialog= new SaveAsDialog(getSite().getShell());
964	saveAsDialog.open();	997	saveAsDialog.open();
Lines 1038-1043 Link Here
1038	* <!-- begin-user-doc -->	1071	* <!-- begin-user-doc -->
1039	* <!-- end-user-doc -->	1072	* <!-- end-user-doc -->
1040	*/	1073	*/
		1074	@Override
1041	public void init(IEditorSite site, IEditorInput editorInput) {	1075	public void init(IEditorSite site, IEditorInput editorInput) {
1042	setSite(site);	1076	setSite(site);
1043	setInputWithNotify(editorInput);	1077	setInputWithNotify(editorInput);
Lines 1054-1059 Link Here
1054	* <!-- begin-user-doc -->	1088	* <!-- begin-user-doc -->
1055	* <!-- end-user-doc -->	1089	* <!-- end-user-doc -->
1056	*/	1090	*/
		1091	@Override
1057	public void setFocus() {	1092	public void setFocus() {
1058	selectionViewer.getControl().setFocus();	1093	selectionViewer.getControl().setFocus();
1059	}	1094	}
Lines 1098-1105 Link Here
1098	public void setSelection(ISelection selection) {	1133	public void setSelection(ISelection selection) {
1099	editorSelection = selection;	1134	editorSelection = selection;
1100		1135
1101	for (Iterator listeners = selectionChangedListeners.iterator(); listeners.hasNext(); ) {	1136	for (ISelectionChangedListener listener : selectionChangedListeners) {
1102	ISelectionChangedListener listener = (ISelectionChangedListener)listeners.next();
1103	listener.selectionChanged(new SelectionChangedEvent(this, selection));	1137	listener.selectionChanged(new SelectionChangedEvent(this, selection));
1104	}	1138	}
1105	setStatusLineManager(selection);	1139	setStatusLineManager(selection);
Lines 1116-1122 Link Here
1116		1150
1117	if (statusLineManager != null) {	1151	if (statusLineManager != null) {
1118	if (selection instanceof IStructuredSelection) {	1152	if (selection instanceof IStructuredSelection) {
1119	Collection collection = ((IStructuredSelection)selection).toList();	1153	Collection<?> collection = ((IStructuredSelection)selection).toList();
1120	switch (collection.size()) {	1154	switch (collection.size()) {
1121	case 0: {	1155	case 0: {
1122	statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$	1156	statusLineManager.setMessage(getString("_UI_NoObjectSelected")); //$NON-NLS-1$
Lines 1204-1209 Link Here
1204	* <!-- begin-user-doc -->	1238	* <!-- begin-user-doc -->
1205	* <!-- end-user-doc -->	1239	* <!-- end-user-doc -->
1206	*/	1240	*/
		1241	@Override
1207	public void dispose() {	1242	public void dispose() {
1208	workspaceSynchronizer.dispose();	1243	workspaceSynchronizer.dispose();
1209	getOperationHistory().removeOperationHistoryListener(historyListener);	1244	getOperationHistory().removeOperationHistoryListener(historyListener);

Lines 1-5 Link Here

(-)src/org/eclipse/emf/workspace/examples/extlibrary/presentation/EXTLibraryEditorPlugin.java (-2 / +11 lines)
1	/**	1	/**
2	* <copyright>	2	* <copyright>
		3	*
		4	* Copyright (c) 2005, 2007 IBM Corporation and others.
		5	* All rights reserved. This program and the accompanying materials
		6	* are made available under the terms of the Eclipse Public License v1.0
		7	* which accompanies this distribution, and is available at
		8	* http://www.eclipse.org/legal/epl-v10.html
		9	*
		10	* Contributors:
		11	* IBM - Initial API and implementation
		12	*
3	* </copyright>	13	* </copyright>
4	*	14	*
5	* $Id: EXTLibraryEditorPlugin.java,v 1.1 2006/01/30 16:30:09 cdamus Exp $	15	* $Id: EXTLibraryEditorPlugin.java,v 1.1 2006/01/30 16:30:09 cdamus Exp $
Lines 7-15 Link Here
7	package org.eclipse.emf.workspace.examples.extlibrary.presentation;	17	package org.eclipse.emf.workspace.examples.extlibrary.presentation;
8		18
9	import org.eclipse.emf.common.EMFPlugin;	19	import org.eclipse.emf.common.EMFPlugin;
10
11	import org.eclipse.emf.common.ui.EclipseUIPlugin;	20	import org.eclipse.emf.common.ui.EclipseUIPlugin;
12
13	import org.eclipse.emf.common.util.ResourceLocator;	21	import org.eclipse.emf.common.util.ResourceLocator;
14		22
15	/**	23	/**
Lines 54-59 Link Here
54	* @return the singleton instance.	62	* @return the singleton instance.
55	* @generated	63	* @generated
56	*/	64	*/
		65	@Override
57	public ResourceLocator getPluginResourceLocator() {	66	public ResourceLocator getPluginResourceLocator() {
58	return plugin;	67	return plugin;
59	}	68	}

Lines 46-52 Link Here

(-)src/org/eclipse/emf/workspace/examples/extlibrary/presentation/ResourceLoadedListener.java (-1 / +2 lines)
46	public class ResourceLoadedListener extends DemultiplexingListener {	46	public class ResourceLoadedListener extends DemultiplexingListener {
47	private static ResourceLoadedListener instance;	47	private static ResourceLoadedListener instance;
48		48
49	private final Set ignoredResources = new java.util.HashSet();	49	private final Set<Resource> ignoredResources = new java.util.HashSet<Resource>();
50		50
51	/**	51	/**
52	* Initializes me with my filter.	52	* Initializes me with my filter.
Lines 87-92 Link Here
87	ignoredResources.remove(res);	87	ignoredResources.remove(res);
88	}	88	}
89		89
		90	@Override
90	protected void handleNotification(TransactionalEditingDomain domain, Notification notification) {	91	protected void handleNotification(TransactionalEditingDomain domain, Notification notification) {
91	if (ignoredResources.contains(notification.getNotifier())) {	92	if (ignoredResources.contains(notification.getNotifier())) {
92	// skip any resource that we are supposed to ignore	93	// skip any resource that we are supposed to ignore

Lines 1-5 Link Here

(-)src/org/eclipse/emf/workspace/examples/extlibrary/presentation/EXTLibraryActionBarContributor.java (-17 / +41 lines)
1	/**	1	/**
2	* <copyright>	2	* <copyright>
		3	*
		4	* Copyright (c) 2005, 2007 IBM Corporation and others.
		5	* All rights reserved. This program and the accompanying materials
		6	* are made available under the terms of the Eclipse Public License v1.0
		7	* which accompanies this distribution, and is available at
		8	* http://www.eclipse.org/legal/epl-v10.html
		9	*
		10	* Contributors:
		11	* IBM - Initial API and implementation
		12	*
3	* </copyright>	13	* </copyright>
4	*	14	*
5	* $Id: EXTLibraryActionBarContributor.java,v 1.2 2006/02/22 15:17:44 cmcgee Exp $	15	* $Id: EXTLibraryActionBarContributor.java,v 1.2 2006/02/22 15:17:44 cmcgee Exp $
Lines 8-14 Link Here
8		18
9	import java.util.ArrayList;	19	import java.util.ArrayList;
10	import java.util.Collection;	20	import java.util.Collection;
11	import java.util.Iterator;
12		21
13	import org.eclipse.emf.common.ui.viewer.IViewerProvider;	22	import org.eclipse.emf.common.ui.viewer.IViewerProvider;
14	import org.eclipse.emf.edit.domain.EditingDomain;	23	import org.eclipse.emf.edit.domain.EditingDomain;
Lines 84-89 Link Here
84	protected IAction showPropertiesViewAction =	93	protected IAction showPropertiesViewAction =
85	new Action(EXTLibraryEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$	94	new Action(EXTLibraryEditorPlugin.INSTANCE.getString("_UI_ShowPropertiesView_menu_item")) //$NON-NLS-1$
86	{	95	{
		96	@Override
87	public void run() {	97	public void run() {
88	try {	98	try {
89	getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$	99	getPage().showView("org.eclipse.ui.views.PropertySheet"); //$NON-NLS-1$
Lines 104-113 Link Here
104	protected IAction refreshViewerAction =	114	protected IAction refreshViewerAction =
105	new Action(EXTLibraryEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$	115	new Action(EXTLibraryEditorPlugin.INSTANCE.getString("_UI_RefreshViewer_menu_item")) //$NON-NLS-1$
106	{	116	{
		117	@Override
107	public boolean isEnabled() {	118	public boolean isEnabled() {
108	return activeEditorPart instanceof IViewerProvider;	119	return activeEditorPart instanceof IViewerProvider;
109	}	120	}
110		121
		122	@Override
111	public void run() {	123	public void run() {
112	if (activeEditorPart instanceof IViewerProvider) {	124	if (activeEditorPart instanceof IViewerProvider) {
113	Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();	125	Viewer viewer = ((IViewerProvider)activeEditorPart).getViewer();
Lines 127-133 Link Here
127	* <!-- end-user-doc -->	139	* <!-- end-user-doc -->
128	* @generated	140	* @generated
129	*/	141	*/
130	protected Collection createChildActions;	142	protected Collection<IAction> createChildActions;
131		143
132	/**	144	/**
133	* This is the menu manager into which menu contribution items should be added for CreateChild actions.	145	* This is the menu manager into which menu contribution items should be added for CreateChild actions.
Lines 144-150 Link Here
144	* <!-- end-user-doc -->	156	* <!-- end-user-doc -->
145	* @generated	157	* @generated
146	*/	158	*/
147	protected Collection createSiblingActions;	159	protected Collection<IAction> createSiblingActions;
148		160
149	/**	161	/**
150	* This is the menu manager into which menu contribution items should be added for CreateSibling actions.	162	* This is the menu manager into which menu contribution items should be added for CreateSibling actions.
Lines 165-170 Link Here
165	validateAction = new ValidateAction();	177	validateAction = new ValidateAction();
166	}	178	}
167		179
		180	@Override
168	public void init(IActionBars actionBars) {	181	public void init(IActionBars actionBars) {
169	super.init(actionBars);	182	super.init(actionBars);
170		183
Lines 186-191 Link Here
186	* <!-- end-user-doc -->	199	* <!-- end-user-doc -->
187	* @generated	200	* @generated
188	*/	201	*/
		202	@Override
189	public void contributeToToolBar(IToolBarManager toolBarManager) {	203	public void contributeToToolBar(IToolBarManager toolBarManager) {
190	toolBarManager.add(new Separator("extlibrary-settings")); //$NON-NLS-1$	204	toolBarManager.add(new Separator("extlibrary-settings")); //$NON-NLS-1$
191	toolBarManager.add(new Separator("extlibrary-additions")); //$NON-NLS-1$	205	toolBarManager.add(new Separator("extlibrary-additions")); //$NON-NLS-1$
Lines 197-202 Link Here
197	* <!-- begin-user-doc -->	211	* <!-- begin-user-doc -->
198	* <!-- end-user-doc -->	212	* <!-- end-user-doc -->
199	*/	213	*/
		214	@Override
200	public void contributeToMenu(IMenuManager menuManager) {	215	public void contributeToMenu(IMenuManager menuManager) {
201	super.contributeToMenu(menuManager);	216	super.contributeToMenu(menuManager);
202		217
Lines 235-240 Link Here
235	* <!-- end-user-doc -->	250	* <!-- end-user-doc -->
236	* @generated	251	* @generated
237	*/	252	*/
		253	@Override
238	public void setActiveEditor(IEditorPart part) {	254	public void setActiveEditor(IEditorPart part) {
239	super.setActiveEditor(part);	255	super.setActiveEditor(part);
240	activeEditorPart = part;	256	activeEditorPart = part;
Lines 259-270 Link Here
259	}	275	}
260	}	276	}
261		277
		278	@Override
262	public void activate() {	279	public void activate() {
263	longRunningReadAction.setActiveWorkbenchPart(activeEditor);	280	longRunningReadAction.setActiveWorkbenchPart(activeEditor);
264		281
265	super.activate();	282	super.activate();
266	}	283	}
267		284
		285	@Override
268	public void deactivate() {	286	public void deactivate() {
269	longRunningReadAction.setActiveWorkbenchPart(null);	287	longRunningReadAction.setActiveWorkbenchPart(null);
270		288
Lines 291-298 Link Here
291		309
292	// Query the new selection for appropriate new child/sibling descriptors	310	// Query the new selection for appropriate new child/sibling descriptors
293	//	311	//
294	Collection newChildDescriptors = null;	312	Collection<?> newChildDescriptors = null;
295	Collection newSiblingDescriptors = null;	313	Collection<?> newSiblingDescriptors = null;
296		314
297	ISelection selection = event.getSelection();	315	ISelection selection = event.getSelection();
298	if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {	316	if (selection instanceof IStructuredSelection && ((IStructuredSelection)selection).size() == 1) {
Lines 326-336 Link Here
326	* <!-- end-user-doc -->	344	* <!-- end-user-doc -->
327	* @generated	345	* @generated
328	*/	346	*/
329	protected Collection generateCreateChildActions(Collection descriptors, ISelection selection) {	347	protected Collection<IAction> generateCreateChildActions(Collection<?> descriptors, ISelection selection) {
330	Collection actions = new ArrayList();	348	Collection<IAction> actions = new ArrayList<IAction>();
331	if (descriptors != null) {	349	if (descriptors != null) {
332	for (Iterator i = descriptors.iterator(); i.hasNext(); ) {	350	for (Object next : descriptors) {
333	actions.add(new CreateChildAction(activeEditorPart, selection, i.next()));	351	actions.add(new CreateChildAction(activeEditorPart, selection, next));
334	}	352	}
335	}	353	}
336	return actions;	354	return actions;
Lines 343-353 Link Here
343	* <!-- end-user-doc -->	361	* <!-- end-user-doc -->
344	* @generated	362	* @generated
345	*/	363	*/
346	protected Collection generateCreateSiblingActions(Collection descriptors, ISelection selection) {	364	protected Collection<IAction> generateCreateSiblingActions(Collection<?> descriptors, ISelection selection) {
347	Collection actions = new ArrayList();	365	Collection<IAction> actions = new ArrayList<IAction>();
348	if (descriptors != null) {	366	if (descriptors != null) {
349	for (Iterator i = descriptors.iterator(); i.hasNext(); ) {	367	for (Object next : descriptors) {
350	actions.add(new CreateSiblingAction(activeEditorPart, selection, i.next()));	368	actions.add(new CreateSiblingAction(activeEditorPart, selection, next));
351	}	369	}
352	}	370	}
353	return actions;	371	return actions;
Lines 362-371 Link Here
362	* <!-- end-user-doc -->	380	* <!-- end-user-doc -->
363	* @generated	381	* @generated
364	*/	382	*/
365	protected void populateManager(IContributionManager manager, Collection actions, String contributionID) {	383	protected void populateManager(IContributionManager manager,
		384	Collection<? extends IAction> actions, String contributionID) {
		385
366	if (actions != null) {	386	if (actions != null) {
367	for (Iterator i = actions.iterator(); i.hasNext(); ) {	387	for (IAction action : actions) {
368	IAction action = (IAction)i.next();
369	if (contributionID != null) {	388	if (contributionID != null) {
370	manager.insertBefore(contributionID, action);	389	manager.insertBefore(contributionID, action);
371	}	390	}
Lines 383-389 Link Here
383	* <!-- end-user-doc -->	402	* <!-- end-user-doc -->
384	* @generated	403	* @generated
385	*/	404	*/
386	protected void depopulateManager(IContributionManager manager, Collection actions) {	405	protected void depopulateManager(IContributionManager manager,
		406	Collection<? extends IAction> actions) {
		407
387	if (actions != null) {	408	if (actions != null) {
388	IContributionItem[] items = manager.getItems();	409	IContributionItem[] items = manager.getItems();
389	for (int i = 0; i < items.length; i++) {	410	for (int i = 0; i < items.length; i++) {
Lines 412-417 Link Here
412	* <!-- end-user-doc -->	433	* <!-- end-user-doc -->
413	* @generated	434	* @generated
414	*/	435	*/
		436	@Override
415	public void menuAboutToShow(IMenuManager menuManager) {	437	public void menuAboutToShow(IMenuManager menuManager) {
416	super.menuAboutToShow(menuManager);	438	super.menuAboutToShow(menuManager);
417	MenuManager submenuManager = null;	439	MenuManager submenuManager = null;
Lines 430-435 Link Here
430	* <!-- begin-user-doc -->	452	* <!-- begin-user-doc -->
431	* <!-- end-user-doc -->	453	* <!-- end-user-doc -->
432	*/	454	*/
		455	@Override
433	protected void addGlobalActions(IMenuManager menuManager) {	456	protected void addGlobalActions(IMenuManager menuManager) {
434	menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$	457	menuManager.insertAfter("additions-end", new Separator("ui-actions")); //$NON-NLS-1$ //$NON-NLS-2$
435	menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$	458	menuManager.insertAfter("ui-actions", showPropertiesViewAction); //$NON-NLS-1$
Lines 450-455 Link Here
450	* <!-- end-user-doc -->	473	* <!-- end-user-doc -->
451	* @generated	474	* @generated
452	*/	475	*/
		476	@Override
453	protected boolean removeAllReferencesOnDelete() {	477	protected boolean removeAllReferencesOnDelete() {
454	return true;	478	return true;
455	}	479	}




import java.util.Map;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalCommandStack;

		((TransactionalCommandStack) result.getCommandStack()).setExceptionHandler(
				new CommandStackExceptionHandler());
		
		DefaultOptions defaults = TransactionUtil.getAdapter(
            result, DefaultOptions.class);
		if (defaults != null) {
            Map<Object, Object> options = new java.util.HashMap<Object, Object>();

            options.put(Transaction.OPTION_VALIDATE_EDIT,
                new WorkspaceValidateEditSupport() {
                    @Override
					protected IStatus doValidateEdit(Transaction transaction,
                            Collection<? extends Resource> resources, Object context) {
                        if ((context == null) && (Display.getCurrent() != null)) {
                            // get the active shell for the context
                            // when validating on the UI thread




public class ConsoleUtil {
	
	/** cache for console name to actual console object mapping*/
	private static Map<String, MessageConsole> nameToConsole =
		new HashMap<String, MessageConsole>();
	
	/** cache for 'console name' to 'stream for that console' mapping */
	private static Map<String, MessageConsoleStream> nameToStream =
		new HashMap<String, MessageConsoleStream>();

	/**
	 * Registers the console with the Eclipse Console Manager.

			nameToConsole.put(name, console );
		}
		
		return nameToConsole.get( name);
	}
	
	

	 */
	public synchronized static void unregisterConsole(String name){		
		if(nameToConsole.containsKey( name)){		
			ConsolePlugin.getDefault().getConsoleManager().removeConsoles(
				new IConsole[]{nameToConsole.get(name)});
			nameToConsole.remove( name);
		}		
	}

			
		}
		
		return nameToStream.get(name);
		
	}





import org.eclipse.emf.edit.domain.IEditingDomainProvider;
import org.eclipse.emf.transaction.RunnableWithResult;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.emf.workspace.examples.extlibrary.console.ConsoleUtil;
import org.eclipse.emf.workspace.examples.extlibrary.internal.l10n.Messages;
import org.eclipse.jface.action.Action;

		super(Messages.readJob_title);
	}

	@Override
	public void run() {
		if (domain != null) {
			ConsoleUtil.showConsole(CONSOLE);

			setPriority(Job.LONG);
		}
		
		@Override
		protected IStatus run(final IProgressMonitor monitor) {
			try {
				return TransactionUtil.runExclusive(domain,
					new RunnableWithResult.Impl<IStatus>() {
						public void run() {
							setResult(longRunningRead(monitor));
						}});




 org.eclipse.emf.workspace.examples.extlibrary.presentation
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
 org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
 org.eclipse.emf.examples.library.edit;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
 org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
 org.eclipse.emf.edit.ui;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
 org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
 org.eclipse.emf.workspace;bundle-version="[1.2.0,2.0.0)",
 org.eclipse.emf.transaction.ui;bundle-version="[1.2.0,2.0.0)",
 org.eclipse.emf.workspace.ui;bundle-version="[1.2.0,2.0.0)",
 org.eclipse.ui.console;bundle-version="[3.1.100,4.0.0)"
Eclipse-LazyStart: true
Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 1-8 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-5 / +5 lines)
1	#Wed Dec 20 11:53:52 EST 2006	1	#Sun Nov 11 17:20:41 EST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5	org.eclipse.jdt.core.compiler.compliance=1.4	5	org.eclipse.jdt.core.compiler.compliance=1.5
6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error	6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8	org.eclipse.jdt.core.compiler.source=1.4	8	org.eclipse.jdt.core.compiler.source=1.5

Lines 1-6 Link Here

(-).classpath (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>	3	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
4	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	4	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5	<classpathentry kind="output" path="bin"/>	5	<classpathentry kind="output" path="bin"/>
6	</classpath>	6	</classpath>

Lines 7-10 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"	8	Require-Bundle: org.eclipse.help;bundle-version="[3.2.0,4.0.0)"
9	Eclipse-LazyStart: true	9	Eclipse-LazyStart: true
10	Bundle-RequiredExecutionEnvironment: J2SE-1.4	10	Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 1-8 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-5 / +5 lines)
1	#Wed Dec 20 11:52:13 EST 2006	1	#Sun Nov 11 17:03:45 EST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5	org.eclipse.jdt.core.compiler.compliance=1.4	5	org.eclipse.jdt.core.compiler.compliance=1.5
6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error	6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8	org.eclipse.jdt.core.compiler.source=1.4	8	org.eclipse.jdt.core.compiler.source=1.5




     * 
     *  @since 1.1
     */
	@Override
	protected void doExecute(Command command, Map<?, ?> options) throws InterruptedException, RollbackException {
		InternalTransaction tx = createTransaction(command, options);
		
		try {

     * 
     * @since 1.1
     */
    @Override
	protected void handleRollback(Command command, RollbackException rbe) {
        if ((command != null) && (top >= 0) && (commandList.get(top) == command)) {
            // pop the failed command
            commandList.remove(top--);

            if (top >= 0) {
                mostRecentCommand = commandList.get(top);
            } else {
                mostRecentCommand = null;
            }

     * an undo transaction (a read/write transaction with the
     * {@link #getUndoRedoOptions() undo/redo options}).
     */
	@Override
	public void undo() {
		if (canUndo()) {
			try {

	 * Extends the inherited implementation to consider the redoability of
	 * {@link ConditionalRedoCommand}s.
	 */
	@Override
	public boolean canRedo() {
		boolean result = super.canRedo();
		

	 * of a redo transaction (a read/write transaction with the
	 * {@link #getUndoRedoOptions() undo/redo options}).
	 */
	@Override
	public void redo() {
		if (canRedo()) {
			try {

	}

	// Documentation copied from the inherited specification
	public EMFCommandTransaction createTransaction(Command command, Map<?, ?> options)
			throws InterruptedException {
		
		EMFCommandTransaction result;
		
		if (command instanceof TriggerCommand) {

	}

	// Documentation copied from the inherited specification
	public void executeTriggers(Command command, List<Command> triggers,
			Map<?, ?> options) throws InterruptedException, RollbackException {
		
		if (!triggers.isEmpty()) {
			TriggerCommand trigger = (command == null)
				? new TriggerCommand(triggers)





import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;

import org.eclipse.emf.common.notify.Notification;

	 * 
	 * @see #selectUnbatched(List, NotificationFilter)
	 */
	public List<Notification> select(List<Notification> notifications,
			NotificationFilter filter, ArrayList<Notification> cache) {
		List<Notification> result;
		
		if (filter == NotificationFilter.ANY) {
			result = notifications;

				filter = NotificationFilter.NOT_TOUCH;
			}
			
			for (Notification next : notifications) {
				Notification next = (Notification) iter.next();
				
				if (filter.matches(next)) {
					result.add(next);
				}

	 * 
	 * @see #selectUnbatched(List, NotificationFilter)
	 */
	public List<Notification> select(List<Notification> notifications,
			NotificationFilter filter) {
		return select(notifications, filter, new ArrayList<Notification>());
	}
	
	/**

	 * 
	 * @see #select(List, NotificationFilter)
	 */
	public List<Notification> selectUnbatched(List<Notification> notification,
			NotificationFilter filter) {
		
		List<Notification> result;
		
		if (filter == null) {
			// the default filter
			filter = NotificationFilter.NOT_TOUCH;
		}

		if (filter.matches(notification.get(0))) {
			result = notification;
		} else {
			result = Collections.emptyList();
		}
		
		return result;

Lines 1-7 Link Here

(-)src/org/eclipse/emf/transaction/impl/PrivilegedRunnable.java (-5 / +8 lines)
1	/**	1	/**
2	* <copyright>	2	* <copyright>
3	*	3	*
4	* Copyright (c) 2006 IBM Corporation and others.	4	* Copyright (c) 2006, 2007 IBM Corporation and others.
5	* All rights reserved. This program and the accompanying materials	5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0	6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at	7	* which accompanies this distribution, and is available at
Lines 26-35 Link Here
26	/**	26	/**
27	* Implementation of the privileged runnable, which allows a thread to lend	27	* Implementation of the privileged runnable, which allows a thread to lend
28	* its transaction to another cooperating thread for synchronous execution.	28	* its transaction to another cooperating thread for synchronous execution.
29	*	29	*
		30	* @param <T> the result type of the runnable
		31	*
30	* @author Christian W. Damus (cdamus)	32	* @author Christian W. Damus (cdamus)
31	*/	33	*/
32	public final class PrivilegedRunnable extends RunnableWithResult.Impl {	34	public final class PrivilegedRunnable<T> extends RunnableWithResult.Impl<T> {
33	private final InternalTransaction transaction;	35	private final InternalTransaction transaction;
34	private final Runnable delegate;	36	private final Runnable delegate;
35	private final Thread owner;	37	private final Thread owner;
Lines 70-77 Link Here
70	* Runs my delegate in the context of the transaction that I share.	72	* Runs my delegate in the context of the transaction that I share.
71	*/	73	*/
72	public void run() {	74	public void run() {
73	final RunnableWithResult rwr = (delegate instanceof RunnableWithResult)?	75	@SuppressWarnings("unchecked")
74	(RunnableWithResult) delegate : null;	76	final RunnableWithResult<T> rwr = (delegate instanceof RunnableWithResult)?
		77	(RunnableWithResult<T>) delegate : null;
75		78
76	boolean needPrivilege = transaction.getOwner() != Thread.currentThread();	79	boolean needPrivilege = transaction.getOwner() != Thread.currentThread();
77	if (needPrivilege) {	80	if (needPrivilege) {




     * transaction (if any) and passing the exception along to
     * the registered exception handler (if any).
     */
    @Override
	protected void handleError(Exception exception) {
    	InternalTransaction active = getDomain().getActiveTransaction();
    	
    	if ((active != null) && active.isActive()) {

     * command is rolled back.  Note that <code>doExecute()</code> is only
     * called if the command is {@linkplain Command#canExecute() executable}.
     */
    public void execute(Command command, Map<?, ?> options)
            throws InterruptedException, RollbackException {
        
        if ((command != null) && command.canExecute()) {

     *     waiting to start the transaction
     * @throws RollbackException if the execution of the command is rolled back
     */
    protected abstract void doExecute(Command command, Map<?, ?> options)
            throws InterruptedException, RollbackException;

    /**

     * checked exception thrown by that method is handled by
     * {@link #handleError(Exception)} but is not propagated.
     */
    @Override
	public void execute(Command command) {
    	try {
    		execute(command, null);
    	} catch (InterruptedException e) {

     * 
     * @return my editing domain's transaction options for undo/redo
     */
    protected Map<?, ?> getUndoRedoOptions() {
    	return domain.getUndoRedoOptions();
    }
    

     * @param options a client-supplied options map
     * @return a derived map of options suitable for trigger transactions
     */
    public static final Map<Object, Object> makeTriggerTransactionOptions(Map<?, ?> options) {
        Map<Object, Object> result;
        
        if ((options == null) || options.isEmpty()) {
            result = Collections.<Object, Object>singletonMap(
                TransactionImpl.OPTION_IS_TRIGGER_TRANSACTION, true); 
        } else {
            result = new java.util.HashMap<Object, Object>(options);
            result.put(
                TransactionImpl.OPTION_IS_TRIGGER_TRANSACTION, true);
        }
        
        return result;




import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.common.notify.impl.AdapterImpl;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;

import org.eclipse.emf.transaction.internal.l10n.Messages;
import org.eclipse.emf.transaction.util.Adaptable;
import org.eclipse.emf.transaction.util.Lock;
import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.osgi.util.NLS;

/**

	
	private TransactionValidator.Factory validatorFactory = null;
	
	private final Map<Object, Object> defaultTransactionOptions =
		new java.util.HashMap<Object, Object>();
	private final Map<Object, Object> defaultTransactionOptionsRO = Collections
        .unmodifiableMap(defaultTransactionOptions);
	
	private final Lock transactionLock = new Lock();
	private final Lock writeLock = new Lock();
	
	private final List<ResourceSetListener> precommitListeners =
		new java.util.ArrayList<ResourceSetListener>();
	private final List<ResourceSetListener> aggregatePrecommitListeners =
		new java.util.ArrayList<ResourceSetListener>();
	private final List<ResourceSetListener> postcommitListeners =
		new java.util.ArrayList<ResourceSetListener>();
	
	// reusable notification list and event for unbatched change events
	private final List<Notification> unbatchedNotifications =
		new java.util.ArrayList<Notification>(1);
	private final ResourceSetChangeEvent unbatchedChangeEvent =
		new ResourceSetChangeEvent(this, null, unbatchedNotifications);
	
	// this is editable by clients for backwards compatibility with 1.1
	private final Map<Object, Object> undoRedoOptions = new java.util.HashMap<Object, Object>(
	    TransactionImpl.DEFAULT_UNDO_REDO_OPTIONS);
	
	/**

        
        // create a map for read-only-resource support.  Use a weak map
        //    to avoid retaining resources in this map
        resourceToReadOnlyMap = new java.util.WeakHashMap<Resource, Boolean>();
	}
	
	/**

			tx = startTransaction(true, null);
		}
		
		final RunnableWithResult<?> rwr = (read instanceof RunnableWithResult)?
			(RunnableWithResult<?>) read : null;
		
		try {
			read.run();

	}

	// Documentation copied from the inherited specification
	public InternalTransaction startTransaction(boolean readOnly, Map<?, ?> options)
			throws InterruptedException {
		
		InternalTransaction result;
		
		result = new TransactionImpl(this, readOnly, options);

	 */
	protected final ResourceSetListener[] getPrecommitListeners() {
		synchronized (precommitListeners) {
			return precommitListeners.toArray(
				new ResourceSetListener[precommitListeners.size()]);
		}
	}

	 */
	protected final ResourceSetListener[] getAggregatePrecommitListeners() {
		synchronized (aggregatePrecommitListeners) {
			return aggregatePrecommitListeners.toArray(
				new ResourceSetListener[aggregatePrecommitListeners.size()]);
		}
	}

	 */
	protected final ResourceSetListener[] getPostcommitListeners() {
		synchronized (postcommitListeners) {
			return postcommitListeners.toArray(
				new ResourceSetListener[postcommitListeners.size()]);
		}
	}

	
	// Documentation copied from the inherited specification
	public void precommit(final InternalTransaction tx) throws RollbackException {
		class PrecommitRunnable extends RunnableWithResult.Impl<List<Command>> {
			private final List<Notification> notifications;
			private final ResourceSetListener[] listeners;
			private final List triggers = new java.util.ArrayList();
			private RollbackException rollback;
			
			PrecommitRunnable(ResourceSetListener[] listeners,
					List<Notification> notifications) {
				
				this.listeners = listeners;
				this.notifications = notifications;
			}
			
			List<Command> runExclusive() throws InterruptedException {
				if ((listeners.length > 0) && !notifications.isEmpty()) {
					return TransactionUtil.runExclusive(
						TransactionalEditingDomainImpl.this, this);
				} else {
					return Collections.emptyList();
				}
			}
			

				return rollback;
			}
			
			List getTriggers() {
				return triggers;
			}
			
			public void run() {
				List<Command> triggers = new java.util.ArrayList<Command>();
				setResult(triggers);
				
				ArrayList<Notification> cache = new ArrayList<Notification>(
						notifications.size());
				
				for (ResourceSetListener element : listeners) {
					try {
						List<Notification> filtered = FilterManager.getInstance().select(
								notifications,
								element.getFilter(),
								cache);
						
						if (!filtered.isEmpty()) {
							Command cmd = element.transactionAboutToCommit(
									new ResourceSetChangeEvent(
											TransactionalEditingDomainImpl.this,
											tx,

		//    are no more notifications to send to them
		while (runnable != null) {
			try {
				List<Command> triggers = runnable.runExclusive();
				
				if (runnable.getRollback() != null) {
					Tracing.throwing(TransactionalEditingDomainImpl.class,

					command = null;
				}
				
				if (!triggers.isEmpty()) {
					getTransactionalCommandStack().executeTriggers(
						command, triggers, tx.getOptions());
				}
				
				List<Notification> notifications = validator.getNotificationsForPrecommit(
					tx);
				
				if ((notifications == null) || notifications.isEmpty()) {
					runnable = null;

			Tracing.trace(">>> Postcommitting " + getDebugID(tx) + " at " + Tracing.now()); //$NON-NLS-1$ //$NON-NLS-2$
		}
		
		final List<Notification> notifications = validator.getNotificationsForPostcommit(
			tx);
		if ((notifications == null) || notifications.isEmpty()) {
			return;
		}
		final ArrayList<Notification> cache = new ArrayList<Notification>(
				notifications.size());
		
		// dispose the validator now because starting the read-only transaction
		//    below will replace it with a new validator

		try {
			runExclusive(new Runnable() {
				public void run() {
					for (ResourceSetListener element : listeners) {
						try {
							List<Notification> filtered = FilterManager.getInstance().select(
									notifications,
									element.getFilter(),
									cache);
							
							if (!filtered.isEmpty()) {
								element.resourceSetChanged(
										new ResourceSetChangeEvent(
												TransactionalEditingDomainImpl.this,
												tx,

		try {
			runExclusive(new Runnable() {
				public void run() {
					for (ResourceSetListener element : listeners) {
						try {
							List<Notification> filtered = FilterManager.getInstance().selectUnbatched(
									unbatchedNotifications,
									element.getFilter());
							
							if (!filtered.isEmpty()) {
								element.resourceSetChanged(unbatchedChangeEvent);
							}
						} catch (Exception e) {
							Tracing.catching(TransactionalEditingDomainImpl.class, "broadcastUnbatched", e); //$NON-NLS-1$

	}
	
	// Documentation copied from the inherited specification
	public final RunnableWithResult<Object> createPrivilegedRunnable(Runnable runnable) {
		InternalTransaction tx = getActiveTransaction();
		
		if ((tx == null) || (tx.getOwner() != Thread.currentThread())) {

					"active transaction not owned by caller"); //$NON-NLS-1$
		}
		
		return new PrivilegedRunnable<Object>(tx, runnable);
	}
	
	// Documentation copied from the inherited specification
	public void startPrivileged(PrivilegedRunnable<?> runnable) {
		if (runnable.getTransaction().getEditingDomain() != this) {
			throw new IllegalArgumentException(
					"runnable has no privileges on this editing domain"); //$NON-NLS-1$

		}
		
	// Documentation copied from the inherited specification
	public void endPrivileged(PrivilegedRunnable<?> runnable) {
		if (runnable.getTransaction().getEditingDomain() != this) {
			throw new IllegalArgumentException(
					"runnable has no privileges on this editing domain"); //$NON-NLS-1$

		// disconnect the resource set from the editing domain
		((FactoryImpl) Factory.INSTANCE).unmapResourceSet(this);
	}

	public Map<Object, Object> getUndoRedoOptions() {
		return undoRedoOptions;
	}
	
	@SuppressWarnings("unchecked")
	public <T> T getAdapter(Class<? extends T> adapterType) {
	    T result;
	    
	    if (adapterType == DefaultOptions.class) {
	        result = (T) this;
	    } else {
	        result = null;
	    }
	    
	    return result;
	}
	
	public Map<?, ?> getDefaultTransactionOptions() {
	    return defaultTransactionOptionsRO;  // return the read-only view
	}
	
	public void setDefaultTransactionOptions(Map<?, ?> options) {
	    synchronized (defaultTransactionOptions) {
    	    defaultTransactionOptions.clear();
    	    defaultTransactionOptions.putAll(options);
	    }
	}
	
	/**
	 * Sets the factory to use when creating validators for transaction
	 * validation.
	 * 
	 * @since 1.1
	 * 
	 * @param validatorFactory the factory to set
	 */
	public void setValidatorFactory(TransactionValidator.Factory validatorFactory) {
		this.validatorFactory = validatorFactory;
	}
	
	/**
	 * Obtains the factory that this transactional editing domain uses
	 * to create validators for transaction validation.
	 * <p>
	 * If the validator factory has yet to be initialized, it is initialized
	 * using the default validator factory.
	 * </p>
	 * 
	 * @since 1.1
	 * 
	 * @return the requested validator factory
	 */
	public TransactionValidator.Factory getValidatorFactory() {
		if (this.validatorFactory == null) {
			return TransactionValidator.Factory.INSTANCE;
		}
        
		return this.validatorFactory;
	}

	/**
	 * Default implementation of the validator factory
	 * 
	 * @since 1.1
	 * 
	 * @author David Cummings (dcummin)
	 */
	public static class ValidatorFactoryImpl implements TransactionValidator.Factory {
		/**
	     * {@inheritDoc}
	     */
		public TransactionValidator createReadOnlyValidator() {
			return new ReadOnlyValidatorImpl();
		}

		/**
	     * {@inheritDoc}
	     */
		public TransactionValidator createReadWriteValidator() {
			return new ReadWriteValidatorImpl();
		}
	}
	
	/**
	 * Default implementation of a transaction editing domain factory.  This

		 * @param domain the editing domain to remove from the resource set mapping
		 */
		public synchronized void unmapResourceSet(TransactionalEditingDomain domain) {
			for (Iterator<Adapter> iter = domain.getResourceSet().eAdapters().iterator();
					iter.hasNext();) {
				
				Adapter next = iter.next();
				
				if (next.isAdapterForType(ResourceSetDomainLink.class)) {
					iter.remove();

		 *
		 * @author Christian W. Damus (cdamus)
		 */
		private static class ResourceSetDomainLink extends AdapterImpl
				implements IEditingDomainProvider {
			
			private final Reference<TransactionalEditingDomain> domain;
			
			ResourceSetDomainLink(TransactionalEditingDomain domain) {
				this.domain = new WeakReference<TransactionalEditingDomain>(domain);
			}
			
			@Override
			public boolean isAdapterForType(Object type) {
				return type == ResourceSetDomainLink.class;
			}
			
			final TransactionalEditingDomain getDomain() {
				TransactionalEditingDomain result = domain.get();
				
				if (result == null) {
					// no longer need the adapter

	 * @author Christian W. Damus (cdamus)
	 */
	public final static class RegistryImpl implements TransactionalEditingDomain.Registry {
		private final Map<String, TransactionalEditingDomain> domains =
			new java.util.HashMap<String, TransactionalEditingDomain>();
		
		// Documentation copied from the inherited specification
		public synchronized TransactionalEditingDomain getEditingDomain(String id) {
			TransactionalEditingDomain result = domains.get(id);
			
			if (result == null) {
				result = EditingDomainManager.getInstance().createEditingDomain(id);

				throw exc;
			}
			
			TransactionalEditingDomain result = domains.remove(id);
			
			if (result != null) {
				EditingDomainManager.getInstance().deconfigureListeners(id, result);

		}
		
	}

	public Map getUndoRedoOptions() {
		return undoRedoOptions;
	}
	
	public Object getAdapter(Class adapterType) {
	    Object result;
	    
	    if (adapterType == DefaultOptions.class) {
	        result = this;
	    } else {
	        result = null;
	    }
	    
	    return result;
	}
	
	public Map getDefaultTransactionOptions() {
	    return defaultTransactionOptionsRO;  // return the read-only view
	}
	
	public void setDefaultTransactionOptions(Map options) {
	    defaultTransactionOptions.clear();
	    defaultTransactionOptions.putAll(options);
	}
	
	/**
	 * Sets the factory to use when creating validators for transaction
	 * validation.
	 * 
	 * @since 1.1
	 * 
	 * @param validatorFactory the factory to set
	 */
	public void setValidatorFactory(TransactionValidator.Factory validatorFactory) {
		this.validatorFactory = validatorFactory;
	}
	
	/**
	 * Obtains the factory that this transactional editing domain uses
	 * to create validators for transaction validation.
	 * <p>
	 * If the validator factory has yet to be initialized, it is initialized
	 * using the default validator factory.
	 * </p>
	 * 
	 * @since 1.1
	 * 
	 * @return the requested validator factory
	 */
	public TransactionValidator.Factory getValidatorFactory() {
		if (this.validatorFactory == null) {
			return TransactionValidator.Factory.INSTANCE;
		}
        
		return this.validatorFactory;
	}

	/**
	 * Default implementation of the validator factory
	 * 
	 * @since 1.1
	 * 
	 * @author David Cummings (dcummin)
	 */
	public static class ValidatorFactoryImpl implements TransactionValidator.Factory {
		/**
	     * {@inheritDoc}
	     */
		public TransactionValidator createReadOnlyValidator() {
			return new ReadOnlyValidatorImpl();
		}

		/**
	     * {@inheritDoc}
	     */
		public TransactionValidator createReadWriteValidator() {
			return new ReadWriteValidatorImpl();
		}
	}
}





import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.transaction.RollbackException;
import org.eclipse.emf.transaction.Transaction;


		}

		// Documentation copied from the inherited specification
		public List<Notification> getNotificationsForValidation(Transaction tx) {
			return Collections.emptyList();
		}

		// Documentation copied from the inherited specification
		public List<Notification> getNotificationsForPrecommit(Transaction tx) {
			return Collections.emptyList();
		}

		// Documentation copied from the inherited specification
		public List<Notification> getNotificationsForPostcommit(Transaction tx) {
			return Collections.emptyList();
		}

		// Documentation copied from the inherited specification

	 * @return the transaction's notifications, or <code>null</code> if the
	 *     transaction has not started yet
	 */
	List<Notification> getNotificationsForValidation(Transaction tx);
	
	/**
	 * Obtains the notifications that I need to broadcast in a pre-commit

	 * @return those of the transaction's notifications that are eligible to
	 *     be broadcast, or <code>null</code> if the transaction has not started
	 */
	List<Notification> getNotificationsForPrecommit(Transaction tx);
	
	/**
	 * Obtains the notifications that I need to broadcast in a post-commit

	 * @return those of the transaction's notifications that are eligible to
	 *     be broadcast, or <code>null</code> if the transaction has not started
	 */
	List<Notification> getNotificationsForPostcommit(Transaction tx);
	
	/**
	 * Disposes me by clearing my state and cleaning up any resources that I

Lines 99-105 Link Here

(-)src/org/eclipse/emf/transaction/impl/InternalTransaction.java (-3 / +3 lines)
99	*	99	*
100	* @see #add(Notification)	100	* @see #add(Notification)
101	*/	101	*/
102	List getNotifications();	102	List<Notification> getNotifications();
103		103
104	/**	104	/**
105	* Pauses me while a child transaction is active, so that I do not collect	105	* Pauses me while a child transaction is active, so that I do not collect
Lines 157-163 Link Here
157	*	157	*
158	* @param runnable the runnable whose thread is to borrow me	158	* @param runnable the runnable whose thread is to borrow me
159	*/	159	*/
160	void startPrivileged(PrivilegedRunnable runnable);	160	void startPrivileged(PrivilegedRunnable<?> runnable);
161		161
162	/**	162	/**
163	* Returns me to my previous owner, upon completion of the specified	163	* Returns me to my previous owner, upon completion of the specified
Lines 165-169 Link Here
165	*	165	*
166	* @param runnable the runnable whose thread had borrowed me	166	* @param runnable the runnable whose thread had borrowed me
167	*/	167	*/
168	void endPrivileged(PrivilegedRunnable runnable);	168	void endPrivileged(PrivilegedRunnable<?> runnable);
169	}	169	}




package org.eclipse.emf.transaction.impl;

import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;


	 * As of the 1.2 release, this map is immutable.
	 * </p>
	 */
	public static final Map<Object, Object> DEFAULT_UNDO_REDO_OPTIONS;
	static {
		Map<Object, Object> map = new java.util.HashMap<Object, Object>();
		map.put(Transaction.OPTION_NO_TRIGGERS, true);
		map.put(Transaction.OPTION_NO_UNDO, true);
		map.put(Transaction.OPTION_NO_VALIDATION, true);
		map.put(Transaction.OPTION_IS_UNDO_REDO_TRANSACTION, true);
		DEFAULT_UNDO_REDO_OPTIONS = Collections.unmodifiableMap(map);
	}
	

	private final TransactionalEditingDomain domain;
	private Thread owner;
	private final boolean readOnly;
	private final Map<Object, Object> options;
	private final Map<Object, Object> mutableOptions;
	
	private InternalTransaction parent;
	private InternalTransaction root;

	private boolean active;
	private boolean closing; // prevents re-entrant commit/rollback
	private boolean rollingBack;
	protected List<Notification> notifications;
	protected final CompositeChangeDescription change;
	
	private boolean aborted;

	 *     if I am read/write
	 * @param options my options, or <code>null</code> for defaults
	 */
	public TransactionImpl(TransactionalEditingDomain domain, boolean readOnly,
			Map<?, ?> options) {
		this.domain = domain;
		this.readOnly = readOnly;
		this.owner = Thread.currentThread();
		
		this.mutableOptions = new java.util.HashMap<Object, Object>();
		this.options = Collections.unmodifiableMap(mutableOptions);
		
		if (options != null) {

		change = new CompositeChangeDescription();
		
		if (collectsNotifications(this)) {
			notifications = new org.eclipse.emf.common.util.BasicEList.FastCompare<Notification>();
		} else {
			// no need to collect any notifications if we won't use them
			notifications = null;

	}

	// Documentation copied from the inherited specification
	public final Map<Object, Object> getOptions() {
		return options;
	}


				//  my changes except for certain special cases where we must
				//  prevent the passing of our changes.
				
				if (hasOption(this, BLOCK_CHANGE_PROPAGATION)
						&& hasOption(parent, ALLOW_CHANGE_PROPAGATION_BLOCKING)) {
					parent.resume(null);
				} else {
					parent.resume(change);

	}
	
	// Documentation copied from the inherited specification
	public List<Notification> getNotifications() {
		return (notifications == null)? Collections.<Notification>emptyList()
			: notifications;
	}
	
	/**

	// Documentation copied from the inherited specification
	public void addTriggers(TriggerCommand triggers) {
		// extract out only the triggered commands (exclude the triggering command)
		List<Command> triggerCommands = triggers.getTriggers();
		Command triggerCommand;
		
		if (triggerCommands.isEmpty()) {

		// bug 165026:  Must copy the list, because it may be read-only like
		//    GMF's NOOP_TRIGGER command
		triggerCommand = new ConditionalRedoCommand.Compound(
				new java.util.ArrayList<Command>(triggerCommands));
		
		if (this.triggers == null) {
			this.triggers = triggerCommand;

	}
	
	// Documentation copied from the inherited specification
	public void startPrivileged(PrivilegedRunnable<?> runnable) {
		if (runnable.getTransaction() != this) {
			throw new IllegalArgumentException(
					"runnable has no privileges on this transaction"); //$NON-NLS-1$

	}

	// Documentation copied from the inherited specification
	public void endPrivileged(PrivilegedRunnable<?> runnable) {
		if (runnable.getTransaction() != this) {
			throw new IllegalArgumentException(
					"runnable has no privileges on this transaction"); //$NON-NLS-1$

        
	    // if we have no parent transaction, then we are a root and we "inherit"
	    // the editing domain's default transaction options
        Map<?, ?> parentOptions = (parent == null) ?
        	getDefaultOptions(getEditingDomain()) : parent.getOptions();
        
        if (parentOptions != null) {
            for (Map.Entry<?, ?> next : parentOptions.entrySet()) {
                Map.Entry next = (Map.Entry) iter.next();
                Object option = next.getKey();
                
                if (ALLOW_CHANGE_PROPAGATION_BLOCKING.equals(option)) {

        }
	}
	
	@Override
	public String toString() {
		return "Transaction[active=" + isActive() //$NON-NLS-1$
			+ ", read-only=" + isReadOnly() //$NON-NLS-1$

	 * 
	 * @since 1.2
	 */
	protected static Map<?, ?> getDefaultOptions(
			TransactionalEditingDomain domain) {
		
        TransactionalEditingDomain.DefaultOptions defaults = TransactionUtil
            .getAdapter(domain, TransactionalEditingDomain.DefaultOptions.class);
        
        return (defaults == null)? Collections.EMPTY_MAP
        	: defaults.getDefaultTransactionOptions();
    }
}




	 *     
	 * @see #getDomain()
	 */
	EMFCommandTransaction createTransaction(Command command, Map<?, ?> options)
	throws InterruptedException;
	
	/**
	 * Executes the specified list of trigger commands.  All of the commands are

	 * @see ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)
	 * @see #createTransaction(Command, Map)
	 */
	void executeTriggers(Command command, List<Command> triggers,
			Map<?, ?> options) throws InterruptedException, RollbackException;
	
	/**
	 * Disposes of my state and any additional resources that I may be




import org.eclipse.emf.transaction.NotificationFilter;
import org.eclipse.emf.transaction.ResourceSetListener;
import org.eclipse.emf.transaction.RollbackException;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalCommandStack;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.Transaction;

/**
 * Internal interface that must be provided by any implementation of the public

	 *     
	 * @see #activate(InternalTransaction)
	 */
	InternalTransaction startTransaction(boolean readOnly, Map<?, ?> options)
	throws InterruptedException;
	
	/**
	 * Obtains the transaction that currently has access to me, and whose

	 *  
	 * @return A map with undo/redo options.
	 */
	Map<Object, Object> getUndoRedoOptions();
	
	/**
	 * Transfers ownership of this editing domain to the specified

	 *  
	 * @param runnable the runnable whose thread is to borrow me
	 */
	void startPrivileged(PrivilegedRunnable<?> runnable);
	
	/**
	 * Returns me to my previous owner, upon completion of the specified

	 * 
	 * @param runnable the runnable whose thread had borrowed me
	 */
	void endPrivileged(PrivilegedRunnable<?> runnable);
}




/**
 * <copyright>
 *
 * Copyright (c) 2006, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	 * @param domain the editing domain in which I am active
	 * @param options my options
	 */
	public TriggerCommandTransaction(TriggerCommand command,
			InternalTransactionalEditingDomain domain, Map<?, ?> options) {
		super(command, domain, options);
	}


	 * Extends the inherited implementation by first clearing my change
	 * description, so that I will not propagate these changes upwards.
	 */
	@Override
	protected synchronized void close() {
		change.clear();
		

	 * Overrides the inherited implementation to simply propagate triggers to
	 * my parent, because it's the transaction that the outside world can see.
	 */
	@Override
	public void addTriggers(TriggerCommand triggers) {
		((InternalTransaction) getParent()).addTriggers(triggers);
	}

Lines 40-46 Link Here

(-)src/org/eclipse/emf/transaction/impl/EMFCommandTransaction.java (-1 / +2 lines)
40	* @param domain the editing domain in which I am active	40	* @param domain the editing domain in which I am active
41	* @param options my options	41	* @param options my options
42	*/	42	*/
43	public EMFCommandTransaction(Command command, InternalTransactionalEditingDomain domain, Map options) {	43	public EMFCommandTransaction(Command command, InternalTransactionalEditingDomain domain,
		44	Map<?, ?> options) {
44	super(domain, false, options);	45	super(domain, false, options);
45		46
46	this.command = command;	47	this.command = command;




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	 * 
	 * @throws IllegalStateException if I have been {@link #dispose() disposed}
	 */
	@Override
	public ChangeDescription endRecording() {
		if (disposed) {
			throw new IllegalStateException("cannot end a disposed recorder"); //$NON-NLS-1$

	 *       outside of the scope of the editing domain and its resource set</li>
	 * </ul>
	 */
	@Override
	public void setTarget(Notifier target) {
		if (!disposed) {
			Iterator<? extends Notifier> contents = (target instanceof EObject) ? isResolveProxies() ? ((EObject) target)
				.eContents().iterator()
				: ((InternalEList<EObject>) ((EObject) target).eContents())
					.basicIterator()
				: target instanceof ResourceSet ? ((ResourceSet) target)
					.getResources().iterator()
					: target instanceof Resource ? ((Resource) target)
						.getContents().iterator()
						: null;

			if (contents != null) {
				while (contents.hasNext()) {
					Notifier notifier = contents.next();
					addAdapter(notifier);
				}
			}

	 * currently recording) and passing it along to the domain's current
	 * transaction (if any).
	 */
	@Override
	public void notifyChanged(Notification notification) {
		if (disposed) {
			// I am disposed, so I should no longer be responding to or even

	 * 
	 * @since 1.1
	 */
	@Override
	public void dispose() {
		if (!disposed) {
			super.dispose();

			if (rset != null) {
				removeAdapter(rset);
				
				for (Iterator<Notifier> iter = EcoreUtil.getAllProperContents(rset, false);
						iter.hasNext();) {
					
					removeAdapter(iter.next());
				}
			}
			




 */
package org.eclipse.emf.transaction.impl;

import java.lang.ref.Reference;
import java.lang.ref.WeakReference;
import java.util.Collection;
import java.util.Iterator;
import java.util.Map;

import org.eclipse.core.runtime.CoreException;


	private static final EditingDomainManager INSTANCE = new EditingDomainManager();
	
	private Collection<IConfigurationElement> universalListeners;
	private final Map<String, Reference<ResourceSetListener>> listeners =
		new java.util.HashMap<String, Reference<ResourceSetListener>>();
	
	/**
	 * Not instantiable by clients.

	 * @param domain the editing domain to which to add the listeners
	 */
	public void configureListeners(String id, TransactionalEditingDomain domain) {
		Collection<IConfigurationElement> configs = getListenerConfigs(id);
		
		for (IConfigurationElement next : configs) {
			ResourceSetListener listener = getListener(next, true);
					(IConfigurationElement) iter.next(),
					true);
			
			if (listener != null) {
				domain.addResourceSetListener(listener);

	 * @param domain the editing domain from which to remove the listeners
	 */
	public void deconfigureListeners(String id, TransactionalEditingDomain domain) {
		Collection<IConfigurationElement> configs = getListenerConfigs(id);
		
		for (IConfigurationElement next : configs) {
			ResourceSetListener listener = getListener(next, false);
					(IConfigurationElement) iter.next(),
					false);
			
			if (listener != null) {
				domain.removeResourceSetListener(listener);

	 * @param id the domain ID to retrieve
	 * @return the configuration elements for listeners registered to this ID
	 */
	private Collection<IConfigurationElement> getListenerConfigs(String id) {
		Collection<IConfigurationElement> result =
			new java.util.ArrayList<IConfigurationElement>();
		
		IConfigurationElement[] configs = Platform.getExtensionRegistry().getConfigurationElementsFor(
				EMFTransactionPlugin.getPluginId(),
				EXT_POINT_LISTENERS);
		
		for (IConfigurationElement element : configs) {
			if (E_LISTENER.equals(element.getName())) {
				IConfigurationElement[] domains = element.getChildren(E_DOMAIN);
				
				for (IConfigurationElement element2 : domains) {
					if (id.equals(element2.getAttribute(A_ID))) {
						result.add(element);
						break;
					}
				}

	 * 
	 * @return the configuration elements for universal listeners
	 */
	private Collection<IConfigurationElement> getUniversalListenerConfigs() {
		if (universalListeners == null) {
			universalListeners = new java.util.ArrayList<IConfigurationElement>();
			
			IConfigurationElement[] configs = Platform.getExtensionRegistry().getConfigurationElementsFor(
					EMFTransactionPlugin.getPluginId(),
					EXT_POINT_LISTENERS);
			
			for (IConfigurationElement element : configs) {
				if (E_LISTENER.equals(element.getName())) {
					IConfigurationElement[] domains = element.getChildren(E_DOMAIN);
					
					if (domains.length == 0) {
						universalListeners.add(element);
					}
				}
			}

	private ResourceSetListener getListener(IConfigurationElement config, boolean create) {
		ResourceSetListener result = null;
		
		Reference<ResourceSetListener> ref = listeners.get(config.getAttribute(A_CLASS));
		if (ref != null) {
			result = ref.get();
		}
		
		if ((result == null) && create) {

				
				if (listener instanceof ResourceSetListener) {
					result = (ResourceSetListener) listener;
					ref = new WeakReference<ResourceSetListener>(result);
					listeners.put(result.getClass().getName(), ref);
				} else {
					EMFTransactionPlugin.getPlugin().log(




	private NotificationTree transactionToPrecommit = null;
	
	// maps the active transaction and its ancestors to notification tree nodes
	private final Map<InternalTransaction, NotificationTree> txToNode =
		new java.util.HashMap<InternalTransaction, NotificationTree>();
	
	/**
	 * Initializes me.

	}
	
	// Documentation copied from the inherited method specification
	public synchronized List<Notification> getNotificationsForValidation(Transaction tx) {
		List<Notification> result = null;
		
		if (tree != null) {
			NotificationTree nested = findTree(tx);

	}
	
	// Documentation copied from the inherited method specification
	public synchronized List<Notification> getNotificationsForPrecommit(Transaction tx) {
		List<Notification> result = null;
		
		if ((transactionToPrecommit != null)
				&& (transactionToPrecommit == findTree(tx))) {

	}
	
	// Documentation copied from the inherited method specification
	public synchronized List<Notification> getNotificationsForPostcommit(Transaction tx) {
		List<Notification> result = null;
		
		if (tree != null) {
			NotificationTree nested = findTree(tx);

		NotificationTree result = null;
		
		if (tree != null) {
			result = txToNode.get(tx);
		}
		
		return result;

		IStatus result;
		
		try {
			IValidator<Notification> validator = createValidator();
			
			result = validator.validate(getNotificationsForValidation(tx));
		} catch (Exception e) {

     *
	 * @return the validator
	 */
	protected IValidator<Notification> createValidator() {
		return ModelValidationService.getInstance().newValidator(EvaluationMode.LIVE);
	}
	

	 * @author Christian W. Damus (cdamus)
	 */
	private static class NotificationTree {
		private final List<NotificationTree> children =
			new org.eclipse.emf.common.util.BasicEList.FastCompare<NotificationTree>();
		
		// number of notifications in parent before start of child transaction
		private int parentNotificationCount;
		
		private InternalTransaction transaction;
		private List<Notification> notifications;  // stores the notifications
		
		private final byte notificationMask;
		

		 * 
		 * @return my children
		 */
		List<NotificationTree> getChildren() {
			return children;
		}
		

		 * @see ReadWriteValidatorImpl#PRECOMMIT
		 * @see ReadWriteValidatorImpl#POSTCOMMIT
		 */
		List<Notification> collectNotifications(byte purpose) {
			List<Notification> result;
			
			if ((notificationMask & purpose) == purpose) {
				result = new java.util.ArrayList<Notification>();
				collectNotifications(result, purpose);
			} else {
				result = Collections.emptyList();
			}
			
			return result;

		 * 
		 * @see #collectNotifications()
		 */
		private void collectNotifications(List<? super Notification> notifications, byte purpose) {
			if ((notificationMask & purpose) == purpose) {
				int lastIndex = 0;
				List<Notification> parentNotifications = getNotifications();
				
				for (NotificationTree next : children) {
					NotificationTree next = (NotificationTree) iter.next();
					
					// append the parent transaction's notifications from the
					//    last position to this child's position
					notifications.addAll(parentNotifications.subList(

		 * change, etc.).
		 */
		void setRolledBack() {
			Iterator<NotificationTree> children = getChildren().iterator();
			boolean inPlace = transaction == null;
			
            ListIterator<Notification> iter;
			if (inPlace) {
			    // already committed?  Some ancestor transaction is rolling back
			    iter = notifications.listIterator();
			} else {
			    // transaction has the notifications
			    iter = transaction.getNotifications().listIterator();
	            notifications = new org.eclipse.emf.common.util.BasicEList.FastCompare<Notification>();
			}
			
			// filter out all undoable notifications, leaving only those that

			//    where in the notification ordering the child transactions fit
			//    so that we retain correct linear ordering overall
			for (int i = 0; children.hasNext();) {
				NotificationTree child = children.next();
				int parentNotificationCount = child.parentNotificationCount;
				
				if (inPlace) {
	                for (; (i < parentNotificationCount) && iter.hasNext(); i++) {
					    if (isUndoableObjectChange(iter.next())) {
	                    
					    if (isUndoableObjectChange(next)) {
					        iter.remove();
					    }
	                }

	                child.parentNotificationCount = iter.nextIndex();
				} else {
                    for (; (i < parentNotificationCount) && iter.hasNext(); i++) {
                        Notification next = iter.next();
                        
    					if (!isUndoableObjectChange(next)) {
    						notifications.add(next);

			// filter the remaining notifications
			if (inPlace) {
    			while (iter.hasNext()) {
    				if (isUndoableObjectChange(iter.next())) {
    				
    				if (isUndoableObjectChange(next)) {
    					iter.remove();
    				}
    			}
			} else {
                while (iter.hasNext()) {
                    Notification next = iter.next();
                    
                    if (!isUndoableObjectChange(next)) {
                        notifications.add(next);

		 * 
		 * @return my notifications
		 */
		List<Notification> getNotifications() {
			return (notifications != null)? notifications :
				transaction.getNotifications();
		}




package org.eclipse.emf.transaction.impl;

import java.util.Collection;
import java.util.Iterator;
import java.util.Map;

import org.eclipse.emf.common.notify.Notification;

public final class ResourceSetManager {
	private static final ResourceSetManager INSTANCE = new ResourceSetManager();
	
	private final Map<Resource, Boolean> loadingResources = new java.util.WeakHashMap<Resource, Boolean>();
	private final Map<Resource, Boolean> loadedResources = new java.util.WeakHashMap<Resource, Boolean>();
	private final Map<Resource, Boolean> unloadingResources = new java.util.WeakHashMap<Resource, Boolean>();
	
	/**
	 * Not instantiable by clients.

	 * @param rset a resource set
	 */
	public synchronized void observe(ResourceSet rset) {
		for (Resource next : rset.getResources()) {
			observe(next);
		}
	}
	

				break;
			case Notification.ADD_MANY:
				if (newValue != null) {
					@SuppressWarnings("unchecked")
					Collection<Resource> resources = (Collection<Resource>) newValue;
					for (Resource next : resources) {
						// observe the new resource
						observe(next);
					}
				}
				break;

				break;
			case Notification.REMOVE_MANY:
				if (oldValue != null) {
					@SuppressWarnings("unchecked")
					Collection<Resource> resources = (Collection<Resource>) oldValue;
					for (Resource next : resources) {
						// the old resource is effectively unloaded as far as we are
						//    concerned because it is no longer in this resource set
						setUnloaded(next);
					}
				}
				break;

	 * @param res a loaded resource
	 */
	private void setLoaded(Resource res) {
		loadedResources.put(res, true);
		loadingResources.remove(res);
		unloadingResources.remove(res);
	}

	 * @param res a loading resource
	 */
	private void setLoading(Resource res) {
		loadingResources.put(res, true);
		loadedResources.remove(res);
		unloadingResources.remove(res);
	}

	 * @param res an unloading resource
	 */
	private void setUnloading(Resource res) {
		unloadingResources.put(res, true);
		loadedResources.remove(res);
		loadingResources.remove(res);
	}

Lines 30-40 Link Here

(-)src/org/eclipse/emf/transaction/RunnableWithResult.java (-6 / +8 lines)
30	* or failure of the transaction.	30	* or failure of the transaction.
31	* </p>	31	* </p>
32	*	32	*
		33	* @param <T> the result type of the runnable
		34	*
33	* @author Christian W. Damus (cdamus)	35	* @author Christian W. Damus (cdamus)
34	*	36	*
35	* @see TransactionalEditingDomain#runExclusive(Runnable)	37	* @see TransactionalEditingDomain#runExclusive(Runnable)
36	*/	38	*/
37	public interface RunnableWithResult	39	public interface RunnableWithResult<T>
38	extends Runnable {	40	extends Runnable {
39		41
40	/**	42	/**
Lines 42-48 Link Here
42	*	44	*
43	* @return my result, or <code>null</code> if none	45	* @return my result, or <code>null</code> if none
44	*/	46	*/
45	Object getResult();	47	T getResult();
46		48
47	/**	49	/**
48	* Sets the commit status after completion of the {@link Runnable#run()} method.	50	* Sets the commit status after completion of the {@link Runnable#run()} method.
Lines 69-76 Link Here
69	*	71	*
70	* @author Christian W. Damus (cdamus)	72	* @author Christian W. Damus (cdamus)
71	*/	73	*/
72	static abstract class Impl implements RunnableWithResult {	74	static abstract class Impl<T> implements RunnableWithResult<T> {
73	private Object result;	75	private T result;
74	private IStatus status;	76	private IStatus status;
75		77
76	/**	78	/**
Lines 78-84 Link Here
78	*	80	*
79	* @param result my result	81	* @param result my result
80	*/	82	*/
81	protected final void setResult(Object result) {	83	protected final void setResult(T result) {
82	this.result = result;	84	this.result = result;
83	}	85	}
84		86
Lines 88-94 Link Here
88	}	90	}
89		91
90	// Documentation copied from interface	92	// Documentation copied from interface
91	public final Object getResult() {	93	public final T getResult() {
92	return result;	94	return result;
93	}	95	}
94		96




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

public abstract class NotificationFilter {
	/** As its name implies, this filter matches any notification. */
	public static final NotificationFilter ANY = new NotificationFilter() {
		@Override
		public boolean matches(Notification notification) {
			return true;
		}};

	 * @see Notification#isTouch()
	 */
	public static final NotificationFilter NOT_TOUCH = new NotificationFilter() {
		@Override
		public boolean matches(Notification notification) {
			return !notification.isTouch();
		}};

	 * A filter matching "resource loaded" events.
	 */
	public static final NotificationFilter RESOURCE_LOADED = new NotificationFilter() {
		@Override
		public boolean matches(Notification notification) {
			return (notification.getNotifier() instanceof Resource)
					&& (notification.getFeatureID(Resource.class)

	 * A filter matching "resource unloaded" events.
	 */
	public static final NotificationFilter RESOURCE_UNLOADED = new NotificationFilter() {
		@Override
		public boolean matches(Notification notification) {
			return (notification.getNotifier() instanceof Resource)
					&& (notification.getFeatureID(Resource.class)

	 */
	public static NotificationFilter createNotifierFilter(final Object notifier) {
		return new NotificationFilter() {
			@Override
			public boolean matches(Notification notification) {
				return notification.getNotifier() == notifier;
			}};

	 */
	public static NotificationFilter createEventTypeFilter(final int eventType) {
		return new NotificationFilter() {
			@Override
			public boolean matches(Notification notification) {
				return notification.getEventType() == eventType;
			}};

	 */
	public static NotificationFilter createFeatureFilter(final EStructuralFeature feature) {
		return new NotificationFilter() {
			@Override
			public boolean matches(Notification notification) {
				return notification.getFeature() == feature;
			}};

	 * 
	 * @return the filter
	 */
	public static NotificationFilter createFeatureFilter(
			final Class<?> ownerType, final int featureId) {
		return new NotificationFilter() {
			@Override
			public boolean matches(Notification notification) {
				return ownerType.isInstance(notification.getNotifier())
						&& (notification.getFeatureID(ownerType) == featureId);

	 */
	public static NotificationFilter createFeatureFilter(final EClassifier ownerType, final int featureId) {
		return new NotificationFilter() {
			@Override
			public boolean matches(Notification notification) {
				return ownerType.isInstance(notification.getNotifier())
						&& (notification.getFeatureID(ownerType.getInstanceClass()) == featureId);

	 * 
	 * @return the filter
	 */
	public static NotificationFilter createNotifierTypeFilter(final Class<?> type) {
		return new NotificationFilter() {
			@Override
			public boolean matches(Notification notification) {
				return type.isInstance(notification.getNotifier());
			}};

	 */
	public static NotificationFilter createNotifierTypeFilter(final EClassifier type) {
		return new NotificationFilter() {
			@Override
			public boolean matches(Notification notification) {
				return type.isInstance(notification.getNotifier());
			}};

	 */
	public final NotificationFilter and(final NotificationFilter other) {
		return new NotificationFilter() {
			@Override
			public boolean matches(Notification notification) {
				return NotificationFilter.this.matches(notification)
						&& other.matches(notification);

	 */
	public final NotificationFilter or(final NotificationFilter other) {
		return new NotificationFilter() {
			@Override
			public boolean matches(Notification notification) {
				return NotificationFilter.this.matches(notification)
						|| other.matches(notification);

	 */
	public final NotificationFilter negated() {
		return new NotificationFilter() {
			@Override
			public boolean matches(Notification notification) {
				return !NotificationFilter.this.matches(notification);
			}};




 */
package org.eclipse.emf.transaction;

import java.util.Iterator;

import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.transaction.util.ConditionalRedoCommand;

	 * @return a composite of the commands returned by the subclass
	 *     implementation of the {@link #trigger} method
	 */
	@Override
	public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
		Command result = null;
		
		for (Notification next : event.getNotifications()) {
			Notification next = (Notification) iter.next();
			
			Command trigger = trigger(event.getEditingDomain(), next);
			if (trigger != null) {
				if (result == null) {

	/**
	 * I want only ppre-commit events, not post-commit events.
	 */
	@Override
	public boolean isPrecommitOnly() {
		return true;
	}

Lines 51-57 Link Here

(-)src/org/eclipse/emf/transaction/TransactionalCommandStack.java (-1 / +1 lines)
51	* @throws RollbackException if the changes performed by the command are	51	* @throws RollbackException if the changes performed by the command are
52	* rolled back by validation of the transaction	52	* rolled back by validation of the transaction
53	*/	53	*/
54	void execute(Command command, Map options) throws InterruptedException, RollbackException;	54	void execute(Command command, Map<?, ?> options) throws InterruptedException, RollbackException;
55		55
56	/**	56	/**
57	* Sets an exception handler. This object will be notified when exceptions	57	* Sets an exception handler. This object will be notified when exceptions




	 * Subclasses should override this if they have more preparation to do.
	 * By default, the result is just <code>true</code>.
	 */
	@Override
	protected boolean prepare() {
		return true;
	}

	 * I can be undone if I successfully recorded the changes that I executed.
	 * Subclasses would not normally need to override this method.
	 */
	@Override
	public boolean canUndo() {
		return canApplyChange();
	}

	 * Undoes the changes that I recorded.
	 * Subclasses would not normally need to override this method.
	 */
	@Override
	public final void undo() {
		if (change != null) {
			change.applyAndReverse();

	protected abstract void doExecute();
	
	// Documentation copied from the inherited specification
	@Override
	public Command chain(Command command) {
	    return new ConditionalRedoCommand.Compound().chain(this).chain(command);
	}

     * Extends the inherited implementation by disposing my change description,
     * if any.
     */
    @Override
	public void dispose() {
        super.dispose();
        
        if (change != null) {

Lines 45-50 Link Here

(-)src/org/eclipse/emf/transaction/ReadFilter.java (+1 lines)
45	}	45	}
46		46
47	// Documentation inherited from the method specification	47	// Documentation inherited from the method specification
		48	@Override
48	public boolean matches(Notification notification) {	49	public boolean matches(Notification notification) {
49	switch (notification.getEventType()) {	50	switch (notification.getEventType()) {
50	case Notification.RESOLVE:	51	case Notification.RESOLVE:




 */
package org.eclipse.emf.transaction;

import java.util.Iterator;

import org.eclipse.emf.common.notify.Notification;

/**

	 * 
	 * @see #handleNotification(TransactionalEditingDomain, Notification)
	 */
	@Override
	public void resourceSetChanged(ResourceSetChangeEvent event) {
		for (Notification next : event.getNotifications()) {
			Notification next = (Notification) iter.next();
			
			handleNotification(event.getEditingDomain(), next);
		}
	}

	/**
	 * I want only post-commit events, not pre-commit events.
	 */
	@Override
	public boolean isPostcommitOnly() {
		return true;
	}






/**
 * Specification of a transaction in a {@link TransactionalEditingDomain}.  All
 * reading and writing of data in a <code>TransactionalEditingDomain</code> is
 * performed in the context of a transaction.
 * <p>
 * This interface is not intended to be implemented by clients.  It is used
 * internally and by frameworks extending this API.  It is mostly of use to

	 * 
	 * @return an unmodifiable view of my options
	 */
	Map<?, ?> getOptions();

	/**
	 * Queries whether I am active.  I am active after I have started and

Lines 24-29 Link Here

(-)src/org/eclipse/emf/transaction/TransactionalEditingDomain.java (-5 / +22 lines)
24	import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;	24	import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
25	import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;	25	import org.eclipse.emf.transaction.impl.TransactionalEditingDomainImpl;
26	import org.eclipse.emf.transaction.util.Adaptable;	26	import org.eclipse.emf.transaction.util.Adaptable;
		27	import org.eclipse.emf.transaction.util.TransactionUtil;
27		28
28	/**	29	/**
29	* An extension of the {@link EditingDomain} API that applies transactional	30	* An extension of the {@link EditingDomain} API that applies transactional
Lines 149-154 Link Here
149	* safe to call this method on the Eclipse UI thread because special	150	* safe to call this method on the Eclipse UI thread because special
150	* precaution is taken to ensure that liveness is maintained (using	151	* precaution is taken to ensure that liveness is maintained (using
151	* mechanisms built into the Job Manager).	152	* mechanisms built into the Job Manager).
		153	* </p><p>
		154	* <b>Note</b>: Since the 1.2 release, the
		155	* {@link TransactionUtil#runExclusive(TransactionalEditingDomain, RunnableWithResult)}
		156	* utility provides type-safe execution of runnables returning results and
		157	* should be preferred over this API.
152	* </p>	158	* </p>
153	*	159	*
154	* @param read a read-only operation to execute	160	* @param read a read-only operation to execute
Lines 159-165 Link Here
159	*	165	*
160	* @throws InterruptedException if the current thread is interrupted while	166	* @throws InterruptedException if the current thread is interrupted while
161	* waiting for access to the resource set	167	* waiting for access to the resource set
162	*	168	*
		169	* @see TransactionUtil#runExclusive(RunnableWithResult)
163	* @see Transaction#commit()	170	* @see Transaction#commit()
164	*/	171	*/
165	Object runExclusive(Runnable read) throws InterruptedException;	172	Object runExclusive(Runnable read) throws InterruptedException;
Lines 221-228 Link Here
221	* active transaction remains active. Any attempt to execute the runnable	228	* active transaction remains active. Any attempt to execute the runnable
222	* after this transaction has committed or while a nested transaction is	229	* after this transaction has committed or while a nested transaction is
223	* active will result in an {@link IllegalStateException}.	230	* active will result in an {@link IllegalStateException}.
		231	* </p><p>
		232	* <b>Note</b>: Since the 1.2 release, the
		233	* {@link TransactionUtil#createPrivilegedRunnable(TransactionalEditingDomain, RunnableWithResult)}
		234	* utility provides type-safe privileged access for runnables returning
		235	* results and should be preferred over this API.
224	* </p>	236	* </p>
225	*	237	*
		238	* @param <T> the result type of the {@link RunnableWithResult} if such
		239	* is the <tt>read</tt> argument
		240	*
226	* @param runnable a runnable to execute in the context of the active	241	* @param runnable a runnable to execute in the context of the active
227	* transaction, on any thread	242	* transaction, on any thread
228	*	243	*
Lines 235-242 Link Here
235	* prevents "theft" of transactions by malicious code. Note also	250	* prevents "theft" of transactions by malicious code. Note also
236	* that this implies an exception if there is no active transaction at	251	* that this implies an exception if there is no active transaction at
237	* the time of this call	252	* the time of this call
		253	*
		254	* @see TransactionUtil#createPrivilegedRunnable(TransactionalEditingDomain, RunnableWithResult)
238	*/	255	*/
239	RunnableWithResult createPrivilegedRunnable(Runnable runnable);	256	RunnableWithResult<?> createPrivilegedRunnable(Runnable runnable);
240		257
241	/**	258	/**
242	* Disposes of this editing domain and any resources that it has allocated.	259	* Disposes of this editing domain and any resources that it has allocated.
Lines 392-400 Link Here
392	* Obtains a read-only view of the editing domain's default transaction	409	* Obtains a read-only view of the editing domain's default transaction
393	* options.	410	* options.
394	*	411	*
395	* @return my read-only transaction options	412	* @return my read-only map of transaction options
396	*/	413	*/
397	Map getDefaultTransactionOptions();	414	Map<?, ?> getDefaultTransactionOptions();
398		415
399	/**	416	/**
400	* Sets the default transaction options. It is probably best to do this	417	* Sets the default transaction options. It is probably best to do this
Lines 404-409 Link Here
404	*	421	*
405	* @param options the new options. The options are copied from the map	422	* @param options the new options. The options are copied from the map
406	*/	423	*/
407	void setDefaultTransactionOptions(Map options);	424	void setDefaultTransactionOptions(Map<?, ?> options);
408	}	425	}
409	}	426	}




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

	private static final long serialVersionUID = -6265603064286194469L;
	
	private final Transaction transaction;
	private final List<Notification> notifications;
	
	/**
	 * Initializes me with my source editing domain.

	 * @param notifications a list of events (as {@link Notification}s), in the
	 *     order in which they occurred
	 */
	public ResourceSetChangeEvent(TransactionalEditingDomain source,
			Transaction transaction, List<Notification> notifications) {
		super(source);
		
		this.transaction = transaction;

	 * 
	 * @see Notification
	 */
	public List<Notification> getNotifications() {
		return notifications;
	}
}




	}
	
	// Documentation inherited from the method specification
	@Override
	public boolean matches(Notification notification) {
		boolean result = false;
		IContentType[] actualTypes = getContentTypes(notification);

				return contentTypes;
			}
			
			@Override
			public boolean isAdapterForType(Object type) {
				return type == Cache.class;
			}
			
			@Override
			public void notifyChanged(Notification msg) {
				if (!msg.isTouch()) {
					// clear the cache




/**
 * <copyright>
 *
 * Copyright (c) 2006, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 */
package org.eclipse.emf.transaction.util;

import java.util.Iterator;
import java.util.List;

import org.eclipse.emf.common.command.Command;

			super();
		}

		public Compound(int resultIndex, List<Command> commandList) {
			super(resultIndex, commandList);
		}

		public Compound(int resultIndex, String label, List<Command> commandList) {
			super(resultIndex, label, commandList);
		}

		public Compound(int resultIndex, String label, String description,
				List<Command> commandList) {
			super(resultIndex, label, description, commandList);
		}


			super(resultIndex);
		}

		public Compound(List<Command> commandList) {
			super(commandList);
		}

		public Compound(String label, List<Command> commandList) {
			super(label, commandList);
		}

		public Compound(String label, String description, List<Command> commandList) {
			super(label, description, commandList);
		}


		 *     <code>true</code>, otherwise
		 */
		public boolean canRedo() {
			for (Object next : commandList) {
				Object next = iter.next();

				if ((next instanceof ConditionalRedoCommand)
						&& !((ConditionalRedoCommand) next).canRedo()) {
					return false;

		/**
		 * I am self-chaining.
		 */
		@Override
		public Command chain(Command c) {
			append(c);
			return this;




 */
public class TriggerCommand extends ConditionalRedoCommand.Compound {
	private final Command triggeringCommand;
	private final List<Command> triggers;
	
	/**
	 * Initializes me with a list of commands triggered not by the execution of

	 * 
	 * @param triggers the trigger commands that I encapsulate
	 */
	public TriggerCommand(List<? extends Command> triggers) {
		super(0, "Triggers", "Triggered Changes", //$NON-NLS-1$ //$NON-NLS-2$
		    new java.util.ArrayList<Command>(triggers));
		
		this.triggeringCommand = null;
		this.triggers = commandList;
	}
	
	/**

	 * @param triggeringCommand the command that triggered further commands
	 * @param triggers the trigger commands that I encapsulate
	 */
	public TriggerCommand(Command triggeringCommand, List<? extends Command> triggers) {
		super(0, triggeringCommand.getLabel(), triggeringCommand.getDescription(),
		    new java.util.ArrayList<Command>(triggers));
		
		this.triggeringCommand = triggeringCommand;
		this.triggers = commandList;
	}
	
	/**

	 * 
	 * @return my triggers, as a list of {@link Command}s.  Will not be empty
	 */
	public final List<Command> getTriggers() {
		return triggers;
	}
	
	// Documentation copied from the inherited specification
	@Override
	protected boolean prepare() {
		// we will check canExecute() as we go
		return !triggers.isEmpty();

	 * Executes all of my trigger commands, then prepends the original triggering
	 * command (if any) so that it will be undone/redone with the others.
	 */
	@Override
	public void execute() {
		// execute just the triggers
	    for (ListIterator<Command> iter = commandList.listIterator(); iter.hasNext();) {
			try {
				Command command = iter.next();
				
				if (command.canExecute()) {
					command.execute();

					// Iterate back over the executed commands to undo them.
					//
					while (iter.hasPrevious()) {
						Command command = iter.previous();
						if (command.canUndo()) {
							command.undo();
						} else {

			// then replace the command-list with a new list that includes
			// the
			// originally executed command (for undo/redo)
			commandList = new java.util.ArrayList<Command>(triggers.size() + 1);
			commandList.add(triggeringCommand);
			commandList.addAll(triggers);
		}

     * Extends the inherited implementation by disposing my triggering command,
     * also (if any).
     */
    @Override
	public void dispose() {
        super.dispose();
        
        if (triggeringCommand != null) {

Lines 83-88 Link Here

(-)src/org/eclipse/emf/transaction/util/CommandChangeDescription.java (+2 lines)
83	* I apply my change by undoing the encapsulated operation. After it is	83	* I apply my change by undoing the encapsulated operation. After it is
84	* undone, I dispose myself.	84	* undone, I dispose myself.
85	*/	85	*/
		86	@Override
86	public void apply() {	87	public void apply() {
87	try {	88	try {
88	command.undo();	89	command.undo();
Lines 95-100 Link Here
95	* I apply-and-reverse by alternately undoing and redoing the encapsulated	96	* I apply-and-reverse by alternately undoing and redoing the encapsulated
96	* operation.	97	* operation.
97	*/	98	*/
		99	@Override
98	public void applyAndReverse() {	100	public void applyAndReverse() {
99	if (isRedone) {	101	if (isRedone) {
100	command.undo();	102	command.undo();




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id: Queue.java,v 1.2 2006/01/13 21:50:43 cdamus Exp $
 */
package org.eclipse.emf.transaction.util;

import org.eclipse.emf.transaction.internal.Tracing;


/**
 * Simplistic implementation of a FIFO wait queue for fair notification of
 * threads that are waiting for a lock.
 *
 * @author Christian W. Damus (cdamus)
 */
final class Queue {
	private Wait head;
	private Wait tail;
	private int size;
	private int exclusiveCount;  // number of threads waiting for exclusive access
	
	/**
	 * Initializes me.
	 */
	public Queue() {
		super();
	}
	
	/**
	 * Queries whether the queue is empty of threads.
	 * 
	 * @return <code>true</code> if I have no threads; <code>false</code>, otherwise
	 */
	public synchronized boolean isEmpty() {
		return size == 0;
	}
	
	/**
	 * Queries the number of waiting threads.
	 * 
	 * @return my size
	 */
	public synchronized int size() {
		return size;
	}
	
	/**
	 * Queries the number of threads waiting for exclusive access.
	 * 
	 * @return my count of exclusive threads
	 */
	public synchronized int exclusiveCount() {
		return exclusiveCount;
	}
	
	/**
	 * Adds the current thread to the queue, blocking until either:
	 * <ul>
	 *    <li>the thread is awakened again by being dequeued</li>
	 *    <li>the thread times out (if a time-out is specified)</li>
	 *    <li>the thread is interrupted while it is waiting</li>
	 * </ul>
	 * 
	 * @param timeout the time-out interval, in millis, or <code>0L</code>
	 *     if no time-out is desired (i.e., wait as long as necessary)
	 * @param exclusive <code>true</code> if the current thread needs exclusive
	 *     access (i.e., no other threads may currently be
	 *     {@link #yield() yielding}); <code>false</code>, otherwise
	 *     
	 * @return the new wait node
	 *    
	 * @throws InterruptedException if the thread was interrupted while
	 *    waiting for notification.  If it is interrupted after it has been
	 *    notified but before it awakes, no exception is thrown
	 */
	public synchronized Wait put(long timeout, boolean exclusive) throws InterruptedException {
		final Thread current = Thread.currentThread();
		Wait result;
		
		// first, see whether we can find an existing node that timed out, but
		//    that we have not yet dequeued.  If found, just re-use it to
		//    to preserve seniority.  This allows threads to loop with short
		//    time-outs for the sake of liveness (e.g., to check for cancellation
		//    of progress monitors)
		result = findNode(current);
		
		if (result == null) {
			// must enqueue a new node
			result = new Wait(current);
		
			if (tail == null) {
				tail = result;
				head = tail;
			} else {
				tail.next = result;
				tail = result;
			}			
			
			size++;
			
			if (exclusive) {
				exclusiveCount++;
			}
		} else {
			// must keep the count of exclusive waits in sync
			if (exclusive != result.isExclusive()) {
				exclusiveCount += exclusive? 1 : -1;
			}
		}
		
		result.initialize(exclusive);
		
		return result;
	}
	
	/**
	 * Dequeues the next eligible (not timed-out or interrupted)
	 * thread.  If any threads are currently yielding, then we look for the
	 * the next eligible non-exclusive thread.
	 * 
	 * @param allowExclusive whether to allow dequeueing of threads waiting
	 *     for exclusive access
	 * 
	 * @return the next eligible thread, or <code>null</code> if
	 *     no threads were waiting or they all timed out
	 */
	public synchronized Wait take(boolean allowExclusive) {
		Wait result = null;
		
		Wait prev = null;
		for (Wait node = head; (result == null) && (node != null); node = node.next) {
			if (allowExclusive || !node.isExclusive()) {
				// this is a candidate.  Remove it from the list
				if (prev != null) {
					prev.next = node.next;
				} else {
					head = node.next;
				}
				
				if (head == null) {
					tail = null;
				} else if (node == tail) {
					tail = prev;
				}
				
				// help the garbage collector
				node.next = null;
				
				size--;
				
				if (node.isExclusive()) {
					exclusiveCount--;
				}
				
				result = node;
			} else {
				prev = node;
			}
		}
		
		return result;
	}
	
	/**
	 * Finds an existing node for the specified <code>thread</code>, to be
	 * re-used for another wait following a time-out.  This ensures the
	 * preservation of ordering for threads that time-out periodically but
	 * with the intention of waiting again each time.
	 * 
	 * @param thread a thread to look for in the queue
	 * 
	 * @return the thread's node, or <code>null</code> if it is not found
	 */
	private Wait findNode(Thread thread) {
		Wait result = null;
		
		for (Wait next = head; next != null; next = next.next) {
			if (next.thread == thread) {
				result = next;
				break;
			}
		}
		
		return result;
	}
	
	@Override
	public String toString() {
		StringBuffer result = new StringBuffer();
		boolean first = true;
		
		result.append("Queue["); //$NON-NLS-1$
		for (Wait next = head; head != null; next = next.next) {
			if (first) {
				first = false;
			} else {
				result.append(", "); //$NON-NLS-1$
			}
			
			result.append(next);
		}
		
		result.append(']');
		
		return result.toString();
	}
	
	/**
	 * Implementation of a linked node in the wait queue. 
	 *
	 * @author Christian W. Damus (cdamus)
	 */
	static class Wait {
		Wait next;
		private final Thread thread;
		private boolean exclusive;
		private boolean notified;
		private boolean timedOut;
		
		/**
		 * Initializes me with the thread that is waiting on me.
		 * 
		 * @param thread my thread
		 */
		Wait(Thread thread) {
			this.thread = thread;
		}
		
		/**
		 * Queries whether my thread was successfully notified.
		 * 
		 * @return whether my thread was notified
		 */
		boolean wasNotified() {
			return notified && !timedOut;
		}
		
		/**
		 * Queries whether I require exclusive scheduling.
		 * 
		 * @return whether I am exclusive
		 */
		boolean isExclusive() {
			return exclusive;
		}
		
		/**
		 * Initializes my state.
		 * 
		 * @param excl <code>true</code> if I should not be dequeue while
		 *    there are any yielders; <code>false</code>, otherwise
		 */
		void initialize(boolean excl) {
			this.exclusive = excl;
			timedOut = false;
			notified = false;
		}
		
		/**
		 * Retrieves that thread that is/was waiting on me.
		 * 
		 * @return my thread
		 */
		Thread getThread() {
			return thread;
		}
		
		/**
		 * Attempts to wake my thread.  Wake-up can be attempted once only
		 * upon dequeueing the thread.  It will succeed only if the thread
		 * did not already time-out or interrupt.
		 * 
		 * @return <code>true</code> if my thread was awakened;
		 *    <code>false</code> if it had already been awakened or timed out,
		 *    or if it had been interrupted
		 */
		synchronized boolean wakeUp() {
			boolean result = false;
			
			if (!(notified || timedOut)) {
				notified = true;
				result = true;
				notify();  // wake me up!
			}
			
			return result;
		}
		
		/**
		 * Waits for the specified time-out.
		 * 
		 * @param timeout the time-out, in millis, or <code>0L</code> to wait
		 *    indefinitely
		 *    
		 * @throws InterruptedException if the waiting thread was interrupted
		 */
		synchronized void waitFor(long timeout) throws InterruptedException {
			// first, check whether perhaps another thread has already awakened
			//   me *after* I was put on the queue but *before* calling this
			//   method (as there is an unsynchronized gap in the
			//   Lock.acquire() method)
			if (notified) {
				return;
			}
			
			long waitTime = timeout;
			long start = System.currentTimeMillis();
			
			try {
				for (;;) {
					wait(waitTime);
					
					if (notified) {
						break;
					}
					
					if (timeout > 0L) {
						waitTime = timeout - (System.currentTimeMillis() - start);
						
						if (waitTime <= 0L) {
							// giving up waiting
							timedOut = true;
							break;
						}
					}
				}
			} catch (InterruptedException e) {
				Tracing.catching(Wait.class, "waitFor", e); //$NON-NLS-1$
				if (!notified) {
					// thread was interrupted while it was waiting.
					//   Pretend like we timed out (just in case), but
					//   propagate the exception
					timedOut = true;
					Tracing.throwing(Wait.class, "waitFor", e); //$NON-NLS-1$
					throw e;
				} else {
					// the thread was interrupted after notification, but
					//    before it woke up from the wait().  Must propagate
					//    the interrupt status but not fail this operation
					Thread.currentThread().interrupt();
				}
			}
		}
		
		@Override
		public String toString() {
			return thread.getName() + "[" + notified + ", " + timedOut + ']'; //$NON-NLS-1$ //$NON-NLS-2$
		}
	}
}




import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.OperationCanceledException;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.Status;
import org.eclipse.core.runtime.jobs.IJobManager;
import org.eclipse.core.runtime.jobs.ILock;

 * @author Christian W. Damus (cdamus)
 */
public class Lock {
	private static final IJobManager jobmgr = Job.getJobManager();
	
	private static long nextId = 0;
	

	
	// threads currently yielding read access
	// must use identity map because threads can override equals()
	private final Map<Thread, Lock> yielders =
		new java.util.IdentityHashMap<Thread, Lock>();
	
	// every thread has its own ILock that it acquires while it owns the
	//    transaction lock, to ensure that the thread is registered as a
	//    "lock owner" in the lock table.  This ensures that Display.syncExec()
	//    calls from these threads will use the work queue to communicate
	//    runnables to a waiting UI thread
	private final ThreadLocal<ILock> threadLock = new ThreadLocal<ILock>() {
		@Override
		protected ILock initialValue() {
			return Job.getJobManager().newLock();
		}};
		
	/**

			} else if (current == owner) {
				// current thread no longer needs the dummy lock
				getThreadLock().release();
			} // else non-owner is transferring.  Shouldn't happen
			
		owner = thread;
	}

	 * @return the current thread's thread lock
	 */
	private ILock getThreadLock() {
		return threadLock.get();
	}
	
	@Override
	public String toString() {
		Thread lastKnownOwner = owner;
		

        private final Thread thread;
        private final boolean exclusive;

        private final ILock ilock = jobmgr.newLock();
        private IStatus acquireStatus;
        
        private boolean aborted;

        /**
         * @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
         */
        @Override
		protected IStatus run(IProgressMonitor monitor) {
            try {
                ilock.acquire();
                

Lines 35-43 Link Here

(-)src/org/eclipse/emf/transaction/util/Adaptable.java (-1 / +3 lines)
35	/**	35	/**
36	* Obtains an instance of the specified adapter type.	36	* Obtains an instance of the specified adapter type.
37	*	37	*
		38	* @param <T> the interface for which to get an adapter
		39	*
38	* @param adapterType the required interface	40	* @param adapterType the required interface
39	* @return an instance of the required interface that adapts me, or	41	* @return an instance of the required interface that adapts me, or
40	* <code>null</code> if I do not supply this interface	42	* <code>null</code> if I do not supply this interface
41	*/	43	*/
42	Object getAdapter(Class adapterType);	44	<T> T getAdapter(Class<? extends T> adapterType);
43	}	45	}

Lines 25-31 Link Here

(-)src/org/eclipse/emf/transaction/util/CompositeChangeDescription.java (-26 / +43 lines)
25	import org.eclipse.emf.common.util.BasicEMap;	25	import org.eclipse.emf.common.util.BasicEMap;
26	import org.eclipse.emf.common.util.EList;	26	import org.eclipse.emf.common.util.EList;
27	import org.eclipse.emf.common.util.EMap;	27	import org.eclipse.emf.common.util.EMap;
		28	import org.eclipse.emf.ecore.EObject;
28	import org.eclipse.emf.ecore.change.ChangeDescription;	29	import org.eclipse.emf.ecore.change.ChangeDescription;
		30	import org.eclipse.emf.ecore.change.FeatureChange;
		31	import org.eclipse.emf.ecore.change.ResourceChange;
29	import org.eclipse.emf.ecore.change.impl.ChangeDescriptionImpl;	32	import org.eclipse.emf.ecore.change.impl.ChangeDescriptionImpl;
30	import org.eclipse.emf.transaction.TransactionChangeDescription;	33	import org.eclipse.emf.transaction.TransactionChangeDescription;
31		34
Lines 43-49 Link Here
43	extends ChangeDescriptionImpl	46	extends ChangeDescriptionImpl
44	implements TransactionChangeDescription {	47	implements TransactionChangeDescription {
45		48
46	private final List changes = new java.util.ArrayList();	49	private final List<ChangeDescription> changes =
		50	new java.util.ArrayList<ChangeDescription>();
47		51
48	/**	52	/**
49	* Queries whether I have no composed change descriptions.	53	* Queries whether I have no composed change descriptions.
Lines 66-73 Link Here
66	* Disposes my children, recursively.	70	* Disposes my children, recursively.
67	*/	71	*/
68	void dispose() {	72	void dispose() {
69	for (Iterator iter = changes.iterator(); iter.hasNext();) {	73	for (ChangeDescription next : changes) {
70	TransactionUtil.dispose((ChangeDescription) iter.next());	74	TransactionUtil.dispose(next);
71	}	75	}
72	}	76	}
73		77
Lines 77-83 Link Here
77	public boolean canApply() {	81	public boolean canApply() {
78	boolean result = true;	82	boolean result = true;
79		83
80	for (Iterator iter = changes.iterator(); result && iter.hasNext();) {	84	for (Iterator<ChangeDescription> iter = changes.iterator();
		85	result && iter.hasNext();) {
		86
81	Object next = iter.next();	87	Object next = iter.next();
82		88
83	if (next instanceof TransactionChangeDescription) {	89	if (next instanceof TransactionChangeDescription) {
Lines 89-108 Link Here
89	}	95	}
90		96
91	// Documentation copied from the inherited method	97	// Documentation copied from the inherited method
		98	@Override
92	public void apply() {	99	public void apply() {
93	// must apply changes in the reverse order that they were added	100	// must apply changes in the reverse order that they were added
94	for (ListIterator iter = changes.listIterator(changes.size()); iter.hasPrevious();) {	101	for (ListIterator<ChangeDescription> iter = changes.listIterator(changes.size());
95	((ChangeDescription) iter.previous()).apply();	102	iter.hasPrevious();) {
		103
		104	iter.previous().apply();
96	}	105	}
97		106
98	changes.clear();	107	changes.clear();
99	}	108	}
100		109
101	// Documentation copied from the inherited method	110	// Documentation copied from the inherited method
		111	@Override
102	public void applyAndReverse() {	112	public void applyAndReverse() {
103	// must apply changes in the reverse order that they were added	113	// must apply changes in the reverse order that they were added
104	for (ListIterator iter = changes.listIterator(changes.size()); iter.hasPrevious();) {	114	for (ListIterator<ChangeDescription> iter = changes.listIterator(changes.size());
105	((ChangeDescription) iter.previous()).applyAndReverse();	115	iter.hasPrevious();) {
		116
		117	iter.previous().applyAndReverse();
106	}	118	}
107		119
108	// invert the order of the changes for next apply-and-reverse	120	// invert the order of the changes for next apply-and-reverse
Lines 120-127 Link Here
120	if (change instanceof CompositeChangeDescription) {	132	if (change instanceof CompositeChangeDescription) {
121	CompositeChangeDescription other = ((CompositeChangeDescription) change);	133	CompositeChangeDescription other = ((CompositeChangeDescription) change);
122		134
123	for (Iterator iter = other.changes.iterator(); iter.hasNext();) {	135	for (ChangeDescription next : other.changes) {
124	add((ChangeDescription) iter.next());	136	add(next);
125	}	137	}
126	} else {	138	} else {
127	changes.add(change);	139	changes.add(change);
Lines 177-188 Link Here
177	* My object changes are the concatenation of the changes in my composed	189	* My object changes are the concatenation of the changes in my composed
178	* descriptions.	190	* descriptions.
179	*/	191	*/
180	public EMap getObjectChanges() {	192	@Override
		193	public EMap<EObject, EList<FeatureChange>> getObjectChanges() {
181	if (objectChanges == null) {	194	if (objectChanges == null) {
182	objectChanges = new BasicEMap();	195	objectChanges = new BasicEMap<EObject, EList<FeatureChange>>();
183		196
184	for (Iterator iter = changes.iterator(); iter.hasNext();) {	197	for (ChangeDescription next : changes) {
185	objectChanges.addAll(((ChangeDescription) iter.next()).getObjectChanges());	198	objectChanges.addAll(next.getObjectChanges());
186	}	199	}
187	}	200	}
188		201
Lines 193-204 Link Here
193	* My objects to attach are the concatenation of the changes in my composed	206	* My objects to attach are the concatenation of the changes in my composed
194	* descriptions.	207	* descriptions.
195	*/	208	*/
196	public EList getObjectsToDetach() {	209	@Override
		210	public EList<EObject> getObjectsToDetach() {
197	if (objectsToDetach == null) {	211	if (objectsToDetach == null) {
198	objectsToDetach = new BasicEList();	212	objectsToDetach = new BasicEList<EObject>();
199		213
200	for (Iterator iter = changes.iterator(); iter.hasNext();) {	214	for (ChangeDescription next : changes) {
201	objectsToDetach.addAll(((ChangeDescription) iter.next()).getObjectsToDetach());	215	objectsToDetach.addAll(next.getObjectsToDetach());
202	}	216	}
203	}	217	}
204		218
Lines 209-220 Link Here
209	* My objects to detach are the concatenation of the changes in my composed	223	* My objects to detach are the concatenation of the changes in my composed
210	* descriptions.	224	* descriptions.
211	*/	225	*/
212	public EList getObjectsToAttach() {	226	@Override
		227	public EList<EObject> getObjectsToAttach() {
213	if (objectsToAttach == null) {	228	if (objectsToAttach == null) {
214	objectsToAttach = new BasicEList();	229	objectsToAttach = new BasicEList<EObject>();
215		230
216	for (Iterator iter = changes.iterator(); iter.hasNext();) {	231	for (ChangeDescription next : changes) {
217	objectsToAttach.addAll(((ChangeDescription) iter.next()).getObjectsToAttach());	232	objectsToAttach.addAll(next.getObjectsToAttach());
218	}	233	}
219	}	234	}
220		235
Lines 225-242 Link Here
225	* My resource changes are the concatenation of the changes in my composed	240	* My resource changes are the concatenation of the changes in my composed
226	* descriptions.	241	* descriptions.
227	*/	242	*/
228	public EList getResourceChanges() {	243	@Override
		244	public EList<ResourceChange> getResourceChanges() {
229	if (resourceChanges == null) {	245	if (resourceChanges == null) {
230	resourceChanges = new BasicEList();	246	resourceChanges = new BasicEList<ResourceChange>();
231		247
232	for (Iterator iter = changes.iterator(); iter.hasNext();) {	248	for (ChangeDescription next : changes) {
233	resourceChanges.addAll(((ChangeDescription) iter.next()).getResourceChanges());	249	resourceChanges.addAll(next.getResourceChanges());
234	}	250	}
235	}	251	}
236		252
237	return resourceChanges;	253	return resourceChanges;
238	}	254	}
239		255
		256	@Override
240	public String toString() {	257	public String toString() {
241	StringBuffer result = new StringBuffer("CompositeChangeDescription["); //$NON-NLS-1$	258	StringBuffer result = new StringBuffer("CompositeChangeDescription["); //$NON-NLS-1$
242	result.append(getObjectChanges().size()).append(", "); //$NON-NLS-1$	259	result.append(getObjectChanges().size()).append(", "); //$NON-NLS-1$




import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.emf.edit.domain.EditingDomain;
import org.eclipse.emf.edit.domain.IEditingDomainProvider;
import org.eclipse.emf.transaction.RunnableWithResult;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;

	 * @param notifier the notifier to disconnect
	 */
	private static void disconnectFromEditingDomain0(Notifier notifier) {
		Set<TransactionChangeRecorder> recorders = getExistingChangeRecorders(notifier);
		
		if (!recorders.isEmpty()) {
			// this resource is managed by a transactional editing domain

				throw new IllegalArgumentException("resource is still in the domain's resource set"); //$NON-NLS-1$
			}
			
			Iterator<?> iter = EcoreUtil.getAllProperContents(Collections.singleton(
					notifier), false);
			while (iter.hasNext()) {
				((Notifier) iter.next()).eAdapters().removeAll(recorders);

	 * @return the currently attached change recorders, which may be an empty
	 *    set if none
	 */
	private static Set<TransactionChangeRecorder> getExistingChangeRecorders(
			Notifier notifier) {
		
		Set<TransactionChangeRecorder> result = null;
		
		Object[] adapters = notifier.eAdapters().toArray();
		for (Object element : adapters) {
			if (element instanceof TransactionChangeRecorder) {
				TransactionChangeRecorder next = (TransactionChangeRecorder) element;
				
				if (next.getEditingDomain() != null) {
					if (result == null) {
						result = new java.util.HashSet<TransactionChangeRecorder>();
					}
					
					result.add(next);

			}
		}
		
		return (result == null)? Collections.<TransactionChangeRecorder>emptySet()
			: result;
	}
    
    /**

        } else if (change instanceof CommandChangeDescription) {
            ((CommandChangeDescription) change).dispose();
        } else {
            for (Iterator<EObject> iter = change.eAllContents(); iter.hasNext();) {
                iter.next().eAdapters().clear();
            }
        }
    }

    /**
     * Obtains an instance of the specified adapter type for an editing domain.
     * 
     * @param <T> the adapter interface that is required
     * 
     * @param domain an editing domain to adapt
     * @param adapterType the required interface
     * 
     * @return an instance of the required interface that adapts the
     *    <tt>domain</tt>, or <code>null</code> if it does not supply this interface
     * 
     * @since 1.2
     */
    public static <T> T getAdapter(TransactionalEditingDomain domain,
    		Class<? extends T> adapterType) {
        T result;
        
        if (domain instanceof Adaptable) {
            result = ((Adaptable) domain).getAdapter(adapterType);

        
        return result;
    }
    
    /**
     * Utility method for executing exclusive runnables that
     * {@linkplain RunnableWithResult return values}.  The advantage of this
     * method over {@link TransactionalEditingDomain#runExclusive(Runnable)} is
     * that it provides compile-time type safety.
     * 
     * @param <T> the result type of the runnable
     * 
     * @param domain the editing domain in which to run
     * @param runnable the runnable to execute
     * 
     * @return the result of the runnable
     * 
     * @throws InterruptedException if the current thread is interrupted while
	 *    waiting for access to the resource set
     * 
     * @since 1.2
     */
    @SuppressWarnings("unchecked")
	public static <T> T runExclusive(TransactionalEditingDomain domain,
    		RunnableWithResult<? extends T> runnable) throws InterruptedException {
    	
    	return (T) domain.runExclusive(runnable);
    }
    
    /**
     * Utility method for providing privileged access to runnables that
     * {@linkplain RunnableWithResult return values}.  The advantage of this
     * method over {@link TransactionalEditingDomain#createPrivilegedRunnable(Runnable)} is
     * that it provides compile-time type safety.
     * 
     * @param <T> the result type of the runnable
     * 
     * @param domain the editing domain in which to grant privileged access
     * @param runnable the runnable to execute
     * 
     * @return the result of the runnable
     * 
     * @throws InterruptedException if the current thread is interrupted while
	 *    waiting for access to the resource set
     * 
     * @since 1.2
     */
    @SuppressWarnings("unchecked")
	public static <T> RunnableWithResult<T> createPrivilegedRunnable(
			TransactionalEditingDomain domain,
    		RunnableWithResult<? extends T> runnable) throws InterruptedException {
    	
    	return (RunnableWithResult<T>) domain.createPrivilegedRunnable(runnable);
    }
}




     * @since 1.2
     */
    class Default implements ValidateEditSupport {
        private final Set<Resource> resourcesToValidate = new java.util.HashSet<Resource>();
        
        /**
         * Initializes me.

         * 
         * @return the resources to validate-edit
         */
        protected final Set<Resource> getResourcesToValidate() {
            return resourcesToValidate;
        }
        

         * @return the result of the validate-edit attempt
         */
        protected IStatus doValidateEdit(Transaction transaction,
                Collection<? extends Resource> resources, Object context) {
            IStatus result = Status.OK_STATUS;

            EditingDomain domain = transaction.getEditingDomain();

            for (Iterator<? extends Resource> iter = resources.iterator(); result.isOK()
                    && iter.hasNext();) {
                
                Resource next = iter.next();

                if (domain.isReadOnly(next)) {
                    result = new Status(IStatus.ERROR, EMFTransactionPlugin

            if (!resourcesToValidate.isEmpty()) {
                // protect against concurrent modifications: setting modified
                //   state to false will trigger removal from the collection
                Resource[] resources = resourcesToValidate.toArray(
                	new Resource[resourcesToValidate.size()]);
                
                for (Resource element : resources) {
                    // note that this is exempt from the transaction protocol
                    element.setModified(false);
                    
                    // setting modified to false should have removed them 
                    // already, but just in case ...




	}

	// implements the inherited method
	@Override
	public ResourceLocator getPluginResourceLocator() {
		return plugin;
	}

		/**
		 * This method is called upon plug-in activation
		 */
		@Override
		public void start(BundleContext context) throws Exception {
			super.start(context);
		}

		/**
		 * This method is called when the plug-in is stopped
		 */
		@Override
		public void stop(BundleContext context) throws Exception {
			super.stop(context);
			EMFTransactionPlugin.plugin = null;




	/**
	 * The cached debug options (for optimization).
	 */
	private static final Map<String, Boolean> cachedOptions =
		new HashMap<String, Boolean>();

	/**
	 * Retrieves a Boolean value indicating whether tracing is enabled.

			Boolean value = null;
			
			synchronized (cachedOptions) {
				value = cachedOptions.get(option);
	
				if (null == value) {
					value =
						Boolean.valueOf(
								org.eclipse.core.runtime.Platform.getDebugOption(option));
								org.eclipse.core.runtime.Platform.getDebugOption(option)));
	
					cachedOptions.put(option, value);
				}

	 */
	public static void changing(
        String option,
        Class<?> clazz,
        String methodName,
        String valueDescription,
        Object oldValue,

	 * 
	 */
	public static void catching(
		Class<?> clazz,
		String methodName,
		Throwable throwable) {


	 * 
	 */
	public static void throwing(
		Class<?> clazz,
		String methodName,
		Throwable throwable) {


	}

	/**
	 * Traces the entering into the specified method of the specified class.
	 * 
	 * @param clazz The class whose method is being entered.
	 * @param methodName The name of method that is being entered.
	 * 
	 */
	public static void entering(
		Class clazz,
		String methodName) {

		if (shouldTrace(EMFTransactionDebugOptions.METHODS_ENTERING)) {

			trace(
				PREFIX_ENTERING
					+ clazz.getName()
					+ SEPARATOR_METHOD
					+ methodName);
		}
	}

	/**
	 * Traces the entering into the specified method of the specified class,
	 * with the specified parameter.
	 * 
	 * @param clazz The class whose method is being entered.
	 * @param methodName The name of method that is being entered.
	 * @param parameter The parameter to the method being entered.
	 * 
	 */
	public static void entering(
		Class clazz,
		String methodName,
		Object parameter) {

		if (shouldTrace(EMFTransactionDebugOptions.METHODS_ENTERING)) {

			trace(
				PREFIX_ENTERING
					+ clazz.getName()
					+ SEPARATOR_METHOD
					+ methodName
					+ PARENTHESIS_OPEN
					+ getArgumentString(parameter)
					+ PARENTHESIS_CLOSE);
		}
	}

	/**
	 * Traces the entering into the specified method of the specified class,
	 * with the specified parameters.
	 * 

	 * 
	 */
	public static void entering(
		Class<?> clazz,
		String methodName,
		Object... parameters) {

		if (shouldTrace(EMFTransactionDebugOptions.METHODS_ENTERING)) {


	 * 
	 */
	public static void exiting(
		Class<?> clazz,
		String methodName) {

		if (shouldTrace(EMFTransactionDebugOptions.METHODS_EXITING)) {

	 * 
	 */
	public static void exiting(
		Class<?> clazz,
		String methodName,
		Object returnValue) {





Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
 org.eclipse.emf.edit;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
 org.eclipse.emf.ecore.change;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
 org.eclipse.emf.validation;bundle-version="[1.2.0,2.0.0)";visibility:=reexport
Eclipse-LazyStart: true
Export-Package: org.eclipse.emf.transaction,
 org.eclipse.emf.transaction.impl,
 org.eclipse.emf.transaction.internal;x-friends:="org.eclipse.emf.transaction.tests",
 org.eclipse.emf.transaction.internal.l10n;x-friends:="org.eclipse.emf.transaction.tests",
 org.eclipse.emf.transaction.util
Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 1-7 Link Here

(-).classpath (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="src" path="src"/>	3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>	4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6	<classpathentry kind="output" path="bin"/>	6	<classpathentry kind="output" path="bin"/>
7	</classpath>	7	</classpath>

Lines 24-28 Link Here

(-)build.properties (-2 / +2 lines)
24	plugin.properties,\	24	plugin.properties,\
25	.options	25	.options
26	src.includes = about.html	26	src.includes = about.html
27	javacSource = 1.4	27	javacSource = 1.5
28	javacTarget = 1.4	28	javacTarget = 1.5

Lines 1-8 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-5 / +5 lines)
1	#Wed Dec 20 11:57:53 EST 2006	1	#Sun Nov 11 09:25:14 EST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5	org.eclipse.jdt.core.compiler.compliance=1.4	5	org.eclipse.jdt.core.compiler.compliance=1.5
6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error	6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8	org.eclipse.jdt.core.compiler.source=1.4	8	org.eclipse.jdt.core.compiler.source=1.5




import org.eclipse.swt.widgets.Event;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.operations.OperationHistoryActionHandler;
import org.eclipse.ui.operations.UndoActionHandler;

/**

 * @author Christian W. Damus (cdamus)
 */
public class UndoActionWrapper extends UndoAction {
	private final ActionWrapperHelper<UndoActionHandler> delegate;
	
	/**
	 * Initializes me.
	 */
	public UndoActionWrapper() {
		delegate = new ActionWrapperHelper<UndoActionHandler>(
				new ActionWrapperHelper.OwnerAccess<UndoActionHandler>() {
		
			public void firePropertyChange(String property, Object oldValue,
					Object newValue) {
				firePropertyChange0(property, oldValue, newValue);
			}
		
			public UndoActionHandler createDelegate(
					IWorkbenchPartSite site, IUndoContext context) {
				return new UndoActionHandler(site, context);
			}});

	 * Extends the superclass implementation to update the operation history
	 * undo action handler to which I delegate.
	 */
	@Override
	public void setActiveWorkbenchPart(IWorkbenchPart workbenchPart) {
		super.setActiveWorkbenchPart(workbenchPart);
		delegate.setActiveWorkbenchPart(workbenchPart);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void update() {
		if (delegate != null) {
			delegate.update();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public String getDescription() {
		if (delegate != null) {
			return delegate.getDescription();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public String getText() {
		if (delegate != null) {
			return delegate.getText();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public String getToolTipText() {
		if (delegate != null) {
			return delegate.getToolTipText();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public boolean isEnabled() {
		if (delegate != null) {
			return delegate.isEnabled();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public boolean isHandled() {
		if (delegate != null) {
			return delegate.isHandled();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void run() {
		if (delegate != null) {
			delegate.run();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void runWithEvent(Event event) {
		if (delegate != null) {
			delegate.runWithEvent(event);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setChecked(boolean checked) {
		if (delegate != null) {
			delegate.setChecked(checked);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setDescription(String text) {
		if (delegate != null) {
			delegate.setDescription(text);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setEnabled(boolean enabled) {
		if (delegate != null) {
			delegate.setEnabled(enabled);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setText(String text) {
		if (delegate != null) {
			delegate.setText(text);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setToolTipText(String toolTipText) {
		if (delegate != null) {
			delegate.setToolTipText(toolTipText);




import org.eclipse.swt.widgets.Event;
import org.eclipse.ui.IWorkbenchPart;
import org.eclipse.ui.IWorkbenchPartSite;
import org.eclipse.ui.operations.OperationHistoryActionHandler;
import org.eclipse.ui.operations.RedoActionHandler;

/**

 * @author Christian W. Damus (cdamus)
 */
public class RedoActionWrapper extends RedoAction {
	private final ActionWrapperHelper<RedoActionHandler> delegate;
	
	/**
	 * Initializes me.
	 */
	public RedoActionWrapper() {
		delegate = new ActionWrapperHelper<RedoActionHandler>(
			new ActionWrapperHelper.OwnerAccess<RedoActionHandler>() {
			
			public void firePropertyChange(String property, Object oldValue,
					Object newValue) {
				firePropertyChange0(property, oldValue, newValue);
			}
		
			public RedoActionHandler createDelegate(
					IWorkbenchPartSite site, IUndoContext context) {
				return new RedoActionHandler(site, context);
			}});

	 * Extends the superclass implementation to update the operation history
	 * redo action handler to which I delegate.
	 */
	@Override
	public void setActiveWorkbenchPart(IWorkbenchPart workbenchPart) {
		super.setActiveWorkbenchPart(workbenchPart);
		delegate.setActiveWorkbenchPart(workbenchPart);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void update() {
		if (delegate != null) {
			delegate.update();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public String getDescription() {
		if (delegate != null) {
			return delegate.getDescription();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public String getText() {
		if (delegate != null) {
			return delegate.getText();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public String getToolTipText() {
		if (delegate != null) {
			return delegate.getToolTipText();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public boolean isEnabled() {
		if (delegate != null) {
			return delegate.isEnabled();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public boolean isHandled() {
		if (delegate != null) {
			return delegate.isHandled();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void run() {
		if (delegate != null) {
			delegate.run();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void runWithEvent(Event event) {
		if (delegate != null) {
			delegate.runWithEvent(event);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setChecked(boolean checked) {
		if (delegate != null) {
			delegate.setChecked(checked);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setDescription(String text) {
		if (delegate != null) {
			delegate.setDescription(text);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setEnabled(boolean enabled) {
		if (delegate != null) {
			delegate.setEnabled(enabled);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setText(String text) {
		if (delegate != null) {
			delegate.setText(text);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setToolTipText(String toolTipText) {
		if (delegate != null) {
			delegate.setToolTipText(toolTipText);




/**
 * <copyright>
 *
 * Copyright (c) 2006, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 * that they cannot inherit because they must separately extend the EMF
 * action classes.  i.e., this is an instance of the "prefer composition over
 * inheritance" idiom.
 * 
 * @param <T> the operation-history action handler type that I support
 * 
 * @author Christian W. Damus (cdamus)
 */
class ActionWrapperHelper<T extends OperationHistoryActionHandler> extends Action {
	private final OwnerAccess<T> ownerAccess;
	
	private T delegate;
	
	private final Map<IWorkbenchPartSite, T> siteToActionHandler =
		new java.util.HashMap<IWorkbenchPartSite, T>();
	private IPartListener partListener;
	
	private final IPropertyChangeListener listener = new IPropertyChangeListener() {

					event.getProperty(), event.getOldValue(), event.getNewValue());
		}};

	ActionWrapperHelper(OwnerAccess<T> ownerAccess) {
		this.ownerAccess = ownerAccess;
	}
		

		}
	}
	
	private T getActionHandler(IWorkbenchPartSite site, IUndoContext context) {
		T result = siteToActionHandler.get(site);
			(OperationHistoryActionHandler) siteToActionHandler.get(site);
		
		if (result == null) {
			result = ownerAccess.createDelegate(site, context);

			partListener = new IPartListener() {
			
				public void partClosed(IWorkbenchPart part) {
					T handler = siteToActionHandler.get(part.getSite());
						(OperationHistoryActionHandler) siteToActionHandler.get(
								part.getSite());
					
					if (handler != null) {
						siteToActionHandler.remove(part.getSite());

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public String getDescription() {
		if (delegate != null) {
			return delegate.getDescription();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public String getText() {
		if (delegate != null) {
			return delegate.getText();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public String getToolTipText() {
		if (delegate != null) {
			return delegate.getToolTipText();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public boolean isEnabled() {
		if (delegate != null) {
			return delegate.isEnabled();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public boolean isHandled() {
		if (delegate != null) {
			return delegate.isHandled();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void run() {
		if (delegate != null) {
			delegate.run();

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void runWithEvent(Event event) {
		if (delegate != null) {
			delegate.runWithEvent(event);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setChecked(boolean checked) {
		if (delegate != null) {
			delegate.setChecked(checked);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setDescription(String text) {
		if (delegate != null) {
			delegate.setDescription(text);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setEnabled(boolean enabled) {
		if (delegate != null) {
			delegate.setEnabled(enabled);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setText(String text) {
		if (delegate != null) {
			delegate.setText(text);

	/**
	 * Delegates to the operation framework action handler.
	 */
	@Override
	public void setToolTipText(String toolTipText) {
		if (delegate != null) {
			delegate.setToolTipText(toolTipText);

	 *
	 * @author Christian W. Damus (cdamus)
	 */
	static interface OwnerAccess<T extends Action> {
		/**
		 * Fires a property change event on behalf of the owner action wrapper.
		 * 

		 * 
		 * @return the new action handler
		 */
		T createDelegate(IWorkbenchPartSite site, IUndoContext context);
	}
}

Lines 1-7 Link Here

(-).classpath (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="src" path="src"/>	3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>	4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6	<classpathentry kind="output" path="bin"/>	6	<classpathentry kind="output" path="bin"/>
7	</classpath>	7	</classpath>

Lines 17-21 Link Here

(-)build.properties (-2 / +2 lines)
17	plugin.properties,\	17	plugin.properties,\
18	about.html	18	about.html
19	src.includes = about.html	19	src.includes = about.html
20	javacSource = 1.4	20	javacSource = 1.5
21	javacTarget = 1.4	21	javacTarget = 1.5

Lines 1-8 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-5 / +5 lines)
1	#Wed Dec 20 11:55:15 EST 2006	1	#Sun Nov 11 17:04:57 EST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5	org.eclipse.jdt.core.compiler.compliance=1.4	5	org.eclipse.jdt.core.compiler.compliance=1.5
6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error	6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8	org.eclipse.jdt.core.compiler.source=1.4	8	org.eclipse.jdt.core.compiler.source=1.5




Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.emf.workspace.ui
Bundle-Version: 1.2.0.qualifier
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.workspace;bundle-version="[1.2.0,2.0.0)",
 org.eclipse.emf.edit.ui;bundle-version="[2.3.0,3.0.0)"
Eclipse-LazyStart: true
Bundle-Activator: org.eclipse.emf.workspace.ui.internal.EMFWorkbenchUIPlugin$Implementation
Bundle-Vendor: %Plugin.providerName
Export-Package: org.eclipse.emf.workspace.ui.actions,
 org.eclipse.emf.workspace.ui.internal;x-internal:=true
Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 41-46 Link Here

(-)src/org/eclipse/emf/workspace/util/MovedSynchRequest.java (+1 lines)
41	this.newURI = newURI;	41	this.newURI = newURI;
42	}	42	}
43		43
		44	@Override
44	protected void doPerform() {	45	protected void doPerform() {
45	if (!synch.getDelegate().handleResourceMoved(resource, newURI)) {	46	if (!synch.getDelegate().handleResourceMoved(resource, newURI)) {
46	// note that if our delegate is the default, it	47	// note that if our delegate is the default, it

Lines 35-40 Link Here

(-)src/org/eclipse/emf/workspace/util/ChangedSynchRequest.java (+1 lines)
35	super(synch, resource);	35	super(synch, resource);
36	}	36	}
37		37
		38	@Override
38	protected void doPerform() {	39	protected void doPerform() {
39	if (!synch.getDelegate().handleResourceChanged(resource)) {	40	if (!synch.getDelegate().handleResourceChanged(resource)) {
40	// note that if our delegate is the default, it	41	// note that if our delegate is the default, it




		implements TransactionChangeDescription {
	private boolean isRedone = true;
	private IUndoableOperation operation;
	private Reference<IAdaptable> info;

	/**
	 * Initializes me with the undoable operation that I encapsulate and the

	public OperationChangeDescription(IUndoableOperation operation, IAdaptable info) {
		this.operation = operation;
		
		this.info = new WeakReference<IAdaptable>(info);
	}
	
	/**

	 * I apply my change by undoing the encapsulated operation.  After it is
	 * undone, I dispose myself.
	 */
	@Override
	public void apply() {
		try {
			operation.undo(new NullProgressMonitor(), info.get());
		} catch (ExecutionException e) {
			EMFWorkspacePlugin.INSTANCE.log(new Status(
				IStatus.ERROR,

	 * I apply-and-reverse by alternately undoing and redoing the encapsulated
	 * operation.
	 */
	@Override
	public void applyAndReverse() {
		try {
			if (isRedone) {
				operation.undo(new NullProgressMonitor(), info.get());
				isRedone = false;
			} else {
				operation.redo(new NullProgressMonitor(), info.get());
				isRedone = true;
			}
		} catch (ExecutionException e) {

Lines 35-40 Link Here

(-)src/org/eclipse/emf/workspace/util/DeletedSynchRequest.java (+1 lines)
35	super(synch, resource);	35	super(synch, resource);
36	}	36	}
37		37
		38	@Override
38	protected void doPerform() {	39	protected void doPerform() {
39	if (!synch.getDelegate().handleResourceDeleted(resource)) {	40	if (!synch.getDelegate().handleResourceDeleted(resource)) {
40	// note that if our delegate is the default, it	41	// note that if our delegate is the default, it





import java.io.IOException;
import java.util.Collection;
import java.util.Iterator;
import java.util.List;

import org.eclipse.core.resources.IFile;

	private Delegate delegate;
	
	// we employ a copy-on-write strategy on this collection for thread safety
	private static Collection<WorkspaceSynchronizer> synchronizers =
		new java.util.ArrayList<WorkspaceSynchronizer>();
	
	// we use a single listener to serve all synchronizers.
	private static IResourceChangeListener workspaceListener =

	 * @param delta the resource change
	 * @param synchRequests accumulates synch requests for the deltas
	 */
	void processDelta(IResourceDelta delta, List<SynchRequest> synchRequests) {
	    String fullPath = delta.getFullPath().toString();
	    URI uri = URI.createPlatformResourceURI(fullPath, false);
	    ResourceSet rset = getEditingDomain().getResourceSet();

	static void startListening(WorkspaceSynchronizer synchronizer) {
		// copy-on-write for thread safety
		synchronized (synchronizers) {
			Collection<WorkspaceSynchronizer> newList =
				new java.util.ArrayList<WorkspaceSynchronizer>(synchronizers.size() + 1);
			newList.addAll(synchronizers);
			newList.add(synchronizer);
			synchronizers = newList;

	static void stopListening(WorkspaceSynchronizer synchronizer) {
		// copy-on-write for thread safety
		synchronized (synchronizers) {
			Collection<WorkspaceSynchronizer> newList =
				new java.util.ArrayList<WorkspaceSynchronizer>(synchronizers);
			newList.remove(synchronizer);
			synchronizers = newList;
			

	 * 
	 * @return the currently active synchronizers
	 */
	static Collection<WorkspaceSynchronizer> getSynchronizers() {
		// does not need synchronization because we copy on write
		return synchronizers;
	}

			IResourceDelta delta = event.getDelta();
			
			try {
				final List<SynchRequest> synchRequests =
					new java.util.ArrayList<SynchRequest>();
				
				delta.accept(new IResourceDeltaVisitor() {
					public boolean visit(IResourceDelta delta) {

		 * @param delta the delta to process
		 * @param synchRequests accumulates synch requests for the deltas
		 */
		private void processDelta(IResourceDelta delta, List<SynchRequest> synchRequests) {
			for (WorkspaceSynchronizer next : getSynchronizers()) {
				next.processDelta(delta, synchRequests);
						delta, synchRequests);
			}
		}
	}

	 * @author Christian W. Damus (cdamus)
	 */
	private static class ResourceSynchJob extends WorkspaceJob {
		private final List<SynchRequest> synchRequests;
		
		/**
		 * Initializes me with the list of resources changes that I am to

		 * 
		 * @param synchRequests the resource synchronization requests
		 */
		ResourceSynchJob(List<SynchRequest> synchRequests) {
			super(Messages.synchJobName);
			
			this.synchRequests = synchRequests;

		/**
		 * Processes my queued resource synchronization requests.
		 */
		@Override
		public IStatus runInWorkspace(IProgressMonitor monitor) {
			try {
				for (SynchRequest next : synchRequests) {
					next.perform();
				}
			} catch (InterruptedException e) {
				Tracing.catching(ResourceSynchJob.class, "run", e); //$NON-NLS-1$




package org.eclipse.emf.workspace.util;

import java.util.Collection;
import java.util.Iterator;
import java.util.List;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IWorkspace;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.emf.common.util.BasicEList;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalEditingDomain;

public class WorkspaceValidateEditSupport
    extends ValidateEditSupport.Default {

    @Override
	protected IStatus doValidateEdit(Transaction transaction,
            Collection<? extends Resource> resources, Object context) {
        
        IFile[] files = getFiles(resources);
        
        return ResourcesPlugin.getWorkspace().validateEdit(files, context);
    }
    
    protected IFile[] getFiles(Collection<? extends Resource> resources) {
        List<IFile> result = new java.util.ArrayList<IFile>();
        for (Resource next : resources) {
            IFile file = WorkspaceSynchronizer.getFile(next);
            
            if (file != null) {
                result.add(file);
            }
        }
        
        return result.toArray(new IFile[result.size()]);
    }
}




	/**
	 * The cached debug options (for optimization).
	 */
	private static final Map<String, Boolean> cachedOptions =
		new HashMap<String, Boolean>();

	/**
	 * Retrieves a Boolean value indicating whether tracing is enabled.

			Boolean value = null;
			
			synchronized (cachedOptions) {
				value = cachedOptions.get(option);
	
				if (null == value) {
					value =
						Boolean.valueOf(
								org.eclipse.core.runtime.Platform.getDebugOption(option));
								org.eclipse.core.runtime.Platform.getDebugOption(option)));
	
					cachedOptions.put(option, value);
				}

	 */
	public static void changing(
        String option,
        Class<?> clazz,
        String methodName,
        String valueDescription,
        Object oldValue,

	 * 
	 */
	public static void catching(
		Class<?> clazz,
		String methodName,
		Throwable throwable) {


	 * 
	 */
	public static void throwing(
		Class<?> clazz,
		String methodName,
		Throwable throwable) {


	}

	/**
	 * Traces the entering into the specified method of the specified class.
	 * 
	 * @param clazz The class whose method is being entered.
	 * @param methodName The name of method that is being entered.
	 * 
	 */
	public static void entering(
		Class clazz,
		String methodName) {

		if (shouldTrace(EMFWorkspaceDebugOptions.METHODS_ENTERING)) {

			trace(
				PREFIX_ENTERING
					+ clazz.getName()
					+ SEPARATOR_METHOD
					+ methodName);
		}
	}

	/**
	 * Traces the entering into the specified method of the specified class,
	 * with the specified parameter.
	 * 
	 * @param clazz The class whose method is being entered.
	 * @param methodName The name of method that is being entered.
	 * @param parameter The parameter to the method being entered.
	 * 
	 */
	public static void entering(
		Class clazz,
		String methodName,
		Object parameter) {

		if (shouldTrace(EMFWorkspaceDebugOptions.METHODS_ENTERING)) {

			trace(
				PREFIX_ENTERING
					+ clazz.getName()
					+ SEPARATOR_METHOD
					+ methodName
					+ PARENTHESIS_OPEN
					+ getArgumentString(parameter)
					+ PARENTHESIS_CLOSE);
		}
	}

	/**
	 * Traces the entering into the specified method of the specified class,
	 * with the specified parameters.
	 * 

	 * 
	 */
	public static void entering(
		Class<?> clazz,
		String methodName,
		Object... parameters) {

		if (shouldTrace(EMFWorkspaceDebugOptions.METHODS_ENTERING)) {


	 * 
	 */
	public static void exiting(
		Class<?> clazz,
		String methodName) {

		if (shouldTrace(EMFWorkspaceDebugOptions.METHODS_EXITING)) {

	 * 
	 */
	public static void exiting(
		Class<?> clazz,
		String methodName,
		Object returnValue) {





	}

	// implements the inherited method
	@Override
	public ResourceLocator getPluginResourceLocator() {
		return plugin;
	}

		/**
		 * This method is called upon plug-in activation
		 */
		@Override
		public void start(BundleContext context) throws Exception {
			super.start(context);
		}

		/**
		 * This method is called when the plug-in is stopped
		 */
		@Override
		public void stop(BundleContext context) throws Exception {
			super.stop(context);
			EMFWorkspacePlugin.plugin = null;

Lines 1-8 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-5 / +5 lines)
1	#Wed Dec 20 11:52:31 EST 2006	1	#Sun Nov 11 14:27:35 EST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5	org.eclipse.jdt.core.compiler.compliance=1.4	5	org.eclipse.jdt.core.compiler.compliance=1.5
6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error	6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8	org.eclipse.jdt.core.compiler.source=1.4	8	org.eclipse.jdt.core.compiler.source=1.5




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Set;


	 * I am equal to other <code>ResourceUndoContexts</code> on the same
	 * resource as mine.
	 */
	@Override
	public boolean equals(Object o) {
		boolean result = false;
		

	}

	// Redefines the inherited method
	@Override
	public int hashCode() {
		return resource == null ? 0 : resource.hashCode();
	}

	 * @return the resources affected by the specified notifications.
	 *     The resulting set should be treated as unmodifiable
	 */
	public static Set<Resource> getAffectedResources(
			List<? extends Notification> notifications) {
		
		Set<Resource> result;
		
		if (notifications.isEmpty()) {
			result = Collections.emptySet();
		} else {
			result = new java.util.HashSet<Resource>();
			
			for (Notification next : notifications) {
				Notification next = (Notification) iter.next();
				Object notifier = next.getNotifier();
				
				if (notifier instanceof Resource) {
					result.add((Resource) notifier);
				} else if (notifier instanceof EObject) {
					EObject eobj = (EObject) notifier;
                    Resource resource = eobj.eResource();

	 * @return the {@link Resource}s that it affects, or an empty set if none.
	 *     The resulting set should be treated as unmodifiable
	 */
	public static Set<Resource> getAffectedResources(IUndoableOperation operation) {
		Set<Resource> result;
		IUndoContext[] contexts = operation.getContexts();
		
		if (contexts.length == 0) {
			result = Collections.emptySet();
		} else {
			result = new java.util.HashSet<Resource>();
			
			for (int i = 0; i < contexts.length; i++) {
				if (contexts[i] instanceof ResourceUndoContext) {

	 * @param notification a potential cross-resource reference change notification
	 */
	private static void handleCrossResourceReference(
			Set<Resource> resources,
			Notification notification) {
		
		Object oldValue = notification.getOldValue();

                resources.add(resource);
            }
			break;
		case Notification.ADD_MANY: {
		    @SuppressWarnings("unchecked")
		    Collection<EObject> newReferences = (Collection<EObject>) newValue;
			for (EObject next : newReferences) {
                resource = next.eResource();
                
                if (resource != null) {
                    resources.add(resource);
                }
			}
			break;}
		case Notification.REMOVE:
            resource = ((EObject) oldValue).eResource();
            

                resources.add(resource);
            }
			break;
		case Notification.REMOVE_MANY: {
            @SuppressWarnings("unchecked")
            Collection<EObject> oldReferences = (Collection<EObject>) oldValue;
            for (EObject next : oldReferences) {
                resource = next.eResource();
                
                if (resource != null) {
                    resources.add(resource);
                }
			}
			break;}
		}
	}
}

Lines 17-23 Link Here

(-)src/org/eclipse/emf/workspace/EMFCommandOperation.java (-10 / +19 lines)
17	package org.eclipse.emf.workspace;	17	package org.eclipse.emf.workspace;
18		18
19	import java.util.Collection;	19	import java.util.Collection;
20	import java.util.Iterator;
21	import java.util.List;	20	import java.util.List;
22	import java.util.Map;	21	import java.util.Map;
23		22
Lines 83-89 Link Here
83	* @param command my command	82	* @param command my command
84	* @param options transaction options, or <code>null</code> for the defaults	83	* @param options transaction options, or <code>null</code> for the defaults
85	*/	84	*/
86	public EMFCommandOperation(TransactionalEditingDomain domain, Command command, Map options) {	85	public EMFCommandOperation(TransactionalEditingDomain domain, Command command,
		86	Map<?, ?> options) {
		87
87	super(domain, command.getLabel(), options);	88	super(domain, command.getLabel(), options);
88		89
89	this.command = command;	90	this.command = command;
Lines 103-108 Link Here
103	/**	104	/**
104	* I can execute if my command can execute.	105	* I can execute if my command can execute.
105	*/	106	*/
		107	@Override
106	public boolean canExecute() {	108	public boolean canExecute() {
107	return super.canExecute() && command.canExecute();	109	return super.canExecute() && command.canExecute();
108	}	110	}
Lines 110-115 Link Here
110	/**	112	/**
111	* Executes me by executing my command.	113	* Executes me by executing my command.
112	*/	114	*/
		115	@Override
113	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)	116	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
114	throws ExecutionException {	117	throws ExecutionException {
115		118
Lines 118-123 Link Here
118	return Status.OK_STATUS;	121	return Status.OK_STATUS;
119	}	122	}
120		123
		124	@Override
121	protected void didCommit(Transaction transaction) {	125	protected void didCommit(Transaction transaction) {
122	super.didCommit(transaction);	126	super.didCommit(transaction);
123		127
Lines 131-136 Link Here
131	/**	135	/**
132	* I can undo if my command or (if any) trigger command can undo.	136	* I can undo if my command or (if any) trigger command can undo.
133	*/	137	*/
		138	@Override
134	public boolean canUndo() {	139	public boolean canUndo() {
135	return super.canUndo() &&	140	return super.canUndo() &&
136	(command.canUndo() && ((triggerCommand == null) \|\| triggerCommand.canUndo()));	141	(command.canUndo() && ((triggerCommand == null) \|\| triggerCommand.canUndo()));
Lines 139-144 Link Here
139	/**	144	/**
140	* Undoes me by undoing my trigger command (if any) and my command.	145	* Undoes me by undoing my trigger command (if any) and my command.
141	*/	146	*/
		147	@Override
142	protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {	148	protected IStatus doUndo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
143	if (triggerCommand != null) {	149	if (triggerCommand != null) {
144	triggerCommand.undo();	150	triggerCommand.undo();
Lines 153-158 Link Here
153	* I can redo if either my wrapped command is a {@link ConditionalRedoCommand}	159	* I can redo if either my wrapped command is a {@link ConditionalRedoCommand}
154	* that can undo, or it is not a conditionally redoable command.	160	* that can undo, or it is not a conditionally redoable command.
155	*/	161	*/
		162	@Override
156	public boolean canRedo() {	163	public boolean canRedo() {
157	return super.canRedo() &&	164	return super.canRedo() &&
158	(canRedo(command) && ((triggerCommand == null) \|\| canRedo(triggerCommand)));	165	(canRedo(command) && ((triggerCommand == null) \|\| canRedo(triggerCommand)));
Lines 166-171 Link Here
166	/**	173	/**
167	* Redoes me by redoing my command and my trigger command (if any).	174	* Redoes me by redoing my command and my trigger command (if any).
168	*/	175	*/
		176	@Override
169	protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {	177	protected IStatus doRedo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
170	command.redo();	178	command.redo();
171		179
Lines 180-186 Link Here
180	* Extends the inherited implementation to additionally dispose my command	188	* Extends the inherited implementation to additionally dispose my command
181	* and my trigger command (if any).	189	* and my trigger command (if any).
182	*/	190	*/
183	public void dispose() {	191	@Override
		192	public void dispose() {
184	super.dispose();	193	super.dispose();
185		194
186	if (command != null) {	195	if (command != null) {
Lines 197-203 Link Here
197	*	206	*
198	* @see EMFOperationTransaction	207	* @see EMFOperationTransaction
199	*/	208	*/
200	Transaction createTransaction(Map options) throws InterruptedException {	209	@Override
		210	Transaction createTransaction(Map<?, ?> options) throws InterruptedException {
201	InternalTransactionalCommandStack stack =	211	InternalTransactionalCommandStack stack =
202	(InternalTransactionalCommandStack) getEditingDomain().getCommandStack();	212	(InternalTransactionalCommandStack) getEditingDomain().getCommandStack();
203		213
Lines 227-235 Link Here
227		237
228	if (cmd instanceof CompoundCommand) {	238	if (cmd instanceof CompoundCommand) {
229	CompoundCommand compound = (CompoundCommand) cmd;	239	CompoundCommand compound = (CompoundCommand) cmd;
230	List nested = compound.getCommandList();	240	List<Command> nested = compound.getCommandList();
231	if (!nested.isEmpty()) {	241	if (!nested.isEmpty()) {
232	improveLabel((Command) nested.get(0));	242	improveLabel(nested.get(0));
233	return;	243	return;
234	}	244	}
235	} else if (cmd instanceof SetCommand) {	245	} else if (cmd instanceof SetCommand) {
Lines 265-275 Link Here
265	owner, IItemPropertySource.class);	275	owner, IItemPropertySource.class);
266		276
267	if (source != null) {	277	if (source != null) {
268	Collection descriptors = source.getPropertyDescriptors(owner);	278	Collection<IItemPropertyDescriptor> descriptors =
		279	source.getPropertyDescriptors(owner);
269		280
270	for (Iterator iter = descriptors.iterator(); iter.hasNext();) {	281	for (IItemPropertyDescriptor next : descriptors) {
271	IItemPropertyDescriptor next = (IItemPropertyDescriptor) iter.next();
272
273	if (next.getFeature(owner) == feature) {	282	if (next.getFeature(owner) == feature) {
274	setLabel(NLS.bind(pattern, next.getDisplayName(owner)));	283	setLabel(NLS.bind(pattern, next.getDisplayName(owner)));
275	break;	284	break;




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 */
public class CompositeEMFOperation extends AbstractEMFOperation {

	private final List<IUndoableOperation> children;
	private boolean transactionNestingEnabled = true;
	
	/**

	 * @param options for the transaction in which I execute myself, or
	 *     <code>null</code> for the default options
	 */
	public CompositeEMFOperation(TransactionalEditingDomain domain, String label,
			Map<?, ?> options) {
		this(domain, label, null, options);
	}
	

	 * @param label my user-readable label
	 * @param children a list of operations to compose
	 */
	public CompositeEMFOperation(TransactionalEditingDomain domain, String label,
			List<? extends IUndoableOperation> children) {
		this(domain, label, children, null);
	}
	

	 * @param options for the transaction in which I execute myself, or
	 *     <code>null</code> for the default options
	 */
	public CompositeEMFOperation(TransactionalEditingDomain domain, String label,
			List<? extends IUndoableOperation> children, Map<?, ?> options) {
		super(domain, label, options);
		
		if (children != null) {
			this.children = new java.util.ArrayList<IUndoableOperation>(children);
		} else {
			this.children = new java.util.ArrayList<IUndoableOperation>();
		}
	}
	

	 * so that they may be correctly rolled back (in sequence) in the event
	 * of rollback, undo, or redo.
	 */
	@Override
	protected final IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
		
		final List<IStatus> result = new java.util.ArrayList<IStatus>(size());
		
		if (monitor == null) {
			monitor = new NullProgressMonitor();

		monitor.beginTask(getLabel(), size());
		
		try {
			for (ListIterator<IUndoableOperation> iter = listIterator(); iter.hasNext();) {
				if (monitor.isCanceled()) {
					// abort the current transaction so that it will rollback
					//   any changes already committed by child transactions

				}
				
				Transaction childTransaction = null;
				IUndoableOperation next = iter.next();
				IStatus status = null;
				
				if (!(next instanceof AbstractEMFOperation)) {

	private Transaction createNonEMFTransaction(
			IUndoableOperation operation,
			IAdaptable info,
			Map<?, ?> options)
			throws InterruptedException {
		
		InternalTransaction result = new NonEMFTransaction(

		return result;
	}
	
	@Override
	protected void didCommit(Transaction transaction) {
		super.didCommit(transaction);
		

		if (triggers != null) {
			// append a child operation for the triggers
			getChildren().add(new AbstractOperation("") { //$NON-NLS-1$
				@Override
				public boolean canUndo() {
					return triggers.canUndo();
				}

				@Override
				public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
					// this method will never be called
					triggers.execute();
					return Status.OK_STATUS;
				}

				@Override
				public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
					triggers.redo();
					return Status.OK_STATUS;
				}

				@Override
				public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
					triggers.undo();
					return Status.OK_STATUS;

	/**
	 * I can execute if all of my children can execute.
	 */
	@Override
	public boolean canExecute() {
		boolean result = super.canExecute();
		
		if (result) {
			for (Iterator<IUndoableOperation> iter = iterator(); result && iter.hasNext();) {
				result = iter.next().canExecute();
			}
		}
		

	 * I can undo if my transaction successfully completed with changes recorded
	 * and my children can all be undone.
	 */
	@Override
	public boolean canUndo() {
		boolean result = (getChange() != null);
		
		if (result && isTransactionNestingEnabled()) {
			for (Iterator<IUndoableOperation> iter = iterator(); result && iter.hasNext();) {
				result = iter.next().canUndo();
			}
		}
		

	/**
	 * I undo by asking my children to undo, in reverse order.
	 */
	@Override
	protected final IStatus doUndo(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
		

			return super.doUndo(monitor, info);
		}
		
		final List<IStatus> result = new java.util.ArrayList<IStatus>(size());
		
		if (monitor == null) {
			monitor = new NullProgressMonitor();

		ExecutionException caughtException = null;
		monitor.beginTask(getLabel(), size());
		
		for (ListIterator<IUndoableOperation> iter = listIterator(size());
				iter.hasPrevious();) {
			
			IUndoableOperation prev = iter.previous();
			IStatus status = null;
			
			try {

				
				while (iter.hasNext()) {
					// unwind the child operations
					IUndoableOperation next = iter.next();
					if (!next.canRedo()) {
						// oops!  Can't continue unwinding.  Oh, well
						EMFWorkspacePlugin.INSTANCE.log(new Status(

	 * I can redo if my transaction successfully completed with changes recorded
	 * and my children can all be redone.
	 */
	@Override
	public boolean canRedo() {
		boolean result = (getChange() != null);
		
		if (result && isTransactionNestingEnabled()) {
			for (Iterator<IUndoableOperation> iter = iterator(); result && iter.hasNext();) {
				result = iter.next().canRedo();
			}
		}
		

	/**
	 * I undo by asking my children to redo, in forward order.
	 */
	@Override
	protected final IStatus doRedo(IProgressMonitor monitor, IAdaptable info)
			throws ExecutionException {
		

			return super.doRedo(monitor, info);
		}
		
		final List<IStatus> result = new java.util.ArrayList<IStatus>(size());
		
		if (monitor == null) {
			monitor = new NullProgressMonitor();

		ExecutionException caughtException = null;
		monitor.beginTask(getLabel(), size());
		
		for (ListIterator<IUndoableOperation> iter = listIterator(); iter.hasNext();) {
			IUndoableOperation next = iter.next();
			IStatus status = null;
			
			try {

				
				while (iter.hasPrevious()) {
					// unwind the child operations
					IUndoableOperation prev = iter.previous();
					if (!prev.canUndo()) {
						// oops!  Can't continue unwinding.  Oh, well
						EMFWorkspacePlugin.INSTANCE.log(new Status(

	/**
	 * Removes all of my children and disposes them.
	 */
	@Override
	public void dispose() {
		super.dispose();
		
		for (ListIterator<IUndoableOperation> iter = listIterator(size());
				iter.hasPrevious();) {
			
			iter.previous().dispose();
			iter.remove();
		}
	}

	 * @see #iterator()
	 * @see #listIterator(int)
	 */
	protected List<IUndoableOperation> getChildren() {
		return children;
	}
	

	private boolean anyChildHasContext(IUndoContext ctx) {
		boolean result = false;
		
		for (Iterator<IUndoableOperation> iter = iterator(); !result && iter.hasNext();) {
			result = iter.next().hasContext(ctx);
		}
		
		return result;

	 * {@link #setTransactionNestingDisabled(boolean) transaction nesting}
	 * state accordingly.
	 */
	@Override
	void setReuseParentTransaction(boolean reuseParentTransaction) {
		super.setReuseParentTransaction(reuseParentTransaction);
		

	 * 
	 * @return an iterator of my children
	 */
	public Iterator<IUndoableOperation> iterator() {
		return new ChildIterator();
	}
	

	 * 
	 * @return an iterator of my children
	 */
	public ListIterator<IUndoableOperation> listIterator() {
		return new ChildListIterator(0);
	}
	

	 * 
	 * @return an iterator of my children
	 */
	public ListIterator<IUndoableOperation> listIterator(int index) {
		return new ChildListIterator(index);
	}
	

	 *
	 * @author Christian W. Damus (cdamus)
	 */
	private class ChildIterator implements Iterator<IUndoableOperation> {
		protected IUndoableOperation last;
		protected final ListIterator<IUndoableOperation> iter;
	
		ChildIterator() {
			this(0);

			assertNotExecuted();
			
			iter.remove();
			didRemove(last);
			last = null;
		}
	
		public IUndoableOperation next() {
			last = iter.next();
			return last;
		}

	 *
	 * @author Christian W. Damus (cdamus)
	 */
	private class ChildListIterator extends ChildIterator
			implements ListIterator<IUndoableOperation> {
		
		ChildListIterator(int index) {
			super(index);
		}
		
		public void add(IUndoableOperation o) {
			assertNotExecuted();
			
			if (!getChildren().contains(o)) {
				iter.add(o);
				didAdd(o);
			}
		}
	
		public void set(IUndoableOperation o) {
			assertNotExecuted();
			
			if (!getChildren().contains(o)) {
				didRemove(last);
				iter.set(o);
				last = o;
				didAdd(o);
			}
		}
	

			return iter.nextIndex();
		}
	
		public IUndoableOperation previous() {
			last = iter.previous();
			return last;
		}




package org.eclipse.emf.workspace;

import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;


 */
public abstract class AbstractEMFOperation extends AbstractOperation {
	private final InternalTransactionalEditingDomain domain;
	private final Map<Object, Object> txOptions;
	
	private Transaction transaction;
	private TransactionChangeDescription change;

	 * @param options for the transaction in which I execute myself, or
	 *     <code>null</code> for the default options
	 */
	public AbstractEMFOperation(TransactionalEditingDomain domain, String label,
			Map<?, ?> options) {
		
		super(label);
		
		this.domain = (InternalTransactionalEditingDomain) domain;
		
		if (options == null) {
			this.txOptions = Collections.<Object, Object>singletonMap(
				TransactionImpl.BLOCK_CHANGE_PROPAGATION, Boolean.TRUE);
		} else {
			// make a defensive copy to
			//  - avoid modifying client's data
			//  - guard against client modifying my map
			//  - avoid exceptions on immutable maps
	        Map<Object, Object> myOptions = new java.util.HashMap<Object, Object>(
	                options);
			myOptions.put(TransactionImpl.BLOCK_CHANGE_PROPAGATION, Boolean.TRUE);
			this.txOptions = Collections.unmodifiableMap(myOptions);
		}
	}


	 * 
	 * @see #doExecute(IProgressMonitor, IAdaptable)
	 */
	@Override
	public final IStatus execute(IProgressMonitor monitor, IAdaptable info)
		throws ExecutionException {
		

        }
        
		transaction = null;
		final List<IStatus> result = new java.util.ArrayList<IStatus>(2);
		
		try {
            // add to the transaction a reference to myself for the
            //   command stack's benefit, unless I would be inheriting
            //   a reference to a nesting operation
            Map<Object, Object> options = new java.util.HashMap<Object, Object>(
                    getOptions());
            Map<?, ?> inherited = inheritedOptions();
            if (inherited.containsKey(EMFWorkspacePlugin.OPTION_OWNING_OPERATION)) {
                options.put(EMFWorkspacePlugin.OPTION_OWNING_OPERATION,
                    inherited.get(EMFWorkspacePlugin.OPTION_OWNING_OPERATION));

	 * @return <code>false</code> if either there is an active transaction and it
	 *     has the same options as specified; <code>true</code>, otherwise
	 */
	private boolean optionsDiffer(Map<?, ?> options) {
		boolean result = true;
		
		Transaction active =

     * @return options currently in effect that would be inherited by a new
     *     transaction that I might create
     */
    private Map<?, ?> inheritedOptions() {
        Map<?, ?> result = Collections.EMPTY_MAP;
        
        Transaction active =
            ((InternalTransactionalEditingDomain) getEditingDomain()).getActiveTransaction();

	 * 
	 * @return the multi-status
	 */
	protected IStatus aggregateStatuses(List<? extends IStatus> statuses) {
		final IStatus result;
		
		if (statuses.isEmpty()) {
			result = Status.OK_STATUS;
		} else if (statuses.size() == 1) {
			result = statuses.get(0);
		} else {
			// find the most severe status, to use its plug-in, code, and message
			IStatus[] children = statuses.toArray(new IStatus[statuses.size()]);
					new IStatus[statuses.size()]);
			
			IStatus worst = children[0];
			for (int i = 1; i < children.length; i++) {

	
	private void gatherUndoContextsFromTrigger(Command trigger) {
		if (trigger instanceof CompoundCommand) {
			for (Command next : ((CompoundCommand) trigger).getCommandList()) {
				gatherUndoContextsFromTrigger(next);
				gatherUndoContextsFromTrigger((Command)i.next());
			}
		} else if (trigger instanceof EMFOperationCommand) {
			IUndoContext[] undoContextsToAdd = ((EMFOperationCommand)trigger).getOperation().getContexts();

	 * successfully executed.  Subclasses would not usually need to override
	 * this method.
	 */
	@Override
	public boolean canUndo() {
		return (getChange() == null) || getChange().canApply();
	}

	/**
	 * Undoes me by inverting my recorded changes in a transaction.
	 */
	@Override
	public final IStatus undo(IProgressMonitor monitor, IAdaptable info)
		throws ExecutionException {
		

	 * successfully executed.  Subclasses would not usually need to override
	 * this method.
	 */
	@Override
	public boolean canRedo() {
		return (getChange() == null) || getChange().canApply();
	}

	/**
	 * Redoes me by replaying my recorded changes in a transaction.
	 */
	@Override
	public final IStatus redo(IProgressMonitor monitor, IAdaptable info)
		throws ExecutionException {
		

	 * 
	 * @return my options, or an empty map if none
	 */
	public final Map<?, ?> getOptions() {
		return txOptions;
	}
	

	 * @throws InterruptedException if the current thread was interrupted while
	 *     waiting for the transaction to start
	 */
	Transaction createTransaction(Map<?, ?> options) throws InterruptedException {
		return domain.startTransaction(false, options);
	}
	

	/**
	 * Forgets my transaction and its change description.
	 */
	@Override
	public void dispose() {
		super.dispose();
		

Lines 51-56 Link Here

(-)src/org/eclipse/emf/workspace/WorkspaceEditingDomainFactory.java (+2 lines)
51	*	51	*
52	* @return the new editing domain	52	* @return the new editing domain
53	*/	53	*/
		54	@Override
54	public TransactionalEditingDomain createEditingDomain() {	55	public TransactionalEditingDomain createEditingDomain() {
55	return createEditingDomain(OperationHistoryFactory.getOperationHistory());	56	return createEditingDomain(OperationHistoryFactory.getOperationHistory());
56	}	57	}
Lines 63-68 Link Here
63	*	64	*
64	* @return the new editing domain	65	* @return the new editing domain
65	*/	66	*/
		67	@Override
66	public TransactionalEditingDomain createEditingDomain(ResourceSet rset) {	68	public TransactionalEditingDomain createEditingDomain(ResourceSet rset) {
67	return createEditingDomain(	69	return createEditingDomain(
68	rset,	70	rset,




import java.lang.ref.WeakReference;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;

import org.eclipse.core.commands.ExecutionException;

public class EMFOperationCommand implements ConditionalRedoCommand {
	private final TransactionalEditingDomain domain;
	private IUndoableOperation operation;
	private Reference<IAdaptable> adaptable;
	
	/**
	 * Initializes me with the undoable operation that I wrap.

		this.operation = operation;
		
		if (adaptable != null) {
			this.adaptable = new WeakReference<IAdaptable>(adaptable);
		}
	}
	

	private Transaction createNonEMFTransaction(
			IUndoableOperation operation,
			IAdaptable info,
			Map<?, ?> options)
			throws InterruptedException {
		
		InternalTransaction result = new NonEMFTransaction(

	}

	// Documentation copied from the inherited specification
	public Collection<?> getResult() {
		return Collections.EMPTY_LIST;
	}

	/**
	 * Obtains the affected objects from my wrapped operation, if it is an
	 * {@link IAdvancedUndoableOperation}. 
	 */
	public Collection<?> getAffectedObjects() {
		Collection<Object> result = null;
		
		if (operation instanceof IAdvancedUndoableOperation) {
			Object[] affected = ((IAdvancedUndoableOperation) operation).getAffectedObjects();

		IAdaptable result = null;
		
		if (adaptable != null) {
			result = adaptable.get();
		}
		
		return result;

Lines 1-7 Link Here

(-).classpath (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="src" path="src"/>	3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>	4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6	<classpathentry kind="output" path="bin"/>	6	<classpathentry kind="output" path="bin"/>
7	</classpath>	7	</classpath>

Lines 22-26 Link Here

(-)build.properties (-2 / +2 lines)
22	modeling32.png,\	22	modeling32.png,\
23	plugin.properties	23	plugin.properties
24	src.includes = about.html	24	src.includes = about.html
25	javacSource = 1.4	25	javacSource = 1.5
26	javacTarget = 1.4	26	javacTarget = 1.5

Lines 16-19 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
16	org.eclipse.emf.workspace.internal;x-friends:="org.eclipse.emf.workspace.tests",	16	org.eclipse.emf.workspace.internal;x-friends:="org.eclipse.emf.workspace.tests",
17	org.eclipse.emf.workspace.internal.l10n;x-friends:="org.eclipse.emf.workspace.tests",	17	org.eclipse.emf.workspace.internal.l10n;x-friends:="org.eclipse.emf.workspace.tests",
18	org.eclipse.emf.workspace.util	18	org.eclipse.emf.workspace.util
19	Bundle-RequiredExecutionEnvironment: J2SE-1.4	19	Bundle-RequiredExecutionEnvironment: J2SE-1.5




	public NonEMFTransaction(TransactionalEditingDomain domain,
			IUndoableOperation operation,
			IAdaptable info,
			Map<?, ?> options) {
		super(domain, false, customizeOptions(options));
		
		this.operation = operation;

	 * @return A new map of options that should be passed to the superclass to
	 *  become our official set of options.
	 */
	private static Map<?, ?> customizeOptions(Map<?, ?> options) {
		// Copy the options and add the special non-change description propagation
		//  option. We do this because if by any chance that the child operation
		//  invokes some AbstractEMFOperation again then it will be handling the

		//  transactions by default will propagate all of the change descriptions upward.
		//  This can cause situations where the same change description object is applied
		//  and reversed twice.
		Map<Object, Object> result = new HashMap<Object, Object>(options);
		result.put(TransactionImpl.ALLOW_CHANGE_PROPAGATION_BLOCKING, true);
		
		return result;
	}

	/**
	 * Appends my non-EMF change and commits.
	 */
	@Override
	public void commit() throws RollbackException {
		change.add(new OperationChangeDescription(operation, info));
		

Lines 41-47 Link Here

(-)src/org/eclipse/emf/workspace/impl/EMFOperationTransaction.java (-1 / +2 lines)
41	* @param domain my editing domain	41	* @param domain my editing domain
42	* @param options my options	42	* @param options my options
43	*/	43	*/
44	public EMFOperationTransaction(Command command, InternalTransactionalEditingDomain domain, Map options) {	44	public EMFOperationTransaction(Command command,
		45	InternalTransactionalEditingDomain domain, Map<?, ?> options) {
45	super(command, domain, options);	46	super(command, domain, options);
46	}	47	}
47		48




package org.eclipse.emf.workspace.impl;

import java.util.Collection;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;

     * Extends the superclass implementation to add/remove listeners on the
     * editing domain.
	 */
	@Override
	public void setEditingDomain(InternalTransactionalEditingDomain domain) {
        InternalTransactionalEditingDomain oldDomain = getDomain();
        

     * 
     *  @since 1.1
	 */
	@Override
	protected void doExecute(Command command, Map<?, ?> options)
			throws InterruptedException, RollbackException {
		EMFCommandOperation oper = new EMFCommandOperation(getDomain(), command, options);
		

	/**
	 * Queries whether we can undo my default undo context in my operation history.
	 */
	@Override
	public boolean canUndo() {
		return getOperationHistory().canUndo(getDefaultUndoContext());
	}

	/**
	 * Undoes my default undo context in my operation history.
	 */
	@Override
	public void undo() {
		try {
			getOperationHistory().undo(

	/**
	 * Queries whether we can redo my default undo context in my operation history.
	 */
	@Override
	public boolean canRedo() {
		return getOperationHistory().canRedo(getDefaultUndoContext());
	}

	/**
	 * Redoes my default undo context in my operation history.
	 */
	@Override
	public void redo() {
		try {
			getOperationHistory().redo(

	/**
	 * Disposes my default undo context in my operation history.
	 */
	@Override
	public void flush() {
		getOperationHistory().dispose(
				getDefaultUndoContext(),

	 * Gets the command from the most recently executed, done, or redone
	 * operation.
	 */
	@Override
	public Command getMostRecentCommand() {
		Command result = null;
		

	/**
	 * Gets the command from the top of the undo history, if any.
	 */
	@Override
	public Command getUndoCommand() {
		Command result = null;
		

	/**
	 * Gets the command from the top of the redo history, if any.
	 */
	@Override
	public Command getRedoCommand() {
		Command result = null;
		

	}
	
	// Documentation copied from the method specification
	public EMFCommandTransaction createTransaction(Command command,
			Map<?, ?> options) throws InterruptedException {
		
		EMFCommandTransaction result;
		
		if (command instanceof TriggerCommand) {

	}

	// Documentation copied from the method specification
	public void executeTriggers(Command command, List<Command> triggers,
			Map<?, ?> options) throws InterruptedException, RollbackException {
		
		if (!triggers.isEmpty()) {
			TriggerCommand trigger = (command == null)
				? new TriggerCommand(triggers)

			}
		}
		
		@Override
		public void resourceSetChanged(ResourceSetChangeEvent event) {
            IUndoableOperation operation = null;
            

                    EMFWorkspacePlugin.OPTION_OWNING_OPERATION);
            }
            
            Set<Resource> affectedResources = ResourceUndoContext.getAffectedResources(
                event.getNotifications());
            
			Set<Resource> unloaded = getUnloadedResources(event.getNotifications());
			if (unloaded != null) {
				// don't add these resources to the operation
				affectedResources.removeAll(unloaded);
				
                // dispose their undo contexts
				for (Resource next : unloaded) {
					getOperationHistory().dispose(
							new ResourceUndoContext(getDomain(), next),
									getDomain(),
									(Resource) iter.next()),
							true, true, true);
				}
			}

            if ((operation != null) && !affectedResources.isEmpty()) {
                // add any resource undo contexts to this operation that are
                //   not already applied
                for (Resource next : affectedResources) {
                    ResourceUndoContext ctx = new ResourceUndoContext(
                        getDomain(), next);
                        (Resource) iter.next());
                    
                    if (!operation.hasContext(ctx)) {
                        operation.addContext(ctx);

		 * @return a set of resources that the notifications indicate have been
		 *     unloaded, or <code>null</code> if none
		 */
		private Set<Resource> getUnloadedResources(Collection<Notification> notifications) {
			Set<Resource> result = null;
			
			for (Notification next : notifications) {
				Notification next = (Notification) iter.next();
				
				if (NotificationFilter.RESOURCE_UNLOADED.matches(next)) {
					if (result == null) {
						result = new java.util.HashSet<Resource>();
					}
					
					result.add((Resource) next.getNotifier());
				}
			}
			
			return result;
		}
		
		@Override
		public boolean isPostcommitOnly() {
			// only interested in post-commit "resourceSetChanged" event
			return true;
		}
	}
	
	@Override
	public boolean isSaveNeeded() {
		// We override the execute method and never call the super implementation
		//  so we have to implement the isSaveNeeded method ourselves.
		IUndoableOperation nextUndoableOperation = history.getUndoOperation(getDefaultUndoContext());
		
		if (nextUndoableOperation == null) {
			return false;
		}
		
		return savedContext != null ? !nextUndoableOperation.hasContext(getSavedContext()) : true;
	}
	
	@Override
	public void saveIsDone() {
		// We override the execute method and never call the super implementation
		//  so we have to implement the saveIsDone method ourselves.

Lines 17-21 Link Here

(-)build.properties (-2 / +2 lines)
17	plugin.properties,\	17	plugin.properties,\
18	about.html	18	about.html
19	src.includes = about.html	19	src.includes = about.html
20	javacSource = 1.4	20	javacSource = 1.5
21	javacTarget = 1.4	21	javacTarget = 1.5

Lines 1-7 Link Here

(-).classpath (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="src" path="src"/>	3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>	4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6	<classpathentry kind="output" path="bin"/>	6	<classpathentry kind="output" path="bin"/>
7	</classpath>	7	</classpath>

Lines 27-32 Link Here

(-)src/org/eclipse/emf/transaction/ui/provider/TransactionalAdapterFactoryContentProvider.java (-13 / +20 lines)
27	import org.eclipse.emf.transaction.ui.internal.EMFTransactionUIStatusCodes;	27	import org.eclipse.emf.transaction.ui.internal.EMFTransactionUIStatusCodes;
28	import org.eclipse.emf.transaction.ui.internal.Tracing;	28	import org.eclipse.emf.transaction.ui.internal.Tracing;
29	import org.eclipse.emf.transaction.ui.internal.l10n.Messages;	29	import org.eclipse.emf.transaction.ui.internal.l10n.Messages;
		30	import org.eclipse.emf.transaction.util.TransactionUtil;
30	import org.eclipse.jface.viewers.Viewer;	31	import org.eclipse.jface.viewers.Viewer;
31	import org.eclipse.ui.views.properties.IPropertySource;	32	import org.eclipse.ui.views.properties.IPropertySource;
32		33
Lines 61-73 Link Here
61	* Runs the specified runnable in the editing domain, with interrupt	62	* Runs the specified runnable in the editing domain, with interrupt
62	* handling.	63	* handling.
63	*	64	*
		65	* @param <T> the result type of the runnable
		66	*
64	* @param run the runnable to run	67	* @param run the runnable to run
65	*	68	*
66	* @return its result, or <code>null</code> on interrupt	69	* @return its result, or <code>null</code> on interrupt
67	*/	70	*/
68	protected Object run(RunnableWithResult run) {	71	protected <T> T run(RunnableWithResult<? extends T> run) {
69	try {	72	try {
70	return domain.runExclusive(run);	73	return TransactionUtil.runExclusive(domain, run);
71	} catch (InterruptedException e) {	74	} catch (InterruptedException e) {
72	Tracing.catching(TransactionalAdapterFactoryContentProvider.class, "run", e); //$NON-NLS-1$	75	Tracing.catching(TransactionalAdapterFactoryContentProvider.class, "run", e); //$NON-NLS-1$
73		76
Lines 89-96 Link Here
89	* Extends the inherited implementation by running in a read-only transaction.	92	* Extends the inherited implementation by running in a read-only transaction.
90	* The returned property source also uses transactions to access properties.	93	* The returned property source also uses transactions to access properties.
91	*/	94	*/
		95	@Override
92	protected IPropertySource createPropertySource(final Object object, final IItemPropertySource itemPropertySource) {	96	protected IPropertySource createPropertySource(final Object object, final IItemPropertySource itemPropertySource) {
93	return wrap((IPropertySource) run(new RunnableWithResult.Impl() {	97	return wrap(run(new RunnableWithResult.Impl<IPropertySource>() {
94	public void run() {	98	public void run() {
95	setResult(TransactionalAdapterFactoryContentProvider.super.createPropertySource(object, itemPropertySource));	99	setResult(TransactionalAdapterFactoryContentProvider.super.createPropertySource(object, itemPropertySource));
96	}}));	100	}}));
Lines 99-106 Link Here
99	/**	103	/**
100	* Extends the inherited implementation by running in a read-only transaction.	104	* Extends the inherited implementation by running in a read-only transaction.
101	*/	105	*/
		106	@Override
102	public Object[] getChildren(final Object object) {	107	public Object[] getChildren(final Object object) {
103	return (Object[]) run(new RunnableWithResult.Impl() {	108	return run(new RunnableWithResult.Impl<Object[]>() {
104	public void run() {	109	public void run() {
105	setResult(TransactionalAdapterFactoryContentProvider.super.getChildren(object));	110	setResult(TransactionalAdapterFactoryContentProvider.super.getChildren(object));
106	}});	111	}});
Lines 109-116 Link Here
109	/**	114	/**
110	* Extends the inherited implementation by running in a read-only transaction.	115	* Extends the inherited implementation by running in a read-only transaction.
111	*/	116	*/
		117	@Override
112	public Object[] getElements(final Object object) {	118	public Object[] getElements(final Object object) {
113	return (Object[]) run(new RunnableWithResult.Impl() {	119	return run(new RunnableWithResult.Impl<Object[]>() {
114	public void run() {	120	public void run() {
115	setResult(TransactionalAdapterFactoryContentProvider.super.getElements(object));	121	setResult(TransactionalAdapterFactoryContentProvider.super.getElements(object));
116	}});	122	}});
Lines 119-126 Link Here
119	/**	125	/**
120	* Extends the inherited implementation by running in a read-only transaction.	126	* Extends the inherited implementation by running in a read-only transaction.
121	*/	127	*/
		128	@Override
122	public Object getParent(final Object object) {	129	public Object getParent(final Object object) {
123	return run(new RunnableWithResult.Impl() {	130	return run(new RunnableWithResult.Impl<Object>() {
124	public void run() {	131	public void run() {
125	setResult(TransactionalAdapterFactoryContentProvider.super.getParent(object));	132	setResult(TransactionalAdapterFactoryContentProvider.super.getParent(object));
126	}});	133	}});
Lines 130-137 Link Here
130	* Extends the inherited implementation by running in a read-only transaction.	137	* Extends the inherited implementation by running in a read-only transaction.
131	* The returned property source also uses transactions to access properties.	138	* The returned property source also uses transactions to access properties.
132	*/	139	*/
		140	@Override
133	public IPropertySource getPropertySource(final Object object) {	141	public IPropertySource getPropertySource(final Object object) {
134	return wrap((IPropertySource) run(new RunnableWithResult.Impl() {	142	return wrap(run(new RunnableWithResult.Impl<IPropertySource>() {
135	public void run() {	143	public void run() {
136	setResult(TransactionalAdapterFactoryContentProvider.super.getPropertySource(object));	144	setResult(TransactionalAdapterFactoryContentProvider.super.getPropertySource(object));
137	}}));	145	}}));
Lines 140-160 Link Here
140	/**	148	/**
141	* Extends the inherited implementation by running in a read-only transaction.	149	* Extends the inherited implementation by running in a read-only transaction.
142	*/	150	*/
		151	@Override
143	public boolean hasChildren(final Object object) {	152	public boolean hasChildren(final Object object) {
144	Boolean result = (Boolean) run(new RunnableWithResult.Impl() {	153	return run(new RunnableWithResult.Impl<Boolean>() {
145	public void run() {	154	public void run() {
146	setResult(TransactionalAdapterFactoryContentProvider.super.hasChildren(object)	155	setResult(TransactionalAdapterFactoryContentProvider.super.hasChildren(object));
147	? Boolean.TRUE : Boolean.FALSE);
148	}});	156	}});
149
150	return (result == null) ? false : result.booleanValue();
151	}	157	}
152		158
153	/**	159	/**
154	* Extends the inherited implementation by running in a read-only transaction.	160	* Extends the inherited implementation by running in a read-only transaction.
155	*/	161	*/
		162	@Override
156	public void inputChanged(final Viewer vwr, final Object oldInput, final Object newInput) {	163	public void inputChanged(final Viewer vwr, final Object oldInput, final Object newInput) {
157	run(new RunnableWithResult.Impl() {	164	run(new RunnableWithResult.Impl<Object>() {
158	public void run() {	165	public void run() {
159	TransactionalAdapterFactoryContentProvider.super.inputChanged(vwr, oldInput, newInput);	166	TransactionalAdapterFactoryContentProvider.super.inputChanged(vwr, oldInput, newInput);
160	}});	167	}});




/**
 * <copyright> 
 *
 * Copyright (c) 2005, 2006 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at
 * http://www.eclipse.org/legal/epl-v10.html
 * 
 * Contributors: 
 *   IBM - Initial API and implementation
 *
 * </copyright>
 *
 * $Id: TransactionalPropertySource.java,v 1.1 2006/01/30 19:47:45 cdamus Exp $
 */
package org.eclipse.emf.transaction.ui.provider;

import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.transaction.RunnableWithResult;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
import org.eclipse.emf.transaction.ui.internal.EMFTransactionUIPlugin;
import org.eclipse.emf.transaction.ui.internal.EMFTransactionUIStatusCodes;
import org.eclipse.emf.transaction.ui.internal.Tracing;
import org.eclipse.emf.transaction.ui.internal.l10n.Messages;
import org.eclipse.emf.transaction.util.TransactionUtil;
import org.eclipse.ui.views.properties.IPropertyDescriptor;
import org.eclipse.ui.views.properties.IPropertySource;
import org.eclipse.ui.views.properties.IPropertySource2;


/**
 * A property source wrapper that calls its delegate in transactions of the
 * appropriate kind.  Note that transactions are not actually required for
 * methods that do not access model objects.
 * 
 * @author Christian W. Damus (cdamus)
 */
public class TransactionalPropertySource
	implements IPropertySource2 {

	private final TransactionalEditingDomain domain;
	
	private final IPropertySource propertySource;
	private final IPropertySource2 propertySource2;
	
	/**
	 * Initializes me with the editing domain in which I create transactions,
	 * and the property source that I delegate to.
	 * 
	 * @param domain my editing domain
	 * @param propertySource my delegate
	 */
	public TransactionalPropertySource(TransactionalEditingDomain domain, IPropertySource propertySource) {
		this.domain = domain;
		
		this.propertySource = propertySource;
		this.propertySource2 = (propertySource instanceof IPropertySource2)
			? (IPropertySource2) propertySource
			: null;
	}

	/**
	 * Runs the specified runnable in the editing domain, with interrupt
	 * handling.
	 * 
	 * @param <T> the result type of the runnable
	 * 
	 * @param run the runnable to run
	 * 
	 * @return its result, or <code>null</code> on interrupt
	 */
	protected <T> T run(RunnableWithResult<? extends T> run) {
		try {
			return TransactionUtil.runExclusive(domain, run);
		} catch (InterruptedException e) {
			Tracing.catching(TransactionalPropertySource.class, "run", e); //$NON-NLS-1$
			
			// propagate interrupt status because we are not throwing
			Thread.currentThread().interrupt();
			
			EMFTransactionUIPlugin.INSTANCE.log(new Status(
				IStatus.ERROR,
				EMFTransactionUIPlugin.getPluginId(),
				EMFTransactionUIStatusCodes.PROPERTY_SHEET_INTERRUPTED,
				Messages.propertyInterrupt,
				e));
			
			return null;
		}
	}

	/**
	 * Delegates the my wrapped property source in the appropriate transaction.
	 */
	public boolean isPropertyResettable(Object id) {
		return (propertySource2 == null)? false
				: propertySource2.isPropertyResettable(id);
	}

	/**
	 * Delegates the my wrapped property source in the appropriate transaction.
	 */
	public boolean isPropertySet(final Object id) {
		return run(new RunnableWithResult.Impl<Boolean>() {
			public void run() {
				setResult(propertySource.isPropertySet(id));
			}});
	}

	/**
	 * Delegates the my wrapped property source in the appropriate transaction.
	 */
	public Object getEditableValue() {
		return run(new RunnableWithResult.Impl<Object>() {
			public void run() {
				setResult(propertySource.getEditableValue());
			}});
	}

	/**
	 * Delegates the my wrapped property source in the appropriate transaction.
	 */
	public IPropertyDescriptor[] getPropertyDescriptors() {
		return propertySource.getPropertyDescriptors();
	}

	/**
	 * Delegates the my wrapped property source in the appropriate transaction.
	 */
	public Object getPropertyValue(final Object id) {
		return run(new RunnableWithResult.Impl<Object>() {
			public void run() {
				setResult(propertySource.getPropertyValue(id));
			}});
	}

	/**
	 * Delegates the my wrapped property source in the appropriate transaction.
	 */
	public void resetPropertyValue(final Object id) {
		if (propertySource2 != null) {
			// are we in a read-only context?  if so, balk because we cannot upgrade
			//    read transaction to write when executing a command
			Transaction tx = ((InternalTransactionalEditingDomain) domain).getActiveTransaction();
			if ((tx == null) || !tx.isReadOnly()) {
				propertySource2.resetPropertyValue(id);
			}
		}
	}

	/**
	 * Delegates directly to the wrapper property source, because it will use
	 * a command to perform the modification (which implicitly creates a
	 * read/write transaction).
	 */
	public void setPropertyValue(final Object id, final Object value) {
		// are we in a read-only context?  if so, balk because we cannot upgrade
		//    read transaction to write when executing a command
		Transaction tx = ((InternalTransactionalEditingDomain) domain).getActiveTransaction();
		if ((tx == null) || !tx.isReadOnly()) {
			propertySource.setPropertyValue(id, value);
		}
	}
}

Lines 25-30 Link Here

(-)src/org/eclipse/emf/transaction/ui/provider/TransactionalAdapterFactoryLabelProvider.java (-13 / +20 lines)
25	import org.eclipse.emf.transaction.ui.internal.EMFTransactionUIStatusCodes;	25	import org.eclipse.emf.transaction.ui.internal.EMFTransactionUIStatusCodes;
26	import org.eclipse.emf.transaction.ui.internal.Tracing;	26	import org.eclipse.emf.transaction.ui.internal.Tracing;
27	import org.eclipse.emf.transaction.ui.internal.l10n.Messages;	27	import org.eclipse.emf.transaction.ui.internal.l10n.Messages;
		28	import org.eclipse.emf.transaction.util.TransactionUtil;
28	import org.eclipse.swt.graphics.Image;	29	import org.eclipse.swt.graphics.Image;
29		30
30		31
Lines 55-67 Link Here
55	* Runs the specified runnable in the editing domain, with interrupt	56	* Runs the specified runnable in the editing domain, with interrupt
56	* handling.	57	* handling.
57	*	58	*
		59	* @param <T> the result type of the runnable
		60	*
58	* @param run the runnable to run	61	* @param run the runnable to run
59	*	62	*
60	* @return its result, or <code>null</code> on interrupt	63	* @return its result, or <code>null</code> on interrupt
61	*/	64	*/
62	protected Object run(RunnableWithResult run) {	65	protected <T> T run(RunnableWithResult<? extends T> run) {
63	try {	66	try {
64	return domain.runExclusive(run);	67	return TransactionUtil.runExclusive(domain, run);
65	} catch (InterruptedException e) {	68	} catch (InterruptedException e) {
66	Tracing.catching(TransactionalAdapterFactoryLabelProvider.class, "run", e); //$NON-NLS-1$	69	Tracing.catching(TransactionalAdapterFactoryLabelProvider.class, "run", e); //$NON-NLS-1$
67		70
Lines 82-89 Link Here
82	/**	85	/**
83	* Extends the inherited implementation by running in a read-only transaction.	86	* Extends the inherited implementation by running in a read-only transaction.
84	*/	87	*/
		88	@Override
85	public Image getColumnImage(final Object object, final int columnIndex) {	89	public Image getColumnImage(final Object object, final int columnIndex) {
86	return (Image) run(new RunnableWithResult.Impl() {	90	return run(new RunnableWithResult.Impl<Image>() {
87	public void run() {	91	public void run() {
88	setResult(TransactionalAdapterFactoryLabelProvider.super.getColumnImage(object, columnIndex));	92	setResult(TransactionalAdapterFactoryLabelProvider.super.getColumnImage(object, columnIndex));
89	}});	93	}});
Lines 92-99 Link Here
92	/**	96	/**
93	* Extends the inherited implementation by running in a read-only transaction.	97	* Extends the inherited implementation by running in a read-only transaction.
94	*/	98	*/
		99	@Override
95	public String getColumnText(final Object object, final int columnIndex) {	100	public String getColumnText(final Object object, final int columnIndex) {
96	return (String) run(new RunnableWithResult.Impl() {	101	return run(new RunnableWithResult.Impl<String>() {
97	public void run() {	102	public void run() {
98	setResult(TransactionalAdapterFactoryLabelProvider.super.getColumnText(object, columnIndex));	103	setResult(TransactionalAdapterFactoryLabelProvider.super.getColumnText(object, columnIndex));
99	}});	104	}});
Lines 102-109 Link Here
102	/**	107	/**
103	* Extends the inherited implementation by running in a read-only transaction.	108	* Extends the inherited implementation by running in a read-only transaction.
104	*/	109	*/
		110	@Override
105	protected Image getDefaultImage(final Object object) {	111	protected Image getDefaultImage(final Object object) {
106	return (Image) run(new RunnableWithResult.Impl() {	112	return run(new RunnableWithResult.Impl<Image>() {
107	public void run() {	113	public void run() {
108	setResult(TransactionalAdapterFactoryLabelProvider.super.getDefaultImage(object));	114	setResult(TransactionalAdapterFactoryLabelProvider.super.getDefaultImage(object));
109	}});	115	}});
Lines 112-119 Link Here
112	/**	118	/**
113	* Extends the inherited implementation by running in a read-only transaction.	119	* Extends the inherited implementation by running in a read-only transaction.
114	*/	120	*/
		121	@Override
115	public Image getImage(final Object object) {	122	public Image getImage(final Object object) {
116	return (Image) run(new RunnableWithResult.Impl() {	123	return run(new RunnableWithResult.Impl<Image>() {
117	public void run() {	124	public void run() {
118	setResult(TransactionalAdapterFactoryLabelProvider.super.getImage(object));	125	setResult(TransactionalAdapterFactoryLabelProvider.super.getImage(object));
119	}});	126	}});
Lines 122-129 Link Here
122	/**	129	/**
123	* Extends the inherited implementation by running in a read-only transaction.	130	* Extends the inherited implementation by running in a read-only transaction.
124	*/	131	*/
		132	@Override
125	protected Image getImageFromObject(final Object object) {	133	protected Image getImageFromObject(final Object object) {
126	return (Image) run(new RunnableWithResult.Impl() {	134	return run(new RunnableWithResult.Impl<Image>() {
127	public void run() {	135	public void run() {
128	setResult(TransactionalAdapterFactoryLabelProvider.super.getImageFromObject(object));	136	setResult(TransactionalAdapterFactoryLabelProvider.super.getImageFromObject(object));
129	}});	137	}});
Lines 132-139 Link Here
132	/**	140	/**
133	* Extends the inherited implementation by running in a read-only transaction.	141	* Extends the inherited implementation by running in a read-only transaction.
134	*/	142	*/
		143	@Override
135	public String getText(final Object object) {	144	public String getText(final Object object) {
136	return (String) run(new RunnableWithResult.Impl() {	145	return run(new RunnableWithResult.Impl<String>() {
137	public void run() {	146	public void run() {
138	setResult(TransactionalAdapterFactoryLabelProvider.super.getText(object));	147	setResult(TransactionalAdapterFactoryLabelProvider.super.getText(object));
139	}});	148	}});
Lines 142-154 Link Here
142	/**	151	/**
143	* Extends the inherited implementation by running in a read-only transaction.	152	* Extends the inherited implementation by running in a read-only transaction.
144	*/	153	*/
		154	@Override
145	public boolean isLabelProperty(final Object object, final String id) {	155	public boolean isLabelProperty(final Object object, final String id) {
146	Boolean result = (Boolean) run(new RunnableWithResult.Impl() {	156	return run(new RunnableWithResult.Impl<Boolean>() {
147	public void run() {	157	public void run() {
148	setResult(TransactionalAdapterFactoryLabelProvider.super.isLabelProperty(object, id)	158	setResult(TransactionalAdapterFactoryLabelProvider.super.isLabelProperty(object, id));
149	? Boolean.TRUE : Boolean.FALSE);
150	}});	159	}});
151
152	return (result == null) ? false : result.booleanValue();
153	}	160	}
154	}	161	}




Bundle-ManifestVersion: 2
Bundle-Name: %Plugin.name
Bundle-SymbolicName: org.eclipse.emf.transaction.ui
Bundle-Version: 1.2.0.qualifier
Bundle-Vendor: %Plugin.providerName
Bundle-Localization: plugin
Require-Bundle: org.eclipse.emf.edit.ui;bundle-version="[2.3.0,3.0.0)",
 org.eclipse.emf.transaction;bundle-version="[1.2.0,2.0.0)"
Eclipse-LazyStart: true
Bundle-Activator: org.eclipse.emf.transaction.ui.internal.EMFTransactionUIPlugin$Implementation
Export-Package: org.eclipse.emf.transaction.ui.internal;x-internal:=true,
 org.eclipse.emf.transaction.ui.internal.l10n;x-internal:=true,
 org.eclipse.emf.transaction.ui.provider,
 org.eclipse.emf.transaction.ui.view
Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 1-8 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-5 / +5 lines)
1	#Wed Dec 20 11:59:13 EST 2006	1	#Sun Nov 11 14:10:16 EST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5	org.eclipse.jdt.core.compiler.compliance=1.4	5	org.eclipse.jdt.core.compiler.compliance=1.5
6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error	6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8	org.eclipse.jdt.core.compiler.source=1.4	8	org.eclipse.jdt.core.compiler.source=1.5




	/**
	 * The cached debug options (for optimization).
	 */
	private static final Map<String, Boolean> cachedOptions =
		new HashMap<String, Boolean>();

	/**
	 * Retrieves a Boolean value indicating whether tracing is enabled.

			Boolean value = null;
			
			synchronized (cachedOptions) {
				value = cachedOptions.get(option);
	
				if (null == value) {
					value =
						Boolean.valueOf(
								org.eclipse.core.runtime.Platform.getDebugOption(option));
								org.eclipse.core.runtime.Platform.getDebugOption(option)));
	
					cachedOptions.put(option, value);
				}

	 */
	public static void changing(
        String option,
        Class<?> clazz,
        String methodName,
        String valueDescription,
        Object oldValue,

	 * 
	 */
	public static void catching(
		Class<?> clazz,
		String methodName,
		Throwable throwable) {


	 * 
	 */
	public static void throwing(
		Class<?> clazz,
		String methodName,
		Throwable throwable) {


	}

	/**
	 * Traces the entering into the specified method of the specified class.
	 * 
	 * @param clazz The class whose method is being entered.
	 * @param methodName The name of method that is being entered.
	 * 
	 */
	public static void entering(
		Class clazz,
		String methodName) {

		if (shouldTrace(EMFTransactionUIDebugOptions.METHODS_ENTERING)) {

			trace(
				PREFIX_ENTERING
					+ clazz.getName()
					+ SEPARATOR_METHOD
					+ methodName);
		}
	}

	/**
	 * Traces the entering into the specified method of the specified class,
	 * with the specified parameter.
	 * 
	 * @param clazz The class whose method is being entered.
	 * @param methodName The name of method that is being entered.
	 * @param parameter The parameter to the method being entered.
	 * 
	 */
	public static void entering(
		Class clazz,
		String methodName,
		Object parameter) {

		if (shouldTrace(EMFTransactionUIDebugOptions.METHODS_ENTERING)) {

			trace(
				PREFIX_ENTERING
					+ clazz.getName()
					+ SEPARATOR_METHOD
					+ methodName
					+ PARENTHESIS_OPEN
					+ getArgumentString(parameter)
					+ PARENTHESIS_CLOSE);
		}
	}

	/**
	 * Traces the entering into the specified method of the specified class,
	 * with the specified parameters.
	 * 

	 * 
	 */
	public static void entering(
		Class<?> clazz,
		String methodName,
		Object... parameters) {

		if (shouldTrace(EMFTransactionUIDebugOptions.METHODS_ENTERING)) {


	 * 
	 */
	public static void exiting(
		Class<?> clazz,
		String methodName) {

		if (shouldTrace(EMFTransactionUIDebugOptions.METHODS_EXITING)) {

	 * 
	 */
	public static void exiting(
		Class<?> clazz,
		String methodName,
		Object returnValue) {





/**
 * <copyright>
 *
 * Copyright (c) 2006, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

import java.lang.reflect.InvocationTargetException;
import java.net.URL;
import java.util.Collection;
import java.util.Iterator;
import java.util.zip.ZipEntry;
import java.util.zip.ZipInputStream;

import org.eclipse.core.resources.IFile;
import org.eclipse.core.resources.IProject;
import org.eclipse.core.resources.IResource;
import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.FileLocator;

	 *  when unzipped into the workspace.
	 */
	public static class ProjectDescriptor {
		private final String bundleName;
		private final String zipLocation;
		private final String projectName;
		
		/**
		 * Construct a descriptor that points to a zip file located

		}
	}

	@Override
	public boolean performFinish() {
		final Collection<ProjectDescriptor> projectDescriptors = getProjectDescriptors();
		
		try {
			getContainer().run(true, false, new IRunnableWithProgress() {

					throws InvocationTargetException, InterruptedException {
					
					WorkspaceModifyOperation op = new WorkspaceModifyOperation() {
						@Override
						protected void execute(IProgressMonitor m)
						
							throws CoreException, InvocationTargetException, InterruptedException {
							m.beginTask("Unzipping Projects", projectDescriptors.size());
							
							for (ProjectDescriptor next : projectDescriptors) {
								unzipProject(next, m);
								m.worked(1);
							}
						}

	 * @return The collection of project descriptors that should be
	 *  unzipped into the workspace.
	 */
	protected abstract Collection<ProjectDescriptor> getProjectDescriptors();
	
	private void unzipProject(ProjectDescriptor descriptor, IProgressMonitor monitor) {
		String bundleName = descriptor.getBundleName();

							byte[] buffer = new byte[102400];
							while (true) {
								int len = zipFileStream.read(buffer);
								if (zipFileStream.available() == 0) {
									break;
								}
								os.write(buffer, 0, len);
							}
						} finally {

			}
			
			project.open(monitor);
			project.refreshLocal(IResource.DEPTH_INFINITE, monitor);
			
			// Close and re-open the project to force eclipse to re-evaluate
			//  any natures that this project has.




/**
 * <copyright>
 *
 * Copyright (c) 2006, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

public class WorkspaceExampleWizard
	extends AbstractExampleWizard {
	
	@Override
	protected Collection<ProjectDescriptor> getProjectDescriptors() {
		// We need the workspace example to be unzipped along with the
		// EMF library example model, edit and editor examples
		List<ProjectDescriptor> projects = new ArrayList<ProjectDescriptor>(4);
		projects.add(new ProjectDescriptor("org.eclipse.emf.transaction.examples", "zips/library.zip", "org.eclipse.emf.examples.library"));  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$
		projects.add(new ProjectDescriptor("org.eclipse.emf.transaction.examples", "zips/libraryEdit.zip", "org.eclipse.emf.examples.library.edit")); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$
		projects.add(new ProjectDescriptor("org.eclipse.emf.transaction.examples", "zips/libraryEditor.zip", "org.eclipse.emf.examples.library.editor"));  //$NON-NLS-1$//$NON-NLS-2$ //$NON-NLS-3$

		return projects;
	}
	
	@Override
	protected void log(Exception e) {
		if (e instanceof CoreException) {
			TransactionExamplesPlugin.getDefault().getLog().log(((CoreException)e).getStatus());

Lines 13-16 Link Here

(-)META-INF/MANIFEST.MF (-1 / +1 lines)
13	Bundle-Activator: org.eclipse.emf.transaction.examples.internal.TransactionExamplesPlugin	13	Bundle-Activator: org.eclipse.emf.transaction.examples.internal.TransactionExamplesPlugin
14	Export-Package: org.eclipse.emf.transaction.examples.internal;x-internal:=true,	14	Export-Package: org.eclipse.emf.transaction.examples.internal;x-internal:=true,
15	org.eclipse.emf.transaction.examples.internal.wizard;x-internal:=true	15	org.eclipse.emf.transaction.examples.internal.wizard;x-internal:=true
16	Bundle-RequiredExecutionEnvironment: J2SE-1.4	16	Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 25-29 Link Here

(-)build.properties (-2 / +2 lines)
25	src.includes = about.html	25	src.includes = about.html
26	source.. = src/	26	source.. = src/
27	output.. = bin/	27	output.. = bin/
28	javacSource = 1.4	28	javacSource = 1.5
29	javacTarget = 1.4	29	javacTarget = 1.5

Lines 1-7 Link Here

(-).classpath (-1 / +1 lines)
1	<?xml version="1.0" encoding="UTF-8"?>	1	<?xml version="1.0" encoding="UTF-8"?>
2	<classpath>	2	<classpath>
3	<classpathentry kind="src" path="src"/>	3	<classpathentry kind="src" path="src"/>
4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.4"/>	4	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>	5	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
6	<classpathentry kind="output" path="bin"/>	6	<classpathentry kind="output" path="bin"/>
7	</classpath>	7	</classpath>

Lines 1-8 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-5 / +5 lines)
1	#Wed Dec 20 11:58:18 EST 2006	1	#Sun Nov 11 13:14:50 EST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5	org.eclipse.jdt.core.compiler.compliance=1.4	5	org.eclipse.jdt.core.compiler.compliance=1.5
6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error	6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8	org.eclipse.jdt.core.compiler.source=1.4	8	org.eclipse.jdt.core.compiler.source=1.5

Lines 16-27 Link Here

(-)src/org/eclipse/emf/transaction/tests/PrivilegedRunnableTest.java (-10 / +16 lines)
16	*/	16	*/
17	package org.eclipse.emf.transaction.tests;	17	package org.eclipse.emf.transaction.tests;
18		18
		19	import java.util.List;
		20
		21	import junit.framework.Assert;
19	import junit.framework.Test;	22	import junit.framework.Test;
20	import junit.framework.TestCase;
21	import junit.framework.TestSuite;	23	import junit.framework.TestSuite;
22		24
23	import org.eclipse.core.runtime.IStatus;	25	import org.eclipse.core.runtime.IStatus;
24	import org.eclipse.core.runtime.Status;	26	import org.eclipse.core.runtime.Status;
		27	import org.eclipse.emf.examples.extlibrary.Book;
25	import org.eclipse.emf.transaction.RunnableWithResult;	28	import org.eclipse.emf.transaction.RunnableWithResult;
26		29
27		30
Lines 56-62 Link Here
56	* Tests the sharing of a read-only transaction.	59	* Tests the sharing of a read-only transaction.
57	*/	60	*/
58	public void test_sharingReadOnlyTransaction() {	61	public void test_sharingReadOnlyTransaction() {
59	RunnableWithResult privileged;	62	RunnableWithResult<?> privileged;
60	startReading();	63	startReading();
61		64
62	privileged = domain.createPrivilegedRunnable(read);	65	privileged = domain.createPrivilegedRunnable(read);
Lines 91-97 Link Here
91	* Tests the sharing of a read-write transaction.	94	* Tests the sharing of a read-write transaction.
92	*/	95	*/
93	public void test_sharingReadWriteTransaction() {	96	public void test_sharingReadWriteTransaction() {
94	RunnableWithResult privileged;	97	RunnableWithResult<?> privileged;
95	startWriting();	98	startWriting();
96		99
97	privileged = domain.createPrivilegedRunnable(write);	100	privileged = domain.createPrivilegedRunnable(write);
Lines 147-153 Link Here
147	thread2.syncExec(domain.createPrivilegedRunnable(write));	150	thread2.syncExec(domain.createPrivilegedRunnable(write));
148	}};	151	}};
149		152
150	RunnableWithResult privileged;	153	RunnableWithResult<?> privileged;
151	startWriting();	154	startWriting();
152		155
153	privileged = domain.createPrivilegedRunnable(nestingRunnable);	156	privileged = domain.createPrivilegedRunnable(nestingRunnable);
Lines 167-173 Link Here
167	* a privileged runnable.	170	* a privileged runnable.
168	*/	171	*/
169	public void test_transactionMustBeActive() {	172	public void test_transactionMustBeActive() {
170	RunnableWithResult privileged;	173	RunnableWithResult<?> privileged;
171	startWriting();	174	startWriting();
172		175
173	privileged = domain.createPrivilegedRunnable(write);	176	privileged = domain.createPrivilegedRunnable(write);
Lines 186-192 Link Here
186	* transaction when executing a privileged runnable.	189	* transaction when executing a privileged runnable.
187	*/	190	*/
188	public void test_transactionMustBeCurrent() {	191	public void test_transactionMustBeCurrent() {
189	RunnableWithResult privileged;	192	RunnableWithResult<?> privileged;
190	startWriting();	193	startWriting();
191		194
192	privileged = domain.createPrivilegedRunnable(write);	195	privileged = domain.createPrivilegedRunnable(write);
Lines 213-219 Link Here
213	public void test_runtimeExceptionInRunnable_146625() {	216	public void test_runtimeExceptionInRunnable_146625() {
214	final RuntimeException e = new RuntimeException();	217	final RuntimeException e = new RuntimeException();
215		218
216	RunnableWithResult privileged;	219	RunnableWithResult<?> privileged;
217	startReading();	220	startReading();
218		221
219	privileged = domain.createPrivilegedRunnable(new Runnable() {	222	privileged = domain.createPrivilegedRunnable(new Runnable() {
Lines 299-304 Link Here
299	// Fixture methods	302	// Fixture methods
300	//	303	//
301		304
		305	@Override
302	protected void doSetUp() throws Exception {	306	protected void doSetUp() throws Exception {
303	super.doSetUp();	307	super.doSetUp();
304		308
Lines 311-316 Link Here
311	writeWithResult = new TestWriteWithResult();	315	writeWithResult = new TestWriteWithResult();
312	}	316	}
313		317
		318	@Override
314	protected void doTearDown() throws Exception {	319	protected void doTearDown() throws Exception {
315	read = null;	320	read = null;
316	readWithResult = null;	321	readWithResult = null;
Lines 348-354 Link Here
348	try {	353	try {
349	wait();	354	wait();
350	} catch (InterruptedException e) {	355	} catch (InterruptedException e) {
351	TestCase.fail("Interrupted while waiting for runnable"); //$NON-NLS-1$	356	Assert.fail("Interrupted while waiting for runnable"); //$NON-NLS-1$
352	}	357	}
353	}	358	}
354	}	359	}
Lines 359-364 Link Here
359	return result;	364	return result;
360	}	365	}
361		366
		367	@Override
362	public void run() {	368	public void run() {
363	for (;;) {	369	for (;;) {
364	synchronized (this) {	370	synchronized (this) {
Lines 401-407 Link Here
401	}	407	}
402	}	408	}
403		409
404	class TestReadWithResult extends RunnableWithResult.Impl {	410	class TestReadWithResult extends RunnableWithResult.Impl<List<Book>> {
405	boolean wasExecuted = false;	411	boolean wasExecuted = false;
406		412
407	public void run() {	413	public void run() {
Lines 420-426 Link Here
420	}	426	}
421	}	427	}
422		428
423	class TestWriteWithResult extends RunnableWithResult.Impl {	429	class TestWriteWithResult extends RunnableWithResult.Impl<List<Book>> {
424	boolean wasExecuted = false;	430	boolean wasExecuted = false;
425		431
426	public void run() {	432	public void run() {

Lines 74-80 Link Here

(-)src/org/eclipse/emf/transaction/tests/NotificationFilterTest.java (-2 / +2 lines)
74		74
75	assertNotNull(bookListener.postcommit);	75	assertNotNull(bookListener.postcommit);
76	assertEquals(1, bookListener.postcommitNotifications.size());	76	assertEquals(1, bookListener.postcommitNotifications.size());
77	Notification notification = (Notification) bookListener.postcommitNotifications.get(0);	77	Notification notification = bookListener.postcommitNotifications.get(0);
78	assertSame(book, notification.getNotifier());	78	assertSame(book, notification.getNotifier());
79	assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());	79	assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());
80	assertSame(oldTitle, notification.getOldValue());	80	assertSame(oldTitle, notification.getOldValue());
Lines 82-88 Link Here
82		82
83	assertNotNull(authorListener.postcommit);	83	assertNotNull(authorListener.postcommit);
84	assertEquals(1, authorListener.postcommitNotifications.size());	84	assertEquals(1, authorListener.postcommitNotifications.size());
85	notification = (Notification) authorListener.postcommitNotifications.get(0);	85	notification = authorListener.postcommitNotifications.get(0);
86	assertSame(newAuthor, notification.getNotifier());	86	assertSame(newAuthor, notification.getNotifier());
87	assertSame(EXTLibraryPackage.eINSTANCE.getWriter_Books(), notification.getFeature());	87	assertSame(EXTLibraryPackage.eINSTANCE.getWriter_Books(), notification.getFeature());
88	assertSame(book, notification.getNewValue());	88	assertSame(book, notification.getNewValue());




/**
 * <copyright>
 *
 * Copyright (c) 2006, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

		EPackage pkg = findPackage("root/nested1", true); //$NON-NLS-1$
		assertSame(recorder, getRecorder(pkg));
		
		Iterator<EObject> contents = ((InternalEList<EObject>) pkg.eContents()).basicIterator();
		
		// check that the EPackage is not yet resolved
		EObject obj = contents.next();
		assertTrue(!(obj instanceof EPackage) || obj.eIsProxy());
		obj = contents.next();
		assertTrue(!(obj instanceof EPackage) || obj.eIsProxy());
		
		assertFalse(nestedResource1.isLoaded());

		EPackage pkg = findPackage("root/nested1", true); //$NON-NLS-1$
		assertSame(recorder, getRecorder(pkg));
		
		Iterator<EObject> contents = ((InternalEList<EObject>) pkg.eContents()).basicIterator();
		
		// check that the EPackage is not yet resolved
		EObject obj = contents.next();
		assertTrue(!(obj instanceof EPackage) || obj.eIsProxy());
		obj = contents.next();
		assertTrue(!(obj instanceof EPackage) || obj.eIsProxy());
		
		assertFalse(nestedResource1.isLoaded());

	// Framework methods
	//
	
	@Override
	protected void doSetUp() throws Exception {
		super.doSetUp();
		

						"/test_models/test_model.ecore").toString()), //$NON-NLS-1$
						true);
			rootResource.setURI(URI.createPlatformResourceURI(
					"/" + PROJECT_NAME + "/test_model.ecore", true)); //$NON-NLS-1$ //$NON-NLS-2$
			
			nestedResource1 = rset.createResource(URI.createPlatformResourceURI(
					"/" + PROJECT_NAME + "/test_model1.ecore", true)); //$NON-NLS-1$ //$NON-NLS-2$
			nestedResource2 = rset.createResource(URI.createPlatformResourceURI(
					"/" + PROJECT_NAME + "/test_model2.ecore", true)); //$NON-NLS-1$ //$NON-NLS-2$
			
			startWriting();
			

		}
	}
	
	@Override
	protected void doTearDown() throws Exception {
		if (rootResource != null) {
			unloadAndRemove(rootResource);

	 * @param object the object
	 * @return its name
	 */
	@Override
	protected String getName(EObject object) {
		if (object instanceof ENamedElement) {
			return ((ENamedElement) object).getName();

	protected TransactionChangeRecorder getRecorder(Notifier notifier) {
		TransactionChangeRecorder result = null;
		
		for (Object next : notifier.eAdapters()) {
			Object next = iter.next();
			
			if (next instanceof TransactionChangeRecorder) {
				result = (TransactionChangeRecorder) next;
				break;




import junit.framework.TestSuite;
import junit.textui.TestRunner;

import org.eclipse.core.runtime.IPlatformRunnable;
import org.eclipse.emf.transaction.multithread.tests.AbstractMultithreadTest;
import org.eclipse.emf.transaction.util.tests.InternalUtilTests;
import org.eclipse.equinox.app.IApplication;
import org.eclipse.equinox.app.IApplicationContext;

/**
 * Master JUnit test suite for the <em>EMF-TX API</em>.

 */
public class AllTests
	extends TestCase
	implements IApplication {

	public AllTests() {
		super(""); //$NON-NLS-1$

		return suite;
	}

	public Object start(IApplicationContext context)
		throws Exception {
		
		TestRunner.run(suite());
		
		return Arrays.asList(new String[] {
			"Please see raw test suite output for details."}); //$NON-NLS-1$
	}

	public void stop() {
		// nothing to do
	}
}




public class TestsPlugin extends Plugin {
	public static TestsPlugin instance;
	
	@Override
	public void start(BundleContext context) throws Exception {
		super.start(context);
		
		instance = this;
	}
	
	@Override
	public void stop(BundleContext context) throws Exception {
		instance = null;
		




	 */
	public void test_noUndo_recordingCommand() {
		Command cmd = new RecordingCommand(domain) {
			@Override
			protected void doExecute() {
				final Book book = (Book) find("root/Root Book"); //$NON-NLS-1$
				assertNotNull(book);

			fail("Should have rolled back because of outer transaction validation"); //$NON-NLS-1$
		} catch (RollbackException e) {
			// expected exception
			Collection<IStatus> errors = findValidationStatuses(
					e.getStatus(), IStatus.ERROR);
			
			// the inner transaction's error was not detected

	}
	
	public void test_transactionOptionInheritance_135569() {
		Map<Object, Object> options = new java.util.HashMap<Object, Object>();
		Map<?, ?> active;
		
		// test the inheritance of empty options
		startWriting();

     * notifications, since they are not needed for anything.
     */
    public void test_noNotificationsInSilentUnprotected_152335() {
        Map<Object, Object> options = new java.util.HashMap<Object, Object>();
        options.put(Transaction.OPTION_NO_NOTIFICATIONS, true);
        options.put(Transaction.OPTION_UNPROTECTED, true);
        
        startWriting(options);
        InternalTransaction tx = getActiveTransaction();

        final String newTitle = "New Title"; //$NON-NLS-1$
        book.setTitle(newTitle);
        
        Map<Object, Object> options = new java.util.HashMap<Object, Object>();
        options.put(Transaction.OPTION_NO_NOTIFICATIONS, true);
        options.put(Transaction.OPTION_UNPROTECTED, true);
        
        // intervening silent-unprotected
        startWriting(options);

        //    and only that notification
        assertNotNull(listener.postcommitNotifications);
        assertEquals(1, listener.postcommitNotifications.size());
        Notification notification = listener.postcommitNotifications.get(0);
        assertSame(EXTLibraryPackage.Literals.BOOK__TITLE, notification.getFeature());
    }
    

     * Tests that default transaction options are applied to new transactions.
     */
    public void test_defaultTransactionOptions() {
        TransactionalEditingDomain.DefaultOptions defaults = TransactionUtil
            .getAdapter(domain, TransactionalEditingDomain.DefaultOptions.class);
        
        defaults.setDefaultTransactionOptions(Collections.singletonMap(

	// Fixture methods
	//
	
	@Override
	protected void doSetUp()
		throws Exception {
		

		ValidationRollbackTest.validationEnabled = true;
	}
	
	@Override
	protected void doTearDown()
		throws Exception {
		




	}
	
	/** May be overridden by subclasses to create non-default editing domains. */
	@Override
	protected TransactionalEditingDomain createEditingDomain(ResourceSet rset) {
		return myDomain;
	}
	
	@Override
	protected ResourceSet createResourceSet() {
		return myDomain.getResourceSet();
	}




		
		// should have gotten events from the read transaction, above
		assertNotNull(TestListener1.getInstance().postcommit);
		List<Notification> notifications = TestListener1.getInstance().postcommit.getNotifications();
		assertFalse(notifications == null);
		assertEquals(1, notifications.size());
		Notification notification = notifications.get(0);
		assertSame(domain3.getResourceSet(), notification.getNotifier());
		assertEquals(ResourceSet.RESOURCE_SET__RESOURCES, notification.getFeatureID(null));
		assertEquals(Notification.ADD, notification.getEventType());

		
		// should have gotten events from the read transaction, above
		assertNotNull(TestListener2.getInstance().postcommit);
		List<Notification> notifications = TestListener2.getInstance().postcommitNotifications;
		assertFalse(notifications == null);
		assertEquals(1, notifications.size());
		Notification notification = notifications.get(0);
		assertSame(domain3.getResourceSet(), notification.getNotifier());
		assertEquals(ResourceSet.RESOURCE_SET__RESOURCES, notification.getFeatureID(null));
		assertEquals(Notification.ADD, notification.getEventType());

		notifications = TestListener2.getInstance().postcommitNotifications;
		assertFalse(notifications == null);
		assertEquals(1, notifications.size());
		notification = notifications.get(0);
		assertSame(domain4.getResourceSet(), notification.getNotifier());
		assertEquals(ResourceSet.RESOURCE_SET__RESOURCES, notification.getFeatureID(null));
		assertEquals(Notification.ADD, notification.getEventType());

		
		// should have gotten events from the read transaction, above
		assertNotNull(TestListener3.getInstance().postcommit);
		List<Notification> notifications = TestListener3.getInstance().postcommitNotifications;
		assertFalse(notifications == null);
		assertEquals(1, notifications.size());
		Notification notification = notifications.get(0);
		assertSame(domain3.getResourceSet(), notification.getNotifier());
		assertEquals(ResourceSet.RESOURCE_SET__RESOURCES, notification.getFeatureID(null));
		assertEquals(Notification.ADD, notification.getEventType());

		notifications = TestListener3.getInstance().postcommitNotifications;
		assertFalse(notifications == null);
		assertEquals(1, notifications.size());
		notification = notifications.get(0);
		assertSame(domain4.getResourceSet(), notification.getNotifier());
		assertEquals(ResourceSet.RESOURCE_SET__RESOURCES, notification.getFeatureID(null));
		assertEquals(Notification.ADD, notification.getEventType());

	
	/** Test listener registered against TestDomain3. */
	public static class TestListener1 extends TestListener {
		private static WeakReference<TestListener1> instance;
		
		public TestListener1() {
			instance = new WeakReference<TestListener1>(this);
		}
		
		public static TestListener1 getInstance() {
			return instance == null ? null : instance.get();
		}
	}
	
	/** Test listener registered against TestDomain3. */
	public static class TestListener2 extends TestListener {
		private static WeakReference<TestListener2> instance;
		
		public TestListener2() {
			instance = new WeakReference<TestListener2>(this);
		}
		
		public static TestListener2 getInstance() {
			return instance == null ? null : instance.get();
		}
	}
	
	/** Test listener registered against all domains. */
	public static class TestListener3 extends TestListener {
		private static WeakReference<TestListener3> instance;
		
		public TestListener3() {
			instance = new WeakReference<TestListener3>(this);
		}
		
		public static TestListener3 getInstance() {
			return instance == null ? null : instance.get();
		}
	}
	




package org.eclipse.emf.transaction.tests;

import java.util.Collections;
import java.util.Iterator;
import java.util.List;

import junit.framework.Test;

import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
import org.eclipse.emf.transaction.RollbackException;
import org.eclipse.emf.transaction.RunnableWithResult;
import org.eclipse.emf.transaction.TransactionalCommandStack;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalCommandStack;
import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
import org.eclipse.emf.transaction.internal.EMFTransactionStatusCodes;
import org.eclipse.emf.transaction.tests.fixtures.TestListener;

		
		// check that we got the expected events
		assertNotNull(listener.postcommit);
		List<Notification> notifications = listener.postcommitNotifications;
		assertFalse(notifications.isEmpty());
		
		// look for an event indicating resource was loaded and one indicating

		Notification rootAdded = null;
		Notification resLoaded = null;
		
		for (Notification next : notifications) {
			Notification next = (Notification) iter.next();
			
			if (next.getNotifier() == res) {
				if (next.getFeatureID(null) == Resource.RESOURCE__IS_LOADED) {
					if (next.getNewBooleanValue()) {

		Notification rootRemoved = null;
		Notification resUnloaded = null;
		
		for (Notification next : notifications) {
			Notification next = (Notification) iter.next();
			
			if (next.getNotifier() == res) {
				if (next.getFeatureID(null) == Resource.RESOURCE__IS_LOADED) {
					if (!next.getNewBooleanValue()) {

			}});
		
		try {
			RunnableWithResult<?> rwr = new RunnableWithResult.Impl<Object>() {
				public void run() {
					synchronized (monitor) {
						t.start();

Lines 25-35 Link Here

(-)src/org/eclipse/emf/transaction/tests/MemoryLeakTest.java (-28 / +43 lines)
25	import java.util.List;	25	import java.util.List;
26	import java.util.Map;	26	import java.util.Map;
27		27
		28	import junit.framework.Test;
		29	import junit.framework.TestSuite;
		30
28	import org.eclipse.emf.common.command.Command;	31	import org.eclipse.emf.common.command.Command;
29	import org.eclipse.emf.common.notify.Notification;	32	import org.eclipse.emf.common.notify.Notification;
30	import org.eclipse.emf.common.util.BasicEList;	33	import org.eclipse.emf.common.util.BasicEList;
31	import org.eclipse.emf.ecore.EObject;	34	import org.eclipse.emf.ecore.EObject;
32	import org.eclipse.emf.ecore.EReference;	35	import org.eclipse.emf.ecore.EReference;
		36	import org.eclipse.emf.ecore.change.ChangeDescription;
33	import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;	37	import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
34	import org.eclipse.emf.ecore.util.EcoreUtil;	38	import org.eclipse.emf.ecore.util.EcoreUtil;
35	import org.eclipse.emf.edit.command.CommandParameter;	39	import org.eclipse.emf.edit.command.CommandParameter;
Lines 44-52 Link Here
44	import org.eclipse.emf.transaction.TriggerListener;	48	import org.eclipse.emf.transaction.TriggerListener;
45	import org.eclipse.emf.transaction.util.CompositeChangeDescription;	49	import org.eclipse.emf.transaction.util.CompositeChangeDescription;
46		50
47	import junit.framework.Test;
48	import junit.framework.TestSuite;
49
50		51
51	/**	52	/**
52	* Tests to check for memory leaks.	53	* Tests to check for memory leaks.
Lines 66-73 Link Here
66	* Tests that unloading a resource allows its root(s) to be reclaimed.	67	* Tests that unloading a resource allows its root(s) to be reclaimed.
67	*/	68	*/
68	public void test_unloadResource() {	69	public void test_unloadResource() {
69	ReferenceQueue q = new ReferenceQueue();	70	ReferenceQueue<EObject> q = new ReferenceQueue<EObject>();
70	Reference ref = new WeakReference(root, q);	71	Reference<EObject> ref = new WeakReference<EObject>(root, q);
71		72
72	// make some change, causing a transaction to record a change description	73	// make some change, causing a transaction to record a change description
73	startWriting();	74	startWriting();
Lines 94-101 Link Here
94	* to it and its resource set's contents.	95	* to it and its resource set's contents.
95	*/	96	*/
96	public void test_reclaimEditingDomain() {	97	public void test_reclaimEditingDomain() {
97	ReferenceQueue q = new ReferenceQueue();	98	ReferenceQueue<TransactionalEditingDomain> q =
98	Reference ref = new WeakReference(domain, q);	99	new ReferenceQueue<TransactionalEditingDomain>();
		100	Reference<TransactionalEditingDomain> ref =
		101	new WeakReference<TransactionalEditingDomain>(domain, q);
99		102
100	// make some change, causing a transaction to record a change description	103	// make some change, causing a transaction to record a change description
101	startWriting();	104	startWriting();
Lines 133-139 Link Here
133	root.setName("foo"); //$NON-NLS-1$	136	root.setName("foo"); //$NON-NLS-1$
134		137
135	// now, create 1000 nested transactions, each doing a change, but unrecorded	138	// now, create 1000 nested transactions, each doing a change, but unrecorded
136	Map options = Collections.singletonMap(Transaction.OPTION_UNPROTECTED, Boolean.TRUE);	139	Map<Object, Object> options = Collections.<Object, Object>singletonMap(
		140	Transaction.OPTION_UNPROTECTED, Boolean.TRUE);
		141
137	for (int i = 0; i < 1000; i++) {	142	for (int i = 0; i < 1000; i++) {
138	startWriting(options);	143	startWriting(options);
139		144
Lines 152-158 Link Here
152		157
153	Transaction tx = commit();	158	Transaction tx = commit();
154	CompositeChangeDescription change = (CompositeChangeDescription) tx.getChangeDescription();	159	CompositeChangeDescription change = (CompositeChangeDescription) tx.getChangeDescription();
155	List children = getChildren(change);	160	List<ChangeDescription> children = getChildren(change);
156		161
157	assertEquals(1, children.size());	162	assertEquals(1, children.size());
158		163
Lines 197-206 Link Here
197	assertTrue(level1.eAdapters().contains(xrefAdapter));	202	assertTrue(level1.eAdapters().contains(xrefAdapter));
198		203
199	Command cmd = new RemoveCommand(domain, root, EXTLibraryPackage.Literals.LIBRARY__BRANCHES, level1) {	204	Command cmd = new RemoveCommand(domain, root, EXTLibraryPackage.Literals.LIBRARY__BRANCHES, level1) {
200	public void doDispose() {	205	@Override
		206	public void doDispose() {
201	if (feature instanceof EReference && ((EReference) feature).isContainment()) {	207	if (feature instanceof EReference && ((EReference) feature).isContainment()) {
202	for (Iterator iter = collection.iterator(); iter.hasNext();) {	208	for (Object o : collection) {
203	EObject next = (EObject) iter.next();	209	EObject next = (EObject) o;
204		210
205	// clear adapters on the removed object if it is still removed	211	// clear adapters on the removed object if it is still removed
206	if (next.eContainer() != owner) {	212	if (next.eContainer() != owner) {
Lines 253-259 Link Here
253	assertTrue(level1.eAdapters().contains(xrefAdapter));	259	assertTrue(level1.eAdapters().contains(xrefAdapter));
254		260
255	Command cmd = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$	261	Command cmd = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$
256	protected void doExecute() {	262	@Override
		263	protected void doExecute() {
257	root.getBranches().remove(level1);	264	root.getBranches().remove(level1);
258	}};	265	}};
259		266
Lines 301-310 Link Here
301	assertTrue(level1.eAdapters().contains(xrefAdapter));	308	assertTrue(level1.eAdapters().contains(xrefAdapter));
302		309
303	final Command trigger = new RemoveCommand(domain, root, EXTLibraryPackage.Literals.LIBRARY__BRANCHES, level1) {	310	final Command trigger = new RemoveCommand(domain, root, EXTLibraryPackage.Literals.LIBRARY__BRANCHES, level1) {
304	public void doDispose() {	311	@Override
		312	public void doDispose() {
305	if (feature instanceof EReference && ((EReference) feature).isContainment()) {	313	if (feature instanceof EReference && ((EReference) feature).isContainment()) {
306	for (Iterator iter = collection.iterator(); iter.hasNext();) {	314	for (Object o : collection) {
307	EObject next = (EObject) iter.next();	315	EObject next = (EObject) o;
308		316
309	// clear adapters on the removed object if it is still removed	317	// clear adapters on the removed object if it is still removed
310	if (next.eContainer() != owner) {	318	if (next.eContainer() != owner) {
Lines 317-323 Link Here
317	}};	325	}};
318		326
319	domain.addResourceSetListener(new TriggerListener() {	327	domain.addResourceSetListener(new TriggerListener() {
320	protected Command trigger(TransactionalEditingDomain domain,	328	@Override
		329	protected Command trigger(TransactionalEditingDomain domain,
321	Notification notification) {	330	Notification notification) {
322	// trigger on the name change only	331	// trigger on the name change only
323	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {	332	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {
Lines 372-383 Link Here
372	assertTrue(level1.eAdapters().contains(xrefAdapter));	381	assertTrue(level1.eAdapters().contains(xrefAdapter));
373		382
374	final Command trigger = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$	383	final Command trigger = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$
375	protected void doExecute() {	384	@Override
		385	protected void doExecute() {
376	root.getBranches().remove(level1);	386	root.getBranches().remove(level1);
377	}};	387	}};
378		388
379	domain.addResourceSetListener(new TriggerListener() {	389	domain.addResourceSetListener(new TriggerListener() {
380	protected Command trigger(TransactionalEditingDomain domain,	390	@Override
		391	protected Command trigger(TransactionalEditingDomain domain,
381	Notification notification) {	392	Notification notification) {
382	// trigger on the name change only	393	// trigger on the name change only
383	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {	394	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {
Lines 427-440 Link Here
427	return result;	438	return result;
428	}	439	}
429		440
430	static List getChildren(CompositeChangeDescription compositeChange) {	441	@SuppressWarnings("unchecked")
431	List result = null;	442	static List<ChangeDescription> getChildren(CompositeChangeDescription compositeChange) {
		443	List<ChangeDescription> result = null;
432		444
433	try {	445	try {
434	Field children = compositeChange.getClass().getDeclaredField("changes"); //$NON-NLS-1$	446	Field children = compositeChange.getClass().getDeclaredField("changes"); //$NON-NLS-1$
435	children.setAccessible(true);	447	children.setAccessible(true);
436		448
437	result = (List) children.get(compositeChange);	449	result = (List<ChangeDescription>) children.get(compositeChange);
438	} catch (Exception e) {	450	} catch (Exception e) {
439	e.printStackTrace();	451	e.printStackTrace();
440	fail(e.getLocalizedMessage());	452	fail(e.getLocalizedMessage());
Lines 444-462 Link Here
444	}	456	}
445		457
446	private static class TransactionSniffer extends ResourceSetListenerImpl {	458	private static class TransactionSniffer extends ResourceSetListenerImpl {
447	private TransactionalEditingDomain domain;	459	private final TransactionalEditingDomain domain;
448	private List changes = new BasicEList.FastCompare();	460	private final List<ChangeDescription> changes =
		461	new BasicEList.FastCompare<ChangeDescription>();
449		462
450	TransactionSniffer(TransactionalEditingDomain domain) {	463	TransactionSniffer(TransactionalEditingDomain domain) {
451	this.domain = domain;	464	this.domain = domain;
452	domain.addResourceSetListener(this);	465	domain.addResourceSetListener(this);
453	}	466	}
454		467
455	public boolean isPostcommitOnly() {	468	@Override
		469	public boolean isPostcommitOnly() {
456	return true;	470	return true;
457	}	471	}
458		472
459	public void resourceSetChanged(ResourceSetChangeEvent event) {	473	@Override
		474	public void resourceSetChanged(ResourceSetChangeEvent event) {
460	Transaction tx = event.getTransaction();	475	Transaction tx = event.getTransaction();
461		476
462	if ((tx != null) && (tx.getChangeDescription()) != null) {	477	if ((tx != null) && (tx.getChangeDescription()) != null) {
Lines 468-475 Link Here
468	// stop listening, now	483	// stop listening, now
469	domain.removeResourceSetListener(this);	484	domain.removeResourceSetListener(this);
470		485
471	for (Iterator iter = EcoreUtil.getAllContents(changes); iter.hasNext();) {	486	for (Iterator<EObject> iter = EcoreUtil.getAllContents(changes); iter.hasNext();) {
472	EObject next = (EObject) iter.next();	487	EObject next = iter.next();
473	assertEquals("Adapters not cleared.", 0, next.eAdapters().size()); //$NON-NLS-1$	488	assertEquals("Adapters not cleared.", 0, next.eAdapters().size()); //$NON-NLS-1$
474	}	489	}
475	}	490	}

Lines 1-7 Link Here

(-)src/org/eclipse/emf/transaction/tests/PerformanceTest.java (-29 / +43 lines)
1	/**	1	/**
2	* <copyright>	2	* <copyright>
3	*	3	*
4	* Copyright (c) 2006 IBM Corporation and others.	4	* Copyright (c) 2006, 2007 IBM Corporation and others.
5	* All rights reserved. This program and the accompanying materials	5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0	6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at	7	* which accompanies this distribution, and is available at
Lines 23-28 Link Here
23	import java.util.List;	23	import java.util.List;
24	import java.util.Map;	24	import java.util.Map;
25		25
		26	import junit.framework.Test;
		27	import junit.framework.TestSuite;
		28
26	import org.eclipse.emf.common.command.Command;	29	import org.eclipse.emf.common.command.Command;
27	import org.eclipse.emf.common.command.CompoundCommand;	30	import org.eclipse.emf.common.command.CompoundCommand;
28	import org.eclipse.emf.common.util.EList;	31	import org.eclipse.emf.common.util.EList;
Lines 39-47 Link Here
39	import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;	42	import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
40	import org.eclipse.emf.transaction.tests.fixtures.TestCommand;	43	import org.eclipse.emf.transaction.tests.fixtures.TestCommand;
41		44
42	import junit.framework.Test;
43	import junit.framework.TestSuite;
44
45		45
46	/**	46	/**
47	* Regression tests for performance problems (time and memory).	47	* Regression tests for performance problems (time and memory).
Lines 52-61 Link Here
52	static final int RUNS = 10;	52	static final int RUNS = 10;
53	static final int OUTLIERS = 2; // room for 1 high and 1 low outlier	53	static final int OUTLIERS = 2; // room for 1 high and 1 low outlier
54		54
55	private List timings;	55	private List<Long> timings;
56	private long clock;	56	private long clock;
57		57
58	private int count = RUNS + OUTLIERS;	58	private final int count = RUNS + OUTLIERS;
59		59
60	public PerformanceTest(String name) {	60	public PerformanceTest(String name) {
61	super(name);	61	super(name);
Lines 95-100 Link Here
95		95
96	// add a listener to incur the cost of broadcasting pre- and post-commit	96	// add a listener to incur the cost of broadcasting pre- and post-commit
97	ResourceSetListener listener = new ResourceSetListenerImpl() {	97	ResourceSetListener listener = new ResourceSetListenerImpl() {
		98	@Override
98	public Command transactionAboutToCommit(ResourceSetChangeEvent event)	99	public Command transactionAboutToCommit(ResourceSetChangeEvent event)
99	throws RollbackException {	100	throws RollbackException {
100	CompoundCommand result = null;	101	CompoundCommand result = null;
Lines 107-127 Link Here
107	// only create a command on the first transaction	108	// only create a command on the first transaction
108	result = new CompoundCommand();	109	result = new CompoundCommand();
109		110
110	for (Iterator iter = event.getNotifications().iterator(); iter.hasNext();) {	111	for (Iterator<?> iter = event.getNotifications().iterator(); iter.hasNext();) {
111	iter.next();	112	iter.next();
112		113
113	precommitEvents[0]++;	114	precommitEvents[0]++;
114		115
115	result.append(new TestCommand() {	116	result.append(new TestCommand() {
116	public void execute() {}});	117	public void execute() {/* nothing to do */}});
117	}	118	}
118	}	119	}
119		120
120	return result;	121	return result;
121	}	122	}
122		123
		124	@Override
123	public void resourceSetChanged(ResourceSetChangeEvent event) {	125	public void resourceSetChanged(ResourceSetChangeEvent event) {
124	for (Iterator iter = event.getNotifications().iterator(); iter.hasNext();) {	126	for (Iterator<?> iter = event.getNotifications().iterator(); iter.hasNext();) {
125	iter.next();	127	iter.next();
126		128
127	// do a trivial amount of work	129	// do a trivial amount of work
Lines 132-138 Link Here
132		134
133	domain.addResourceSetListener(listener);	135	domain.addResourceSetListener(listener);
134		136
135	Map options = new java.util.HashMap();	137	Map<Object, Object> options = new java.util.HashMap<Object, Object>();
136	// options.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);	138	// options.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);
137	// options.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);	139	// options.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);
138	// options.put(Transaction.OPTION_NO_VALIDATION, Boolean.TRUE);	140	// options.put(Transaction.OPTION_NO_VALIDATION, Boolean.TRUE);
Lines 190-220 Link Here
190	final int[] receivedValidationNotifications = new int[1];	192	final int[] receivedValidationNotifications = new int[1];
191		193
192	ResourceSetListener prePostCommitCollector = new ResourceSetListenerImpl() {	194	ResourceSetListener prePostCommitCollector = new ResourceSetListenerImpl() {
		195	@Override
193	public NotificationFilter getFilter() {	196	public NotificationFilter getFilter() {
194	return NotificationFilter.ANY;	197	return NotificationFilter.ANY;
195	}	198	}
196		199
		200	@Override
197	public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {	201	public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
198	receivedPrecommitNotifications[0] += event.getNotifications().size();	202	receivedPrecommitNotifications[0] += event.getNotifications().size();
199	return null;	203	return null;
200	}	204	}
201		205
		206	@Override
202	public void resourceSetChanged(ResourceSetChangeEvent event) {	207	public void resourceSetChanged(ResourceSetChangeEvent event) {
203	receivedPostcommitNotifications[0] = event.getNotifications().size();	208	receivedPostcommitNotifications[0] = event.getNotifications().size();
204	}};	209	}};
205	domain.addResourceSetListener(prePostCommitCollector);	210	domain.addResourceSetListener(prePostCommitCollector);
206	ResourceSetListener validationCollector = new ResourceSetListenerImpl() {	211	ResourceSetListener validationCollector = new ResourceSetListenerImpl() {
		212	@Override
207	public NotificationFilter getFilter() {	213	public NotificationFilter getFilter() {
208	return NotificationFilter.ANY;	214	return NotificationFilter.ANY;
209	}	215	}
210		216
		217	@Override
211	public boolean isPrecommitOnly() {	218	public boolean isPrecommitOnly() {
212	return true;	219	return true;
213	}	220	}
		221	@Override
214	public boolean isAggregatePrecommitListener() {	222	public boolean isAggregatePrecommitListener() {
215	return true;	223	return true;
216	}	224	}
217		225
		226	@Override
218	public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {	227	public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
219	receivedValidationNotifications[0] =	228	receivedValidationNotifications[0] =
220	((InternalTransactionalEditingDomain) domain).getValidator()	229	((InternalTransactionalEditingDomain) domain).getValidator()
Lines 270-284 Link Here
270	// Fixture methods	279	// Fixture methods
271	//	280	//
272		281
		282	@Override
273	protected void doSetUp() throws Exception {	283	protected void doSetUp() throws Exception {
274	super.doSetUp();	284	super.doSetUp();
275		285
276	System.out.println("Performance test: " + getName()); //$NON-NLS-1$	286	System.out.println("Performance test: " + getName()); //$NON-NLS-1$
277	System.out.println("==============================="); //$NON-NLS-1$	287	System.out.println("==============================="); //$NON-NLS-1$
278		288
279	timings = new java.util.ArrayList();	289	timings = new java.util.ArrayList<Long>();
280	}	290	}
281		291
		292	@Override
282	protected void doTearDown() throws Exception {	293	protected void doTearDown() throws Exception {
283	removeOutliers();	294	removeOutliers();
284		295
Lines 343-353 Link Here
343		354
344	protected void addLibraryWithBooks(Date today) {	355	protected void addLibraryWithBooks(Date today) {
345	Library lib = EXTLibraryFactory.eINSTANCE.createLibrary();	356	Library lib = EXTLibraryFactory.eINSTANCE.createLibrary();
346	EList branches = lib.getBranches();	357	EList<Library> branches = lib.getBranches();
347		358
348	for (int j = 0; j < 20; j++) {	359	for (int j = 0; j < 20; j++) {
349	Library branch = EXTLibraryFactory.eINSTANCE.createLibrary();	360	Library branch = EXTLibraryFactory.eINSTANCE.createLibrary();
350	EList books = branch.getBooks();	361	EList<Book> books = branch.getBooks();
351		362
352	for (int i = 0; i < 10; i++) {	363	for (int i = 0; i < 10; i++) {
353	Book book = EXTLibraryFactory.eINSTANCE.createBook();	364	Book book = EXTLibraryFactory.eINSTANCE.createBook();
Lines 452-470 Link Here
452	root.setName(Long.toString(System.currentTimeMillis() ^ root.getName().hashCode()));	463	root.setName(Long.toString(System.currentTimeMillis() ^ root.getName().hashCode()));
453	}	464	}
454		465
455	private static Map allNotifications;	466	private static Map<Object, Object> allNotifications;
456	private static Map noTriggers;	467	private static Map<Object, Object> noTriggers;
457	private static Map validationOnly;	468	private static Map<Object, Object> validationOnly;
458	private static Map noNotifications;	469	private static Map<Object, Object> noNotifications;
459	static {	470	static {
460	allNotifications = Collections.EMPTY_MAP;	471	allNotifications = Collections.emptyMap();
461	noTriggers = Collections.singletonMap(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);	472	noTriggers = Collections.<Object, Object>singletonMap(
462	validationOnly = new java.util.HashMap(noTriggers);	473	Transaction.OPTION_NO_TRIGGERS, true);
463	validationOnly.put(Transaction.OPTION_NO_NOTIFICATIONS, Boolean.TRUE);	474	validationOnly = new java.util.HashMap<Object, Object>(noTriggers);
464	noNotifications = new java.util.HashMap(validationOnly);	475	validationOnly.put(Transaction.OPTION_NO_NOTIFICATIONS, true);
465	noNotifications.put(Transaction.OPTION_NO_VALIDATION, Boolean.TRUE);	476	noNotifications = new java.util.HashMap<Object, Object>(validationOnly);
		477	noNotifications.put(Transaction.OPTION_NO_VALIDATION, true);
466	}	478	}
467	private Map getOptions(boolean trigger, boolean notify, boolean validate) {	479	private Map<Object, Object> getOptions(boolean trigger, boolean notify,
		480	boolean validate) {
		481
468	if (!trigger) {	482	if (!trigger) {
469	if (!notify) {	483	if (!notify) {
470	if (!validate) {	484	if (!validate) {
Lines 487-493 Link Here
487	final long stopClock() {	501	final long stopClock() {
488	long result = System.currentTimeMillis() - clock;	502	long result = System.currentTimeMillis() - clock;
489		503
490	timings.add(new Long(result));	504	timings.add(result);
491		505
492	return result;	506	return result;
493	}	507	}
Lines 506-515 Link Here
506	int count = timings.size();	520	int count = timings.size();
507		521
508	for (int i = 0; i < count; i++) {	522	for (int i = 0; i < count; i++) {
509	result += ((Long) timings.get(i)).doubleValue();	523	result += timings.get(i).doubleValue();
510	}	524	}
511		525
512	result /= (double) count;	526	result /= count;
513		527
514	return result;	528	return result;
515	}	529	}
Lines 521-532 Link Here
521	int count = timings.size();	535	int count = timings.size();
522		536
523	for (int i = 0; i < count; i++) {	537	for (int i = 0; i < count; i++) {
524	dev = ((Long) timings.get(i)).doubleValue() - mean;	538	dev = timings.get(i).doubleValue() - mean;
525		539
526	result += dev * dev;	540	result += dev * dev;
527	}	541	}
528		542
529	result = Math.sqrt(result / (double) count);	543	result = Math.sqrt(result / count);
530		544
531	return result;	545	return result;
532	}	546	}




 */
package org.eclipse.emf.transaction.tests;

import java.util.Iterator;
import java.util.Set;

import junit.framework.Test;

		commit();
		
		Command cmd = new RecordingCommand(domain) {
			@Override
			protected void doExecute() {
				book.setTitle(newTitle);
				newAuthor.getBooks().add(book);

		
		assertSame(root, newLibrary.eContainer());
		assertEquals(1, newLibrary.getBooks().size());
		Book book = newLibrary.getBooks().get(0);
		assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
		assertNotNull(book.getPublicationDate());
		

		
		assertSame(root, newLibrary.eContainer());
		assertEquals(1, newLibrary.getBooks().size());
		book = newLibrary.getBooks().get(0);
		assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
		assertNotNull(book.getPublicationDate());
		

		final Library newLibrary = EXTLibraryFactory.eINSTANCE.createLibrary();
		
		Command cmd = new RecordingCommand(domain) {
			@Override
			protected void doExecute() {
				// add a new library.  Our triggers will set a default name and book
				root.getBranches().add(newLibrary);

		
		assertSame(root, newLibrary.eContainer());
		assertEquals(1, newLibrary.getBooks().size());
		Book book = newLibrary.getBooks().get(0);
		assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
		assertNotNull(book.getPublicationDate());
		

		
		assertSame(root, newLibrary.eContainer());
		assertEquals(1, newLibrary.getBooks().size());
		book = newLibrary.getBooks().get(0);
		assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
		assertNotNull(book.getPublicationDate());
		

			void reset() { count = 0; }
			
			public void execute() { reset(); }
			@Override
			public void undo() { assertEquals(1, ++count); }
			@Override
			public void redo() { assertEquals(1, ++count); }
		}
		
		final Set<CountingCommand> countingCommands =
			new java.util.HashSet<CountingCommand>();
		
		// add the trigger to create a default book in a new library, combined
		//    with a counting command
		domain.addResourceSetListener(new LibraryDefaultBookTrigger() {
			@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
				Command result = super.trigger(domain, notification);
				

		// add another trigger that will set default publication dates for new
		//    items, combined with a counting command
		domain.addResourceSetListener(new ItemDefaultPublicationDateTrigger() {
			@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
				Command result = super.trigger(domain, notification);
				

		
		commit();
		
		for (CountingCommand next : countingCommands) {
			next.reset();
		}
		
		startWriting();

		
		commit();
		
		for (CountingCommand next : countingCommands) {
			next.reset();
		}
		
		startWriting();

		
		commit();
		
		for (CountingCommand next : countingCommands) {
			next.reset();
		}
	}
	

				// nothing to do
			}
		
			@Override
			public boolean canRedo() {
				return false;
			}};

	public void test_nonredoableTriggerCommand_138287() {
		// add a trigger command that is not redoable
		domain.addResourceSetListener(new TriggerListener() {
			@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
				return new TestCommand.Redoable() {
					public void execute() {
						// nothing to do
					}
				
					@Override
					public boolean canRedo() {
						return false;
					}};

	public void test_nonredoableTriggerCommands() {
		// add a trigger command that is not redoable
		domain.addResourceSetListener(new TriggerListener() {
			@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
				return new TestCommand.Redoable() {
					public void execute() {
						// nothing to do
					}
				
					@Override
					public boolean canRedo() {
						return false;
					}};

		
		// add a trigger command that is not redoable
		domain.addResourceSetListener(new TriggerListener() {
			@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
				return new TestCommand.Redoable() {
					public void execute() {
						// nothing to do
					}
				
					@Override
					public boolean canRedo() {
						return false;
					}};

	public void test_nonredoableTriggerCommand_RecordingCommand_138287() {
		// add a trigger command that is not redoable
		domain.addResourceSetListener(new TriggerListener() {
			@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
				return new TestCommand.Redoable() {
					public void execute() {
						// nothing to do
					}
				
					@Override
					public boolean canRedo() {
						return false;
					}};

		
		// this command *is* implicitly redoable; it is the trigger that is not
		RecordingCommand cmd = new RecordingCommand(domain) {
			@Override
			protected void doExecute() {
				// add a new library, just to record some change
				root.getBranches().add(newLibrary);

	// Fixture methods
	//
	
	@Override
	protected void doSetUp()
		throws Exception {
		

		ValidationRollbackTest.validationEnabled = true;
	}
	
	@Override
	protected void doTearDown()
		throws Exception {
		




import java.io.InputStream;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;

	protected static final String PROJECT_NAME = "emftxtests"; //$NON-NLS-1$
	protected static final String RESOURCE_NAME = "/" + PROJECT_NAME + "/testres.extlibrary";  //$NON-NLS-1$//$NON-NLS-2$

	private final List<InternalTransaction> transactionStack =
		new java.util.ArrayList<InternalTransaction>();
    
    private List<Runnable> tearDownActions;
	
	public AbstractTest() {
		super();

	// Test configuration methods
	//
	
	@Override
	protected final void setUp()
		throws Exception {
		

				URI.createURI(EmfTransactionTestsBundle.getEntry(
					"/test_models/test_model.extlibrary").toString()), //$NON-NLS-1$
					true);
			originalRes.setURI(URI.createPlatformResourceURI(RESOURCE_NAME, true));
			originalRes.save(Collections.EMPTY_MAP);
			testResource = originalRes;
			root = (Library) find("root"); //$NON-NLS-1$

     */
    protected final void addTearDownAction(Runnable action) {
        if (tearDownActions == null) {
            tearDownActions = new java.util.ArrayList<Runnable>();
        }
        
        tearDownActions.add(action);
    }
    
	@Override
	protected final void tearDown()
		throws Exception {
		

    
    private void processTearDownActions() {
        if (tearDownActions != null) {
            for (Runnable action : tearDownActions) {
                try {
                    Runnable action = (Runnable) iter.next();
                    action.run();
                } catch (Exception e) {
                    System.err.println("Exception in tear-down action:"); //$NON-NLS-1$

			file.create(input, true, null);
			
			result = domain.createResource(
				URI.createPlatformResourceURI(file.getFullPath().toString(), true).toString());
		} catch (Exception e) {
			e.printStackTrace();
			fail("Exception creating test resource: " + e.getLocalizedMessage()); //$NON-NLS-1$

			String name = names[i];
			result = null;
			
			for (EObject child : getContents(current)) {
				EObject child = (EObject) iter.next();
				
				if (name.equals(getName(child))) {
					result = child;
					break;

	 * @return its name
	 */
	protected String getName(EObject object) {
		return GetName.INSTANCE.doSwitch(object);
	}
	
	/**

	 * @param object an object, which may be a resource or an element
	 * @return its immediate contents (children)
	 */
	private List<EObject> getContents(Object object) {
		if (object instanceof EObject) {
			return ((EObject) object).eContents();
		} else if (object instanceof Resource) {
			return ((Resource) object).getContents();
		} else {
			return Collections.emptyList();
		}
	}
	

	 *
	 * @author Christian W. Damus (cdamus)
	 */
	private static final class GetName extends EXTLibrarySwitch<String> {
		static final GetName INSTANCE = new GetName();
		
		private GetName() {

			return object.getTitle();
		}

		@Override
		public String caseBook(Book object) {
			return object.getTitle();
		}

		@Override
		public String caseLibrary(Library object) {
			return object.getName();
		}

		@Override
		public String casePeriodical(Periodical object) {
			return object.getTitle();
		}
		
		@Override
		public String caseWriter(Writer object) {
			return object.getName();
		}

		@Override
		public String casePerson(Person object) {
			if (object.getFirstName() == null) {
				if (object.getLastName() == null) {
					return ""; //$NON-NLS-1$

			}
		}

		@Override
		public String defaultCase(EObject object) {
			return ""; //$NON-NLS-1$
		}
	}

	 * 
	 * @param options the options
	 */
	protected void startWriting(Map<?, ?> options) {
		try {
			transactionStack.add(
					((InternalTransactionalEditingDomain) domain).startTransaction(false, options));

	 * 
	 * @param options the options
	 */
	protected void startReading(Map<?, ?> options) {
		try {
			transactionStack.add(
					((InternalTransactionalEditingDomain) domain).startTransaction(true, options));

		Transaction result = null;
		
		try {
			result = transactionStack.remove(transactionStack.size() - 1);
			result.commit();
		} catch (Exception e) {
			fail(e);

		Transaction result = null;
		
		try {
			result = transactionStack.remove(transactionStack.size() - 1);
			result.rollback();
		} catch (Exception e) {
			fail(e);

	 * 
	 * @return the map
	 */
	protected Map<Object, Object> makeOptions(String option) {
		return Collections.<Object, Object>singletonMap(option, true);
	}
	
	/**

	 * 
	 * @return the matching statuses, or an empty collection if none found
	 */
	protected Collection<IStatus> findValidationStatuses(IStatus status, int severity) {
		Set<IStatus> result;
		
		if (status.isMultiStatus()) {
			result = new java.util.HashSet<IStatus>();
			IStatus[] children = status.getChildren();
			
			for (IStatus element : children) {
				result.addAll(findValidationStatuses(element, severity));
			}
		} else if ((status instanceof IConstraintStatus)
				&& (status.matches(severity))) {
			result = Collections.singleton(status);
		} else {
			result = Collections.emptySet();
		}
		
		return result;




	 */
	public void test_rollbackNestingTransactionOnException_135673() {
		Command command = new RecordingCommand(domain, "") { //$NON-NLS-1$
			@Override
			public boolean canUndo() { return true; }
			@Override
			protected void doExecute() {
				// start some nested transactions
				try {

        final Error error = new Error();
        
        ResourceSetListener testListener = new DemultiplexingListener() {
            @Override
			protected void handleNotification(TransactionalEditingDomain domain, Notification notification) {
            	throw error;
            }};
        

            
            try {
                domain.getCommandStack().execute(new RecordingCommand(domain) {
                    @Override
					protected void doExecute() {
                        root.getWriters().clear();
                        root.getStock().clear();
                        root.getBranches().clear();

        final RuntimeException error = new RuntimeException();
        
        ResourceSetListener testListener = new TriggerListener() {
        	@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
        		return new RecordingCommand(domain, "Error") { //$NON-NLS-1$
        			@Override
					protected void doExecute() {
        				throw error;
        			}};
        	}};

            domain.addResourceSetListener(testListener);
            
            domain.getCommandStack().execute(new RecordingCommand(domain) {
                @Override
				protected void doExecute() {
                    root.getWriters().clear();
                    root.getStock().clear();
                    root.getBranches().clear();

        final RuntimeException error = new OperationCanceledException();
        
        ResourceSetListener testListener = new TriggerListener() {
        	@Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
        		return new RecordingCommand(domain, "Error") { //$NON-NLS-1$
        			@Override
					protected void doExecute() {
        				throw error;
        			}};
        	}};

            domain.addResourceSetListener(testListener);
            
            domain.getCommandStack().execute(new RecordingCommand(domain) {
                @Override
				protected void doExecute() {
                    root.getWriters().clear();
                    root.getStock().clear();
                    root.getBranches().clear();

        final Book book = (Book) find("root/Root Book"); //$NON-NLS-1$
        assertNotNull(book);
        Command command = new RecordingCommand(domain) {
            @Override
			protected void doExecute() {
                book.setTitle("New Title"); //$NON-NLS-1$
                throw new NullPointerException();
            }};

            
            xa.rollback();
            
            List<Notification> notifications = l.postcommitNotifications;
            
            // check that rollback worked
            startReading();

            
            xa.rollback();
            
            List<Notification> notifications = l.postcommitNotifications;
            
            // check that rollback worked
            startReading();

	// Fixture methods
	//
	
	@Override
	protected void doSetUp()
		throws Exception {
		

		validationEnabled = true;
	}
	
	@Override
	protected void doTearDown()
		throws Exception {
		




import org.eclipse.core.runtime.IStatus;
import org.eclipse.core.runtime.Status;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.emf.examples.extlibrary.Book;
import org.eclipse.emf.transaction.RollbackException;
import org.eclipse.emf.transaction.Transaction;

    
    private Book book;
    
    private final Command setTitle = new TestCommand() {
        @Override
		public boolean canExecute() {
            // command isn't executable if owner's resource is read-only
            return true; 
        }

            }
        }};
    
    private final Command clearTitle = new TestCommand() {
        @Override
		public boolean canExecute() {
            // command isn't executable if owner's resource is read-only
            return true; 
        }

        final boolean[] token = new boolean[1];
        
        setValidateEdit(new ValidateEditSupport.Default() {
            @Override
			protected IStatus doValidateEdit(Transaction transaction,
                    Collection<? extends Resource> resources, Object context) {
                token[0] = true;
                return Status.CANCEL_STATUS;
            }});

	// Fixture methods
	//
	
	@Override
	protected void doSetUp()
		throws Exception {
		

        assertNotNull(book);
	}
	
	@Override
	protected void doTearDown()
		throws Exception {
		

	}
	
	void setValidateEdit(Object optionValue) {
        TransactionalEditingDomain.DefaultOptions defaults = TransactionUtil
            .getAdapter(domain, TransactionalEditingDomain.DefaultOptions.class);
        
        defaults.setDefaultTransactionOptions(Collections.singletonMap(




			assertFalse(listener.postcommit.getTransaction().isActive());
			assertSame(domain, listener.postcommit.getEditingDomain());
			
			List<Notification> notifications = listener.postcommitNotifications;
			assertNotNull(notifications);
			assertEquals(1, notifications.size());
			
			Notification notification = notifications.get(0);
			assertSame(book, notification.getNotifier());
			assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());
			assertSame(newTitle, notification.getNewValue());

			assertFalse(listener.postcommit.getTransaction().isActive());
			assertSame(domain, listener.postcommit.getEditingDomain());
			
			List<Notification> notifications = listener.postcommitNotifications;
			assertNotNull(notifications);
			assertEquals(1, notifications.size());
			
			Notification notification = notifications.get(0);
			assertSame(book, notification.getNotifier());
			assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());
			assertSame(newTitle, notification.getNewValue());

			assertFalse(listener.postcommit.getTransaction().isActive());
			assertSame(domain, listener.postcommit.getEditingDomain());
			
			List<Notification> notifications = listener.postcommitNotifications;
			assertNotNull(notifications);
			assertEquals(3, notifications.size());
			
			Notification notification = notifications.get(0);
			assertSame(book, notification.getNotifier());
			assertSame(EXTLibraryPackage.eINSTANCE.getBook_Category(), notification.getFeature());
			assertSame(BookCategory.BIOGRAPHY_LITERAL, notification.getNewValue());
			
			notification = notifications.get(1);
			assertSame(book, notification.getNotifier());
			assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());
			assertSame(newTitle, notification.getNewValue());
			
			notification = notifications.get(2);
			assertSame(book, notification.getNotifier());
			assertSame(EXTLibraryPackage.eINSTANCE.getBook_Pages(), notification.getFeature());
			assertEquals(new Integer(500), notification.getNewValue());

		commit();
		
		TestListener testListener = new TestListener() {
			@Override
			public void resourceSetChanged(ResourceSetChangeEvent event) {
				try {
					// can execute read operations

			assertFalse(listener.precommit.getTransaction().isActive());
			assertSame(domain, listener.precommit.getEditingDomain());
			
			List<Notification> notifications = listener.precommitNotifications;
			assertNotNull(notifications);
			assertEquals(1, notifications.size());
			
			Notification notification = notifications.get(0);
			assertSame(book, notification.getNotifier());
			assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());
			assertSame(newTitle, notification.getNewValue());

						assertFalse(listener.precommit.getTransaction().isActive());
						assertSame(domain, listener.precommit.getEditingDomain());
						
						List<Notification> notifications = listener.precommitNotifications;
						assertNotNull(notifications);
						assertEquals(1, notifications.size());
						
						Notification notification = notifications.get(0);
						assertSame(book, notification.getNotifier());
						assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());
						assertSame(newTitle, notification.getNewValue());

			assertFalse(listener.precommit.getTransaction().isActive());
			assertSame(domain, listener.precommit.getEditingDomain());
			
			List<Notification> notifications = listener.precommitNotifications;
			assertNotNull(notifications);
			assertEquals(1, notifications.size());
			
			Notification notification = notifications.get(0);
			assertSame(book, notification.getNotifier());
			assertSame(EXTLibraryPackage.eINSTANCE.getBook_Category(), notification.getFeature());
			assertSame(BookCategory.BIOGRAPHY_LITERAL, notification.getNewValue());

		commit();
		
		TestListener testListener = new TestListener() {
			@Override
			public Command transactionAboutToCommit(ResourceSetChangeEvent event) {
				try {
					// can execute read operations

		commit();
		
		TestListener testListener = new TestListener() {
			@Override
			public Command transactionAboutToCommit(ResourceSetChangeEvent event) {
				try {
					// cannot commit the transaction while it is committing

		
		assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$
		assertEquals(1, newLibrary.getBooks().size());
		assertEquals("New Book", newLibrary.getBooks().get(0).getTitle()); //$NON-NLS-1$
		
		commit();
	}

		
		// the book is created by the first trigger
		assertEquals(1, newLibrary.getBooks().size());
		Book book = newLibrary.getBooks().get(0);
		assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
		
		// the publication date is created by the cascaded trigger

			
			assertNotNull(listener.postcommit);
			
			List<Notification> notifications = listener.postcommitNotifications;
			assertNotNull(notifications);
			
			// unbatched notifications are always singletons
			assertEquals(1, notifications.size());
			
			Notification notification = notifications.get(0);
			assertSame(domain.getResourceSet(), notification.getNotifier());
			assertEquals(Notification.ADD, notification.getEventType());
			assertEquals(ResourceSet.RESOURCE_SET__RESOURCES, notification.getFeatureID(null));

		try {
			class Listener extends ResourceSetListenerImpl {
				ResourceSetChangeEvent lastEvent = null;
				List<Notification> lastNotifications = null;
				int count = 0;
				
				@Override
				public void resourceSetChanged(ResourceSetChangeEvent event) {
					count++;
					

		final Resource[] newRes = new Resource[1];
		
		TestListener testListener = new TestListener() {
			@Override
			public void resourceSetChanged(ResourceSetChangeEvent event) {
				// make sure that I only do this on the first time that I
				//    am invoked (from the new library notification)

			//     caused more notifications to the listeners)
			assertNotNull(listener.postcommit);
			
			List<Notification> notifications = listener.postcommitNotifications;
			assertNotNull(notifications);
			
			// unbatched notifications are always singletons
			assertEquals(1, notifications.size());
			
			Notification notification = notifications.get(0);
			assertSame(domain.getResourceSet(), notification.getNotifier());
			assertEquals(Notification.ADD, notification.getEventType());
			assertEquals(ResourceSet.RESOURCE_SET__RESOURCES, notification.getFeatureID(null));

			class AggregatedListener extends TestListener {
				int count = 0;
				
				@Override
				public Command transactionAboutToCommit(ResourceSetChangeEvent event)
					throws RollbackException {
					

					return super.transactionAboutToCommit(event);
				}
				
				@Override
				public void reset() {
					super.reset();
					
					count = 0;
				}
				
				@Override
				public boolean isAggregatePrecommitListener() {
					return true;
				}

			assertNotNull(localListener.precommit.getTransaction());
			assertEquals(1, localListener.count);
			
			List<Notification> notifications = localListener.precommitNotifications;
			assertNotNull(notifications);
			assertEquals(2, notifications.size());
			
			// notifications came in the right order
			Notification notification = notifications.get(0);
			assertSame(book, notification.getNotifier());
			assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());
			assertSame(newTitle1, notification.getNewValue());
			
			notification = notifications.get(1);
			assertSame(book, notification.getNotifier());
			assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());
			assertSame(newTitle2, notification.getNewValue());

			class AggregatedListener extends TestListener {
				int count = 0;
				
				@Override
				public Command transactionAboutToCommit(ResourceSetChangeEvent event)
					throws RollbackException {
					

					super.transactionAboutToCommit(event);
					
					if (count < 2) {
						List<Notification> notifications = event.getNotifications();
						assertNotNull(notifications);
						assertEquals(1, notifications.size());
						
						Notification notification = notifications.get(0);
						assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());
						assertSame(newTitle1, notification.getNewValue());
						

					return null;
				}
				
				@Override
				public void reset() {
					super.reset();
					
					count = 0;
				}
				
				@Override
				public boolean isAggregatePrecommitListener() {
					return true;
				}

			assertNotNull(localListener.precommit.getTransaction());
			assertEquals(2, localListener.count);
			
			List<Notification> notifications = localListener.precommitNotifications;
			assertNotNull(notifications);
			assertEquals(1, notifications.size());
			
			Notification notification = notifications.get(0);
			assertSame(book, notification.getNotifier());
			assertSame(EXTLibraryPackage.eINSTANCE.getBook_Title(), notification.getFeature());
			assertSame(newTitle2, notification.getNewValue());

		class ResourceListener extends DemultiplexingListener {
			boolean wasCalled;
			
			@Override
			protected void handleNotification(TransactionalEditingDomain domain, Notification notification) {
				wasCalled = true;
			}

				interestingBook = book;
			}
			
			@Override
			protected void handleNotification(TransactionalEditingDomain domain, Notification notification) {
				Object notifier = notification.getNotifier();
				

				interestingBook = book;
			}
			
			@Override
			protected void handleNotification(TransactionalEditingDomain domain, Notification notification) {
				Object notifier = notification.getNotifier();
				

				interestingBook = book;
			}
			
			@Override
			protected void handleNotification(TransactionalEditingDomain domain, Notification notification) {
				Object notifier = notification.getNotifier();
				

				interestingBook = book;
			}
			
			@Override
			protected void handleNotification(TransactionalEditingDomain domain, Notification notification) {
				Object notifier = notification.getNotifier();
				

    public void test_recordingCommandsAsTriggers_bug157103() {
        // one trigger sets default library names
        domain.addResourceSetListener(new LibraryDefaultNameTrigger() {
            @Override
			protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
                Command result = null;
                
                final Library newLibrary = (Library) notification.getNewValue();
                if ((newLibrary.getName() == null) || (newLibrary.getName().length() == 0)) {
                    result = new RecordingCommand(domain) {
                        @Override
						protected void doExecute() {
                            newLibrary.setName("New Library"); //$NON-NLS-1$
                        }};
                }

        
        // add a new library.  Our trigger will set a default name
        domain.getCommandStack().execute(new RecordingCommand(domain) {
            @Override
			protected void doExecute() {
                newLibrary[0] = EXTLibraryFactory.eINSTANCE.createLibrary();
                root.getBranches().add(newLibrary[0]);
                

	// Fixture methods
	//
	
	@Override
	protected void doSetUp()
		throws Exception {
		

		domain.addResourceSetListener(listener);
	}
	
	@Override
	protected void doTearDown()
		throws Exception {
		

Lines 44-49 Link Here

(-)src/org/eclipse/emf/transaction/multithread/tests/ReadThread.java (+1 lines)
44	/**	44	/**
45	* @see java.lang.Runnable#run()	45	* @see java.lang.Runnable#run()
46	*/	46	*/
		47	@Override
47	public void run() {	48	public void run() {
48	try {	49	try {
49	if(notifyObject != null) {	50	if(notifyObject != null) {

Lines 46-51 Link Here

(-)src/org/eclipse/emf/transaction/multithread/tests/NestedReadThread.java (+1 lines)
46	/**	46	/**
47	* @see java.lang.Runnable#run()	47	* @see java.lang.Runnable#run()
48	*/	48	*/
		49	@Override
49	public void run() {	50	public void run() {
50	try {	51	try {
51	if (notifyObject != null) {	52	if (notifyObject != null) {

Lines 45-50 Link Here

(-)src/org/eclipse/emf/transaction/multithread/tests/WriteThread.java (+1 lines)
45	/**	45	/**
46	* @see java.lang.Runnable#run()	46	* @see java.lang.Runnable#run()
47	*/	47	*/
		48	@Override
48	public void run() {	49	public void run() {
49	if(notifyObject != null) {	50	if(notifyObject != null) {
50	synchronized(notifyObject) {	51	synchronized(notifyObject) {

Lines 49-54 Link Here

(-)src/org/eclipse/emf/transaction/multithread/tests/NestedWriteThread.java (+1 lines)
49	/**	49	/**
50	* @see java.lang.Runnable#run()	50	* @see java.lang.Runnable#run()
51	*/	51	*/
		52	@Override
52	public void run() {	53	public void run() {
53	if (notifyObject != null) {	54	if (notifyObject != null) {
54	synchronized (notifyObject) {	55	synchronized (notifyObject) {

Lines 38-43 Link Here

(-)src/org/eclipse/emf/transaction/multithread/tests/LongRunningReadThread.java (+1 lines)
38	/**	38	/**
39	* @see java.lang.Runnable#run()	39	* @see java.lang.Runnable#run()
40	*/	40	*/
		41	@Override
41	public void run() {	42	public void run() {
42	try {	43	try {
43	getDomain().runExclusive(new Runnable() {	44	getDomain().runExclusive(new Runnable() {

Lines 47-52 Link Here

(-)src/org/eclipse/emf/transaction/multithread/tests/NestedReadInWriteThread.java (+1 lines)
47	/**	47	/**
48	* @see java.lang.Runnable#run()	48	* @see java.lang.Runnable#run()
49	*/	49	*/
		50	@Override
50	public void run() {	51	public void run() {
51	if (notifyObject != null) {	52	if (notifyObject != null) {
52	synchronized (notifyObject) {	53	synchronized (notifyObject) {




 */
package org.eclipse.emf.transaction.multithread.tests;

import java.util.Arrays;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;

import org.eclipse.core.runtime.IPlatformRunnable;
import org.eclipse.emf.transaction.TransactionalEditingDomain;
import org.eclipse.emf.transaction.tests.AbstractTest;


 * @author Christian W. Damus (cdamus)
 */
public class AbstractMultithreadTest
	extends TestCase {
	implements IPlatformRunnable {

	private TransactionalEditingDomain domain = null;
	


		return suite;
	}

	public Object run(Object args)
		throws Exception {

		TestRunner.run(suite());
		return Arrays
			.asList(new String[] {"Please see raw test suite output for details."}); //$NON-NLS-1$
	}
	
	//
	// Fixture methods

		return domain;
	}
	
	@Override
	protected void setUp()
		throws Exception {
		

		domain = TransactionalEditingDomain.Factory.INSTANCE.createEditingDomain();
	}
	
	@Override
	protected void tearDown()
		throws Exception {
		




/**
 * <copyright>
 *
 * Copyright (c) 2005, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

 */
package org.eclipse.emf.transaction.util.tests;

import java.util.Arrays;

import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import junit.textui.TestRunner;

import org.eclipse.core.runtime.IPlatformRunnable;

/**
 * Suite of tests for the utility classes in the EMF-TX API implementation.

 * @author Christian W. Damus (cdamus)
 */
public class InternalUtilTests
	extends TestCase {
	implements IPlatformRunnable {

	public InternalUtilTests() {
		super(""); //$NON-NLS-1$


		return suite;
	}

	public Object run(Object args)
		throws Exception {

		TestRunner.run(suite());
		return Arrays
			.asList(new String[] {"Please see raw test suite output for details."}); //$NON-NLS-1$
	}
}




/**
 * <copyright>
 *
 * Copyright (c) 2006, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at

		
		startReading();
		Transaction tx = commit();
		assertSame(domain, TransactionUtil.getEditingDomain(tx));
		
		assertSame(domain, TransactionUtil.getEditingDomain(domain));
		
		IEditingDomainProvider edp = new IEditingDomainProvider() {
			public EditingDomain getEditingDomain() {
				return domain;
			}};
			
		assertSame(domain, TransactionUtil.getEditingDomain(edp));
	}
}




import junit.framework.TestSuite;

import org.eclipse.core.resources.ResourcesPlugin;
import org.eclipse.core.runtime.Platform;
import org.eclipse.core.runtime.jobs.ISchedulingRule;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.emf.transaction.TransactionalEditingDomain;

		try {
			lock.acquire(false);
			
			Job.getJobManager().addJobChangeListener(jl);
			
			synchronized (monitor) {
				t.start();

		} catch (Exception e) {
			fail(e);
		} finally {
			Job.getJobManager().removeJobChangeListener(jl);
		}
	}
	

		try {
			lock.acquire(false);
			
			Job.getJobManager().addJobChangeListener(jl);
			
			synchronized (monitor) {
				t.start();

		} catch (Exception e) {
			fail(e);
		} finally {
			Job.getJobManager().removeJobChangeListener(jl);
		}
	}
	

			}
			
			// start an implicit job on our fake rule
			Job.getJobManager().beginRule(rule, null);
			
			try {
				// now attempt to acquire the lock while the other thread sleeps

				
				lock.release();
			} finally {
				Job.getJobManager().endRule(rule);
			}
		} catch (Exception e) {
			fail(e);

	// Fixture methods
	//
	
	@Override
	protected void setUp()
		throws Exception {
		

		monitor = new Object();
	}
	
	@Override
	protected void tearDown()
		throws Exception {
		

		Field field = null;
		
		try {
			Class<?> clazz = domain.getClass();
			
			field = clazz.getDeclaredField("transactionLock"); //$NON-NLS-1$
			field.setAccessible(true);

Lines 249-254 Link Here

(-)src/org/eclipse/emf/transaction/util/tests/CompositeChangeDescriptionTest.java (-2 / +6 lines)
249	// Fixture methods	249	// Fixture methods
250	//	250	//
251		251
		252	@Override
252	protected void doSetUp()	253	protected void doSetUp()
253	throws Exception {	254	throws Exception {
254		255
Lines 263-270 Link Here
263	commit();	264	commit();
264		265
265	// brute-force remove the TransactionChangeRecorder	266	// brute-force remove the TransactionChangeRecorder
266	for (Iterator iter = testResource.getAllContents(); iter.hasNext();) {	267	for (Iterator<? extends Notifier> iter = testResource.getAllContents();
267	((Notifier) iter.next()).eAdapters().clear();	268	iter.hasNext();) {
		269
		270	iter.next().eAdapters().clear();
268	}	271	}
269	testResource.eAdapters().clear();	272	testResource.eAdapters().clear();
270		273
Lines 272-277 Link Here
272	change = new CompositeChangeDescription();	275	change = new CompositeChangeDescription();
273	}	276	}
274		277
		278	@Override
275	protected void doTearDown()	279	protected void doTearDown()
276	throws Exception {	280	throws Exception {
277		281

Removed Link Here

(-).settings/org.eclipse.jdt.ui.prefs (-3 lines)
1	#Wed Dec 20 11:58:47 EST 2006
2	eclipse.preferences.version=1
3	internal.default.compliance=user

Lines 1-8 Link Here

(-).settings/org.eclipse.jdt.core.prefs (-6 / +10 lines)
1	#Wed Dec 20 11:58:47 EST 2006	1	#Sun Nov 11 13:25:48 EST 2007
2	eclipse.preferences.version=1	2	eclipse.preferences.version=1
3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=disabled	3	org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.4	4	org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
5	org.eclipse.jdt.core.compiler.compliance=1.4	5	org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
		6	org.eclipse.jdt.core.compiler.compliance=1.5
		7	org.eclipse.jdt.core.compiler.debug.lineNumber=generate
		8	org.eclipse.jdt.core.compiler.debug.localVariable=generate
		9	org.eclipse.jdt.core.compiler.debug.sourceFile=generate
6	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error	10	org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
7	org.eclipse.jdt.core.compiler.problem.enumIdentifier=warning	11	org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
8	org.eclipse.jdt.core.compiler.source=1.4	12	org.eclipse.jdt.core.compiler.source=1.5

Lines 38-43 Link Here

(-)src/org/eclipse/emf/transaction/tests/fixtures/ItemDefaultPublicationDateTrigger.java (+1 lines)
38	Notification.ADD)));	38	Notification.ADD)));
39	}	39	}
40		40
		41	@Override
41	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	42	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
42	Command result = null;	43	Command result = null;
43		44

Lines 40-45 Link Here

(-)src/org/eclipse/emf/transaction/tests/fixtures/LibraryDefaultBookTrigger.java (+1 lines)
40	Notification.ADD)));	40	Notification.ADD)));
41	}	41	}
42		42
		43	@Override
43	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	44	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
44	Command result = null;	45	Command result = null;
45		46




public abstract class TestCommand
	extends AbstractCommand {

	@Override
	protected boolean prepare() {
		return true;
	}
	
	@Override
	public void undo() {
		// do nothing
	}




package org.eclipse.emf.transaction.tests.fixtures;

import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;

import org.eclipse.emf.validation.model.EvaluationMode;
import org.eclipse.emf.validation.service.IConstraintDescriptor;
import org.eclipse.emf.validation.service.IConstraintFilter;
import org.eclipse.emf.validation.service.ILiveValidator;
import org.eclipse.emf.validation.service.IValidator;
import org.eclipse.emf.validation.service.ModelValidationService;


					
	public static class FactoryImpl extends TransactionalEditingDomainImpl.FactoryImpl {

		@Override
		public TransactionalEditingDomain createEditingDomain() {
			TransactionalEditingDomainImpl result = new TestValidationEditingDomain(
					new ComposedAdapterFactory(

			return result;
		}

		@Override
		public TransactionalEditingDomain createEditingDomain(ResourceSet rset) {
			// not used by the extension point
			return null;
		}

		@Override
		public TransactionalEditingDomain getEditingDomain(ResourceSet rset) {
			// not used by the extension point
			return null;

		}
		
		public class TestReadWriteValidatorImpl extends ReadWriteValidatorImpl {
			@Override
			protected IValidator<Notification> createValidator() {
				if (enableCustomValidator) {
					readWriteValidatorHitCount++;
					ILiveValidator validator = ModelValidationService.getInstance().newValidator(
						EvaluationMode.LIVE);
					validator.addConstraintFilter(new IConstraintFilter() {
						public boolean accept(IConstraintDescriptor constraint,
								EObject target) {




import java.util.List;

import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.notify.Notification;
import org.eclipse.emf.transaction.NotificationFilter;
import org.eclipse.emf.transaction.ResourceSetChangeEvent;
import org.eclipse.emf.transaction.ResourceSetListenerImpl;

	public ResourceSetChangeEvent precommit;
	
	/** The copied list of precommit notifications from the precommit event. */
	public List<Notification> precommitNotifications;
	
	/** The last post-commit event received. */
	public ResourceSetChangeEvent postcommit;
	
	/** The copied list of postcommit notifications from the postcommit event.*/
	public List<Notification> postcommitNotifications;
	
	public TestListener() {
		super(NotificationFilter.ANY);

		super(filter);
	}
	
	@Override
	public Command transactionAboutToCommit(ResourceSetChangeEvent event)
		throws RollbackException {
		
		precommit = event;
		precommitNotifications = new ArrayList<Notification>(event.getNotifications());
		
		return null;
	}
	
	@Override
	public void resourceSetChanged(ResourceSetChangeEvent event) {
		postcommit = event;
		postcommitNotifications = new ArrayList<Notification>(event.getNotifications());
	}
	
	/**

Lines 38-43 Link Here

(-)src/org/eclipse/emf/transaction/tests/fixtures/LibraryDefaultNameTrigger.java (+1 lines)
38	Notification.ADD)));	38	Notification.ADD)));
39	}	39	}
40		40
		41	@Override
41	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	42	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
42	Command result = null;	43	Command result = null;
43		44





	public static class FactoryImpl extends TransactionalEditingDomainImpl.FactoryImpl {

		@Override
		public TransactionalEditingDomain createEditingDomain() {
			TransactionalEditingDomain result = new TestEditingDomain(
					new ComposedAdapterFactory(

			return result;
		}

		@Override
		public TransactionalEditingDomain createEditingDomain(ResourceSet rset) {
			// not used by the extension point
			return null;
		}

		@Override
		public TransactionalEditingDomain getEditingDomain(ResourceSet rset) {
			// not used by the extension point
			return null;




/**
 * <copyright>
 *
 * Copyright (c) 2006, 2007 IBM Corporation and others.
 * All rights reserved.   This program and the accompanying materials
 * are made available under the terms of the Eclipse Public License v1.0
 * which accompanies this distribution, and is available at


import java.util.List;

import junit.framework.Assert;

import org.eclipse.core.runtime.ILogListener;
import org.eclipse.core.runtime.IStatus;

		}};
	private final TransactionalCommandStack stack;
	
	private final List<IStatus> logs = new java.util.ArrayList<IStatus>();
	private IStatus lastLog;
	
	/**

	 * 
	 * @return a list (possibly empty) of {@link IStatus}es
	 */
	public List<IStatus> getLogs() {
		return logs;
	}
	

	 */
	public void assertLogged(Throwable throwable) {
        IStatus log = getLastLog();
        Assert.assertNotNull(log);
        log = findStatus(log, throwable);
        Assert.assertNotNull(log);
	}
	
	private void record(IStatus log) {

Lines 30-35 Link Here

(-)src/org/eclipse/emf/transaction/tests/constraints/BookTitleConstraint.java (-1 / +2 lines)
30	public class BookTitleConstraint	30	public class BookTitleConstraint
31	extends AbstractModelConstraint {	31	extends AbstractModelConstraint {
32		32
		33	@Override
33	public IStatus validate(IValidationContext ctx) {	34	public IStatus validate(IValidationContext ctx) {
34	EMFEventType eType = ctx.getEventType();	35	EMFEventType eType = ctx.getEventType();
35		36
Lines 38-44 Link Here
38		39
39	if (newValue == null	40	if (newValue == null
40	\|\| ((String)newValue).length() == 0) {	41	\|\| ((String)newValue).length() == 0) {
41	return ctx.createFailureStatus(null);	42	return ctx.createFailureStatus();
42	}	43	}
43	}	44	}
44		45

Lines 7-13 Link Here

(-)META-INF/MANIFEST.MF (-2 / +2 lines)
7	Bundle-Localization: plugin	7	Bundle-Localization: plugin
8	Require-Bundle: org.eclipse.emf.transaction;bundle-version="1.2.0",	8	Require-Bundle: org.eclipse.emf.transaction;bundle-version="1.2.0",
9	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",	9	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)",
10	org.eclipse.emf.examples.library.edit;bundle-version="[2.2.0,3.0.0)",	10	org.eclipse.emf.examples.library.edit;bundle-version="[2.3.0,3.0.0)",
11	org.junit;bundle-version="[3.8.1,4.0.0)",	11	org.junit;bundle-version="[3.8.1,4.0.0)",
12	org.eclipse.ui;bundle-version="[3.2.0,4.0.0)"	12	org.eclipse.ui;bundle-version="[3.2.0,4.0.0)"
13	Eclipse-LazyStart: true; exceptions="org.eclipse.emf.transaction.tests.constraints"	13	Eclipse-LazyStart: true; exceptions="org.eclipse.emf.transaction.tests.constraints"
Lines 17-20 Link Here
17	org.eclipse.emf.transaction.tests.fixtures,	17	org.eclipse.emf.transaction.tests.fixtures,
18	org.eclipse.emf.transaction.util.tests	18	org.eclipse.emf.transaction.util.tests
19	Bundle-Activator: org.eclipse.emf.transaction.tests.TestsPlugin	19	Bundle-Activator: org.eclipse.emf.transaction.tests.TestsPlugin
20	Bundle-RequiredExecutionEnvironment: J2SE-1.4	20	Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 25-29 Link Here

(-)build.properties (-2 / +2 lines)
25	about.ini,\	25	about.ini,\
26	about.html	26	about.html
27	src.includes = about.html	27	src.includes = about.html
28	javacSource = 1.4	28	javacSource = 1.5
29	javacTarget = 1.4	29	javacTarget = 1.5

Return to bug 206811

Lines 232-255 Link Here

(-)src/org/eclipse/emf/workspace/tests/WorkbenchCommandStackTest.java (-18 / +44 lines)
232	final IUndoContext undoContext = new UndoContext();	232	final IUndoContext undoContext = new UndoContext();
233		233
234	domain.addResourceSetListener(new ResourceSetListenerImpl() {	234	domain.addResourceSetListener(new ResourceSetListenerImpl() {
		235	@Override
235	public boolean isPrecommitOnly() {	236	public boolean isPrecommitOnly() {
236	return true;	237	return true;
237	}	238	}
238		239
		240	@Override
239	public Command transactionAboutToCommit(ResourceSetChangeEvent event)	241	public Command transactionAboutToCommit(ResourceSetChangeEvent event)
240	throws RollbackException {	242	throws RollbackException {
241		243
242	IUndoableOperation op = new AbstractOperation("") { //$NON-NLS-1$	244	IUndoableOperation op = new AbstractOperation("") { //$NON-NLS-1$
		245	@Override
243	public IStatus execute(IProgressMonitor monitor, IAdaptable info)	246	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
244	throws ExecutionException {	247	throws ExecutionException {
245	return Status.OK_STATUS;	248	return Status.OK_STATUS;
246	}	249	}
247		250
		251	@Override
248	public IStatus redo(IProgressMonitor monitor, IAdaptable info)	252	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
249	throws ExecutionException {	253	throws ExecutionException {
250	return Status.OK_STATUS;	254	return Status.OK_STATUS;
251	}	255	}
252		256
		257	@Override
253	public IStatus undo(IProgressMonitor monitor, IAdaptable info)	258	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
254	throws ExecutionException {	259	throws ExecutionException {
255	return Status.OK_STATUS;	260	return Status.OK_STATUS;
Lines 266-271 Link Here
266	IUndoContext resCtx = new ResourceUndoContext(domain, r);	271	IUndoContext resCtx = new ResourceUndoContext(domain, r);
267		272
268	AbstractEMFOperation op = new AbstractEMFOperation(domain, "") { //$NON-NLS-1$	273	AbstractEMFOperation op = new AbstractEMFOperation(domain, "") { //$NON-NLS-1$
		274	@Override
269	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)	275	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
270	throws ExecutionException {	276	throws ExecutionException {
271		277
Lines 286-292 Link Here
286	}	292	}
287		293
288	assertNotNull(op.getContexts());	294	assertNotNull(op.getContexts());
289	List opContexts = Arrays.asList(op.getContexts());	295	List<IUndoContext> opContexts = Arrays.asList(op.getContexts());
290	assertTrue(opContexts.contains(resCtx));	296	assertTrue(opContexts.contains(resCtx));
291	assertTrue(opContexts.contains(undoContext));	297	assertTrue(opContexts.contains(undoContext));
292		298
Lines 315-320 Link Here
315		321
316	Command op = new RecordingCommand(domain) {	322	Command op = new RecordingCommand(domain) {
317		323
		324	@Override
318	protected void doExecute() {	325	protected void doExecute() {
319	r.getContents().add(EXTLibraryFactory.eINSTANCE.createLibrary());	326	r.getContents().add(EXTLibraryFactory.eINSTANCE.createLibrary());
320		327
Lines 362-370 Link Here
362	final RuntimeException error = new RuntimeException();	369	final RuntimeException error = new RuntimeException();
363		370
364	ResourceSetListener testListener = new TriggerListener() {	371	ResourceSetListener testListener = new TriggerListener() {
365	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	372	@Override
		373	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
366	return new RecordingCommand(domain, "Error") { //$NON-NLS-1$	374	return new RecordingCommand(domain, "Error") { //$NON-NLS-1$
367	protected void doExecute() {	375	@Override
		376	protected void doExecute() {
368	throw error;	377	throw error;
369	}};	378	}};
370	}};	379	}};
Lines 376-382 Link Here
376	domain.addResourceSetListener(testListener);	385	domain.addResourceSetListener(testListener);
377		386
378	domain.getCommandStack().execute(new RecordingCommand(domain) {	387	domain.getCommandStack().execute(new RecordingCommand(domain) {
379	protected void doExecute() {	388	@Override
		389	protected void doExecute() {
380	root.getWriters().clear();	390	root.getWriters().clear();
381	root.getStock().clear();	391	root.getStock().clear();
382	root.getBranches().clear();	392	root.getBranches().clear();
Lines 404-412 Link Here
404	final RuntimeException error = new OperationCanceledException();	414	final RuntimeException error = new OperationCanceledException();
405		415
406	ResourceSetListener testListener = new TriggerListener() {	416	ResourceSetListener testListener = new TriggerListener() {
407	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	417	@Override
		418	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
408	return new RecordingCommand(domain, "Error") { //$NON-NLS-1$	419	return new RecordingCommand(domain, "Error") { //$NON-NLS-1$
409	protected void doExecute() {	420	@Override
		421	protected void doExecute() {
410	throw error;	422	throw error;
411	}};	423	}};
412	}};	424	}};
Lines 418-424 Link Here
418	domain.addResourceSetListener(testListener);	430	domain.addResourceSetListener(testListener);
419		431
420	domain.getCommandStack().execute(new RecordingCommand(domain) {	432	domain.getCommandStack().execute(new RecordingCommand(domain) {
421	protected void doExecute() {	433	@Override
		434	protected void doExecute() {
422	root.getWriters().clear();	435	root.getWriters().clear();
423	root.getStock().clear();	436	root.getStock().clear();
424	root.getBranches().clear();	437	root.getBranches().clear();
Lines 446-454 Link Here
446	final RuntimeException error = new RuntimeException();	459	final RuntimeException error = new RuntimeException();
447		460
448	ResourceSetListener testListener = new TriggerListener() {	461	ResourceSetListener testListener = new TriggerListener() {
449	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	462	@Override
		463	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
450	return new RecordingCommand(domain, "Error") { //$NON-NLS-1$	464	return new RecordingCommand(domain, "Error") { //$NON-NLS-1$
451	protected void doExecute() {	465	@Override
		466	protected void doExecute() {
452	throw error;	467	throw error;
453	}};	468	}};
454	}};	469	}};
Lines 458-464 Link Here
458		473
459	try {	474	try {
460	IStatus status = new AbstractEMFOperation(domain, "test") { //$NON-NLS-1$	475	IStatus status = new AbstractEMFOperation(domain, "test") { //$NON-NLS-1$
461	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) {	476	@Override
		477	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) {
462	root.getWriters().clear();	478	root.getWriters().clear();
463	root.getStock().clear();	479	root.getStock().clear();
464	root.getBranches().clear();	480	root.getBranches().clear();
Lines 489-497 Link Here
489	final RuntimeException error = new OperationCanceledException();	505	final RuntimeException error = new OperationCanceledException();
490		506
491	ResourceSetListener testListener = new TriggerListener() {	507	ResourceSetListener testListener = new TriggerListener() {
492	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	508	@Override
		509	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
493	return new RecordingCommand(domain, "Error") { //$NON-NLS-1$	510	return new RecordingCommand(domain, "Error") { //$NON-NLS-1$
494	protected void doExecute() {	511	@Override
		512	protected void doExecute() {
495	throw error;	513	throw error;
496	}};	514	}};
497	}};	515	}};
Lines 501-507 Link Here
501		519
502	try {	520	try {
503	IStatus status = new AbstractEMFOperation(domain, "test") { //$NON-NLS-1$	521	IStatus status = new AbstractEMFOperation(domain, "test") { //$NON-NLS-1$
504	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) {	522	@Override
		523	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) {
505	root.getWriters().clear();	524	root.getWriters().clear();
506	root.getStock().clear();	525	root.getStock().clear();
507	root.getBranches().clear();	526	root.getBranches().clear();
Lines 531-543 Link Here
531	public void test_recordingCommandsAsTriggers_bug157103() {	550	public void test_recordingCommandsAsTriggers_bug157103() {
532	// one trigger sets default library names	551	// one trigger sets default library names
533	domain.addResourceSetListener(new LibraryDefaultNameTrigger() {	552	domain.addResourceSetListener(new LibraryDefaultNameTrigger() {
534	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	553	@Override
		554	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
535	Command result = null;	555	Command result = null;
536		556
537	final Library newLibrary = (Library) notification.getNewValue();	557	final Library newLibrary = (Library) notification.getNewValue();
538	if ((newLibrary.getName() == null) \|\| (newLibrary.getName().length() == 0)) {	558	if ((newLibrary.getName() == null) \|\| (newLibrary.getName().length() == 0)) {
539	result = new RecordingCommand(domain) {	559	result = new RecordingCommand(domain) {
540	protected void doExecute() {	560	@Override
		561	protected void doExecute() {
541	newLibrary.setName("New Library"); //$NON-NLS-1$	562	newLibrary.setName("New Library"); //$NON-NLS-1$
542	}};	563	}};
543	}	564	}
Lines 549-555 Link Here
549		570
550	IUndoContext ctx = new UndoContext();	571	IUndoContext ctx = new UndoContext();
551	IUndoableOperation operation = new AbstractEMFOperation(domain, "Test") { //$NON-NLS-1$	572	IUndoableOperation operation = new AbstractEMFOperation(domain, "Test") { //$NON-NLS-1$
552	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) {	573	@Override
		574	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info) {
553	newLibrary[0] = EXTLibraryFactory.eINSTANCE.createLibrary();	575	newLibrary[0] = EXTLibraryFactory.eINSTANCE.createLibrary();
554	root.getBranches().add(newLibrary[0]);	576	root.getBranches().add(newLibrary[0]);
555		577
Lines 679-692 Link Here
679	SelfOpeningEMFCompositeOperation operation = new SelfOpeningEMFCompositeOperation(	701	SelfOpeningEMFCompositeOperation operation = new SelfOpeningEMFCompositeOperation(
680	domain) {	702	domain) {
681		703
682	protected IStatus doExecute(IOperationHistory history,	704	@Override
		705	protected IStatus doExecute(IOperationHistory history,
683	IProgressMonitor monitor, IAdaptable info)	706	IProgressMonitor monitor, IAdaptable info)
684	throws ExecutionException {	707	throws ExecutionException {
685		708
686	return history.execute(	709	return history.execute(
687	new AbstractEMFOperation(domain, "Test") { //$NON-NLS-1$	710	new AbstractEMFOperation(domain, "Test") { //$NON-NLS-1$
688		711
689	protected IStatus doExecute(IProgressMonitor monitor,	712	@Override
		713	protected IStatus doExecute(IProgressMonitor monitor,
690	IAdaptable info) {	714	IAdaptable info) {
691	root.getBranches().add(	715	root.getBranches().add(
692	EXTLibraryFactory.eINSTANCE.createLibrary());	716	EXTLibraryFactory.eINSTANCE.createLibrary());
Lines 711-722 Link Here
711	// Fixture methods	735	// Fixture methods
712	//	736	//
713		737
		738	@Override
714	protected void doSetUp() throws Exception {	739	protected void doSetUp() throws Exception {
715	super.doSetUp();	740	super.doSetUp();
716		741
717	defaultContext = ((IWorkspaceCommandStack) getCommandStack()).getDefaultUndoContext();	742	defaultContext = ((IWorkspaceCommandStack) getCommandStack()).getDefaultUndoContext();
718	}	743	}
719		744
		745	@Override
720	protected void doTearDown() throws Exception {	746	protected void doTearDown() throws Exception {
721	defaultContext = null;	747	defaultContext = null;
722		748

Lines 1-7 Link Here

(-)src/org/eclipse/emf/workspace/tests/AbstractTest.java (-33 / +40 lines)
1	/**	1	/**
2	* <copyright>	2	* <copyright>
3	*	3	*
4	* Copyright (c) 2005, 2006 IBM Corporation and others.	4	* Copyright (c) 2005, 2007 IBM Corporation and others.
5	* All rights reserved. This program and the accompanying materials	5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0	6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at	7	* which accompanies this distribution, and is available at
Lines 44-54 Link Here
44	import org.eclipse.emf.examples.extlibrary.Person;	44	import org.eclipse.emf.examples.extlibrary.Person;
45	import org.eclipse.emf.examples.extlibrary.Writer;	45	import org.eclipse.emf.examples.extlibrary.Writer;
46	import org.eclipse.emf.examples.extlibrary.util.EXTLibrarySwitch;	46	import org.eclipse.emf.examples.extlibrary.util.EXTLibrarySwitch;
		47	import org.eclipse.emf.transaction.Transaction;
47	import org.eclipse.emf.transaction.TransactionalCommandStack;	48	import org.eclipse.emf.transaction.TransactionalCommandStack;
48	import org.eclipse.emf.transaction.TransactionalEditingDomain;	49	import org.eclipse.emf.transaction.TransactionalEditingDomain;
49	import org.eclipse.emf.transaction.Transaction;
50	import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
51	import org.eclipse.emf.transaction.impl.InternalTransaction;	50	import org.eclipse.emf.transaction.impl.InternalTransaction;
		51	import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
52	import org.eclipse.emf.validation.model.IConstraintStatus;	52	import org.eclipse.emf.validation.model.IConstraintStatus;
53	import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;	53	import org.eclipse.emf.workspace.WorkspaceEditingDomainFactory;
54	import org.osgi.framework.Bundle;	54	import org.osgi.framework.Bundle;
Lines 80-86 Link Here
80		80
81	protected static final String TEST_RESOURCE_NAME = "test_model.extlibrary"; //$NON-NLS-1$	81	protected static final String TEST_RESOURCE_NAME = "test_model.extlibrary"; //$NON-NLS-1$
82		82
83	private final List transactionStack = new java.util.ArrayList();	83	private final List<InternalTransaction> transactionStack =
		84	new java.util.ArrayList<InternalTransaction>();
84		85
85	public AbstractTest() {	86	public AbstractTest() {
86	super();	87	super();
Lines 94-99 Link Here
94	// Test configuration methods	95	// Test configuration methods
95	//	96	//
96		97
		98	@Override
97	protected final void setUp()	99	protected final void setUp()
98	throws Exception {	100	throws Exception {
99		101
Lines 141-146 Link Here
141	history);	143	history);
142	}	144	}
143		145
		146	@Override
144	protected final void tearDown()	147	protected final void tearDown()
145	throws Exception {	148	throws Exception {
146		149
Lines 208-214 Link Here
208	file.create(input, true, null);	211	file.create(input, true, null);
209		212
210	result = domain.createResource(	213	result = domain.createResource(
211	URI.createPlatformResourceURI(file.getFullPath().toString()).toString());	214	URI.createPlatformResourceURI(file.getFullPath().toString(), true).toString());
212	} catch (Exception e) {	215	} catch (Exception e) {
213	e.printStackTrace();	216	e.printStackTrace();
214	fail("Exception creating test resource: " + e.getLocalizedMessage()); //$NON-NLS-1$	217	fail("Exception creating test resource: " + e.getLocalizedMessage()); //$NON-NLS-1$
Lines 341-348 Link Here
341	String name = names[i];	344	String name = names[i];
342	result = null;	345	result = null;
343		346
344	for (Iterator iter = getContents(current).iterator(); iter.hasNext();) {	347	for (Iterator<EObject> iter = getContents(current).iterator(); iter.hasNext();) {
345	EObject child = (EObject) iter.next();	348	EObject child = iter.next();
346		349
347	if (name.equals(getName(child))) {	350	if (name.equals(getName(child))) {
348	result = child;	351	result = child;
Lines 363-369 Link Here
363	* @return its name	366	* @return its name
364	*/	367	*/
365	private String getName(EObject object) {	368	private String getName(EObject object) {
366	return (String) GetName.INSTANCE.doSwitch(object);	369	return GetName.INSTANCE.doSwitch(object);
367	}	370	}
368		371
369	/**	372	/**
Lines 372-384 Link Here
372	* @param object an object, which may be a resource or an element	375	* @param object an object, which may be a resource or an element
373	* @return its immediate contents (children)	376	* @return its immediate contents (children)
374	*/	377	*/
375	private List getContents(Object object) {	378	private List<EObject> getContents(Object object) {
376	if (object instanceof EObject) {	379	if (object instanceof EObject) {
377	return ((EObject) object).eContents();	380	return ((EObject) object).eContents();
378	} else if (object instanceof Resource) {	381	} else if (object instanceof Resource) {
379	return ((Resource) object).getContents();	382	return ((Resource) object).getContents();
380	} else {	383	} else {
381	return Collections.EMPTY_LIST;	384	return Collections.emptyList();
382	}	385	}
383	}	386	}
384		387
Lines 397-403 Link Here
397	*	400	*
398	* @author Christian W. Damus (cdamus)	401	* @author Christian W. Damus (cdamus)
399	*/	402	*/
400	private static final class GetName extends EXTLibrarySwitch {	403	private static final class GetName extends EXTLibrarySwitch<String> {
401	static final GetName INSTANCE = new GetName();	404	static final GetName INSTANCE = new GetName();
402		405
403	private GetName() {	406	private GetName() {
Lines 408-430 Link Here
408	return object.getTitle();	411	return object.getTitle();
409	}	412	}
410		413
411	public Object caseBook(Book object) {	414	@Override
		415	public String caseBook(Book object) {
412	return object.getTitle();	416	return object.getTitle();
413	}	417	}
414		418
415	public Object caseLibrary(Library object) {	419	@Override
		420	public String caseLibrary(Library object) {
416	return object.getName();	421	return object.getName();
417	}	422	}
418		423
419	public Object casePeriodical(Periodical object) {	424	@Override
		425	public String casePeriodical(Periodical object) {
420	return object.getTitle();	426	return object.getTitle();
421	}	427	}
422		428
423	public Object caseWriter(Writer object) {	429	@Override
		430	public String caseWriter(Writer object) {
424	return object.getName();	431	return object.getName();
425	}	432	}
426		433
427	public Object casePerson(Person object) {	434	@Override
		435	public String casePerson(Person object) {
428	if (object.getFirstName() == null) {	436	if (object.getFirstName() == null) {
429	if (object.getLastName() == null) {	437	if (object.getLastName() == null) {
430	return ""; //$NON-NLS-1$	438	return ""; //$NON-NLS-1$
Lines 443-449 Link Here
443	}	451	}
444	}	452	}
445		453
446	public Object defaultCase(EObject object) {	454	@Override
		455	public String defaultCase(EObject object) {
447	return ""; //$NON-NLS-1$	456	return ""; //$NON-NLS-1$
448	}	457	}
449	}	458	}
Lines 483-489 Link Here
483	*	492	*
484	* @param options the options	493	* @param options the options
485	*/	494	*/
486	protected void startWriting(Map options) {	495	protected void startWriting(Map<?, ?> options) {
487	try {	496	try {
488	transactionStack.add(	497	transactionStack.add(
489	((InternalTransactionalEditingDomain) domain).startTransaction(false, options));	498	((InternalTransactionalEditingDomain) domain).startTransaction(false, options));
Lines 518-524 Link Here
518	*	527	*
519	* @param options the options	528	* @param options the options
520	*/	529	*/
521	protected void startReading(Map options) {	530	protected void startReading(Map<?, ?> options) {
522	try {	531	try {
523	transactionStack.add(	532	transactionStack.add(
524	((InternalTransactionalEditingDomain) domain).startTransaction(true, options));	533	((InternalTransactionalEditingDomain) domain).startTransaction(true, options));
Lines 567-574 Link Here
567	*	576	*
568	* @return the map	577	* @return the map
569	*/	578	*/
570	protected Map makeOptions(String option) {	579	protected Map<?, ?> makeOptions(String option) {
571	return makeOptions(option, Boolean.TRUE);	580	return makeOptions(option, true);
572	}	581	}
573		582
574	/**	583	/**
Lines 579-585 Link Here
579	*	588	*
580	* @return the map	589	* @return the map
581	*/	590	*/
582	protected Map makeOptions(String option, Object value) {	591	protected Map<?, ?> makeOptions(String option, Object value) {
583	if (value == null) {	592	if (value == null) {
584	return Collections.EMPTY_MAP;	593	return Collections.EMPTY_MAP;
585	}	594	}
Lines 590-610 Link Here
590	/**	599	/**
591	* Makes a map from multiple options, as key-value pairs.	600	* Makes a map from multiple options, as key-value pairs.
592	*	601	*
593	* @param options a pairwise list of keys and values	602	* @param option an option
		603	* @param value the <tt>option</tt> value
		604	* @param options a pairwise list of additional options and values
594	*	605	*
595	* @return the map	606	* @return the map
596	*/	607	*/
597	protected Map makeOptions(Object[] options) {	608	protected Map<?, ?> makeOptions(Object option, Object value, Object... options) {
598	Map result;	609	Map<Object, Object> result = new java.util.HashMap<Object, Object>();
599		610
600	if (options == null) {	611	result.put(option, value);
601	result = Collections.EMPTY_MAP;	612
602	} else {	613	for (int i = 0; i < options.length - 1; i += 2) {
603	result = new java.util.HashMap();	614	result.put(options[i], options[i + 1]);
604
605	for (int i = 0; i < options.length - 1; i += 2) {
606	result.put(options[i], options[i + 1]);
607	}
608	}	615	}
609		616
610	return result;	617	return result;

Lines 1-7 Link Here

(-)src/org/eclipse/emf/workspace/tests/UndoContextTest.java (-4 / +6 lines)
1	/**	1	/**
2	* <copyright>	2	* <copyright>
3	*	3	*
4	* Copyright (c) 2005, 2006 IBM Corporation and others.	4	* Copyright (c) 2005, 2007 IBM Corporation and others.
5	* All rights reserved. This program and the accompanying materials	5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0	6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at	7	* which accompanies this distribution, and is available at
Lines 71-76 Link Here
71	IUndoContext ctx = new TestUndoContext();	71	IUndoContext ctx = new TestUndoContext();
72		72
73	IUndoableOperation oper = new TestOperation(domain) {	73	IUndoableOperation oper = new TestOperation(domain) {
		74	@Override
74	protected void doExecute() {	75	protected void doExecute() {
75	book.setTitle(newTitle);	76	book.setTitle(newTitle);
76	newAuthor.getBooks().add(book);	77	newAuthor.getBooks().add(book);
Lines 83-89 Link Here
83	fail(e);	84	fail(e);
84	}	85	}
85		86
86	Set affected = ResourceUndoContext.getAffectedResources(oper);	87	Set<Resource> affected = ResourceUndoContext.getAffectedResources(oper);
87		88
88	assertNotNull(affected);	89	assertNotNull(affected);
89	assertEquals(Collections.singleton(testResource), affected);	90	assertEquals(Collections.singleton(testResource), affected);
Lines 115-120 Link Here
115	IUndoContext ctx = new TestUndoContext();	116	IUndoContext ctx = new TestUndoContext();
116		117
117	IUndoableOperation oper = new TestOperation(domain) {	118	IUndoableOperation oper = new TestOperation(domain) {
		119	@Override
118	protected void doExecute() {	120	protected void doExecute() {
119	book.setTitle(newTitle);	121	book.setTitle(newTitle);
120	newAuthor.getBooks().add(book);	122	newAuthor.getBooks().add(book);
Lines 127-137 Link Here
127	fail(e);	129	fail(e);
128	}	130	}
129		131
130	Set affected = ResourceUndoContext.getAffectedResources(oper);	132	Set<Resource> affected = ResourceUndoContext.getAffectedResources(oper);
131		133
132	assertNotNull(affected);	134	assertNotNull(affected);
133		135
134	Set expected = new java.util.HashSet();	136	Set<Resource> expected = new java.util.HashSet<Resource>();
135	expected.add(testResource);	137	expected.add(testResource);
136	expected.add(res2);	138	expected.add(res2);
137		139

Lines 17-23 Link Here

(-)src/org/eclipse/emf/workspace/tests/BasicWorkbenchTest.java (-9 / +4 lines)
17	package org.eclipse.emf.workspace.tests;	17	package org.eclipse.emf.workspace.tests;
18		18
19	import java.util.Collections;	19	import java.util.Collections;
20	import java.util.Iterator;
21	import java.util.List;	20	import java.util.List;
22		21
23	import junit.framework.Test;	22	import junit.framework.Test;
Lines 33-41 Link Here
33	import org.eclipse.emf.examples.extlibrary.Book;	32	import org.eclipse.emf.examples.extlibrary.Book;
34	import org.eclipse.emf.examples.extlibrary.EXTLibraryFactory;	33	import org.eclipse.emf.examples.extlibrary.EXTLibraryFactory;
35	import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;	34	import org.eclipse.emf.examples.extlibrary.EXTLibraryPackage;
		35	import org.eclipse.emf.transaction.Transaction;
36	import org.eclipse.emf.transaction.TransactionalCommandStack;	36	import org.eclipse.emf.transaction.TransactionalCommandStack;
37	import org.eclipse.emf.transaction.TransactionalEditingDomain;	37	import org.eclipse.emf.transaction.TransactionalEditingDomain;
38	import org.eclipse.emf.transaction.Transaction;
39	import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;	38	import org.eclipse.emf.transaction.impl.InternalTransactionalEditingDomain;
40	import org.eclipse.emf.workspace.tests.fixtures.TestListener;	39	import org.eclipse.emf.workspace.tests.fixtures.TestListener;
41		40
Lines 301-307 Link Here
301		300
302	// check that we got the expected events	301	// check that we got the expected events
303	assertNotNull(listener.postcommit);	302	assertNotNull(listener.postcommit);
304	List notifications = listener.postcommit.getNotifications();	303	List<Notification> notifications = listener.postcommit.getNotifications();
305	assertFalse(notifications.isEmpty());	304	assertFalse(notifications.isEmpty());
306		305
307	// look for an event indicating resource was loaded and one indicating	306	// look for an event indicating resource was loaded and one indicating
Lines 309-317 Link Here
309	Notification rootAdded = null;	308	Notification rootAdded = null;
310	Notification resLoaded = null;	309	Notification resLoaded = null;
311		310
312	for (Iterator iter = notifications.iterator(); iter.hasNext();) {	311	for (Notification next : notifications) {
313	Notification next = (Notification) iter.next();
314
315	if (next.getNotifier() == res) {	312	if (next.getNotifier() == res) {
316	if (next.getFeatureID(null) == Resource.RESOURCE__IS_LOADED) {	313	if (next.getFeatureID(null) == Resource.RESOURCE__IS_LOADED) {
317	if (next.getNewBooleanValue()) {	314	if (next.getNewBooleanValue()) {
Lines 347-355 Link Here
347	Notification rootRemoved = null;	344	Notification rootRemoved = null;
348	Notification resUnloaded = null;	345	Notification resUnloaded = null;
349		346
350	for (Iterator iter = notifications.iterator(); iter.hasNext();) {	347	for (Notification next : notifications) {
351	Notification next = (Notification) iter.next();
352
353	if (next.getNotifier() == res) {	348	if (next.getNotifier() == res) {
354	if (next.getFeatureID(null) == Resource.RESOURCE__IS_LOADED) {	349	if (next.getFeatureID(null) == Resource.RESOURCE__IS_LOADED) {
355	if (!next.getNewBooleanValue()) {	350	if (!next.getNewBooleanValue()) {

Lines 32-40 Link Here

(-)src/org/eclipse/emf/workspace/tests/MemoryLeakTest.java (-24 / +40 lines)
32	import org.eclipse.core.runtime.Status;	32	import org.eclipse.core.runtime.Status;
33	import org.eclipse.emf.common.command.Command;	33	import org.eclipse.emf.common.command.Command;
34	import org.eclipse.emf.common.notify.Notification;	34	import org.eclipse.emf.common.notify.Notification;
35	import org.eclipse.emf.common.util.BasicEList;
36	import org.eclipse.emf.ecore.EObject;	35	import org.eclipse.emf.ecore.EObject;
37	import org.eclipse.emf.ecore.EReference;	36	import org.eclipse.emf.ecore.EReference;
		37	import org.eclipse.emf.ecore.change.ChangeDescription;
38	import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;	38	import org.eclipse.emf.ecore.util.ECrossReferenceAdapter;
39	import org.eclipse.emf.ecore.util.EcoreUtil;	39	import org.eclipse.emf.ecore.util.EcoreUtil;
40	import org.eclipse.emf.edit.command.CommandParameter;	40	import org.eclipse.emf.edit.command.CommandParameter;
Lines 95-104 Link Here
95	assertTrue(level1.eAdapters().contains(xrefAdapter));	95	assertTrue(level1.eAdapters().contains(xrefAdapter));
96		96
97	Command cmd = new RemoveCommand(domain, root, EXTLibraryPackage.Literals.LIBRARY__BRANCHES, level1) {	97	Command cmd = new RemoveCommand(domain, root, EXTLibraryPackage.Literals.LIBRARY__BRANCHES, level1) {
98	public void doDispose() {	98	@Override
		99	public void doDispose() {
99	if (feature instanceof EReference && ((EReference) feature).isContainment()) {	100	if (feature instanceof EReference && ((EReference) feature).isContainment()) {
100	for (Iterator iter = collection.iterator(); iter.hasNext();) {	101	for (Object o : collection) {
101	EObject next = (EObject) iter.next();	102	EObject next = (EObject) o;
102		103
103	// clear adapters on the removed object if it is still removed	104	// clear adapters on the removed object if it is still removed
104	if (next.eContainer() != owner) {	105	if (next.eContainer() != owner) {
Lines 158-164 Link Here
158	assertTrue(level1.eAdapters().contains(xrefAdapter));	159	assertTrue(level1.eAdapters().contains(xrefAdapter));
159		160
160	Command cmd = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$	161	Command cmd = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$
161	protected void doExecute() {	162	@Override
		163	protected void doExecute() {
162	root.getBranches().remove(level1);	164	root.getBranches().remove(level1);
163	}};	165	}};
164		166
Lines 213-222 Link Here
213	assertTrue(level1.eAdapters().contains(xrefAdapter));	215	assertTrue(level1.eAdapters().contains(xrefAdapter));
214		216
215	final Command trigger = new RemoveCommand(domain, root, EXTLibraryPackage.Literals.LIBRARY__BRANCHES, level1) {	217	final Command trigger = new RemoveCommand(domain, root, EXTLibraryPackage.Literals.LIBRARY__BRANCHES, level1) {
216	public void doDispose() {	218	@Override
		219	public void doDispose() {
217	if (feature instanceof EReference && ((EReference) feature).isContainment()) {	220	if (feature instanceof EReference && ((EReference) feature).isContainment()) {
218	for (Iterator iter = collection.iterator(); iter.hasNext();) {	221	for (Object o : collection) {
219	EObject next = (EObject) iter.next();	222	EObject next = (EObject) o;
220		223
221	// clear adapters on the removed object if it is still removed	224	// clear adapters on the removed object if it is still removed
222	if (next.eContainer() != owner) {	225	if (next.eContainer() != owner) {
Lines 229-235 Link Here
229	}};	232	}};
230		233
231	domain.addResourceSetListener(new TriggerListener() {	234	domain.addResourceSetListener(new TriggerListener() {
232	protected Command trigger(TransactionalEditingDomain domain,	235	@Override
		236	protected Command trigger(TransactionalEditingDomain domain,
233	Notification notification) {	237	Notification notification) {
234	// trigger on the name change only	238	// trigger on the name change only
235	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {	239	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {
Lines 291-302 Link Here
291	assertTrue(level1.eAdapters().contains(xrefAdapter));	295	assertTrue(level1.eAdapters().contains(xrefAdapter));
292		296
293	final Command trigger = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$	297	final Command trigger = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$
294	protected void doExecute() {	298	@Override
		299	protected void doExecute() {
295	root.getBranches().remove(level1);	300	root.getBranches().remove(level1);
296	}};	301	}};
297		302
298	domain.addResourceSetListener(new TriggerListener() {	303	domain.addResourceSetListener(new TriggerListener() {
299	protected Command trigger(TransactionalEditingDomain domain,	304	@Override
		305	protected Command trigger(TransactionalEditingDomain domain,
300	Notification notification) {	306	Notification notification) {
301	// trigger on the name change only	307	// trigger on the name change only
302	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {	308	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {
Lines 353-359 Link Here
353	assertTrue(level1.eAdapters().contains(xrefAdapter));	359	assertTrue(level1.eAdapters().contains(xrefAdapter));
354		360
355	IUndoableOperation oper = new AbstractEMFOperation(domain, "Remove Branch") { //$NON-NLS-1$	361	IUndoableOperation oper = new AbstractEMFOperation(domain, "Remove Branch") { //$NON-NLS-1$
356	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)	362	@Override
		363	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
357	throws ExecutionException {	364	throws ExecutionException {
358		365
359	root.getBranches().remove(level1);	366	root.getBranches().remove(level1);
Lines 422-433 Link Here
422	assertTrue(level1.eAdapters().contains(xrefAdapter));	429	assertTrue(level1.eAdapters().contains(xrefAdapter));
423		430
424	final Command trigger = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$	431	final Command trigger = new RecordingCommand(domain, "Remove Branch") { //$NON-NLS-1$
425	protected void doExecute() {	432	@Override
		433	protected void doExecute() {
426	root.getBranches().remove(level1);	434	root.getBranches().remove(level1);
427	}};	435	}};
428		436
429	domain.addResourceSetListener(new TriggerListener() {	437	domain.addResourceSetListener(new TriggerListener() {
430	protected Command trigger(TransactionalEditingDomain domain,	438	@Override
		439	protected Command trigger(TransactionalEditingDomain domain,
431	Notification notification) {	440	Notification notification) {
432	// trigger on the name change only	441	// trigger on the name change only
433	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {	442	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {
Lines 438-444 Link Here
438	}});	447	}});
439		448
440	IUndoableOperation oper = new AbstractEMFOperation(domain, "Rename Library") { //$NON-NLS-1$	449	IUndoableOperation oper = new AbstractEMFOperation(domain, "Rename Library") { //$NON-NLS-1$
441	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)	450	@Override
		451	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
442	throws ExecutionException {	452	throws ExecutionException {
443		453
444	root.setName("newname"); //$NON-NLS-1$	454	root.setName("newname"); //$NON-NLS-1$
Lines 507-513 Link Here
507	assertTrue(level1.eAdapters().contains(xrefAdapter));	517	assertTrue(level1.eAdapters().contains(xrefAdapter));
508		518
509	IUndoableOperation triggerOper = new AbstractEMFOperation(domain, "Remove Branch") { //$NON-NLS-1$	519	IUndoableOperation triggerOper = new AbstractEMFOperation(domain, "Remove Branch") { //$NON-NLS-1$
510	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)	520	@Override
		521	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
511	throws ExecutionException {	522	throws ExecutionException {
512		523
513	root.getBranches().remove(level1);	524	root.getBranches().remove(level1);
Lines 517-523 Link Here
517	final Command trigger = new EMFOperationCommand(domain, triggerOper);	528	final Command trigger = new EMFOperationCommand(domain, triggerOper);
518		529
519	domain.addResourceSetListener(new TriggerListener() {	530	domain.addResourceSetListener(new TriggerListener() {
520	protected Command trigger(TransactionalEditingDomain domain,	531	@Override
		532	protected Command trigger(TransactionalEditingDomain domain,
521	Notification notification) {	533	Notification notification) {
522	// trigger on the name change only	534	// trigger on the name change only
523	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {	535	if (notification.getFeature() == EXTLibraryPackage.Literals.LIBRARY__NAME) {
Lines 528-534 Link Here
528	}});	540	}});
529		541
530	IUndoableOperation oper = new AbstractEMFOperation(domain, "Rename Library") { //$NON-NLS-1$	542	IUndoableOperation oper = new AbstractEMFOperation(domain, "Rename Library") { //$NON-NLS-1$
531	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)	543	@Override
		544	protected IStatus doExecute(IProgressMonitor monitor, IAdaptable info)
532	throws ExecutionException {	545	throws ExecutionException {
533		546
534	root.setName("newname"); //$NON-NLS-1$	547	root.setName("newname"); //$NON-NLS-1$
Lines 579-597 Link Here
579	//	592	//
580		593
581	private static class TransactionSniffer extends ResourceSetListenerImpl {	594	private static class TransactionSniffer extends ResourceSetListenerImpl {
582	private TransactionalEditingDomain domain;	595	private final TransactionalEditingDomain domain;
583	private List changes = new BasicEList.FastCompare();	596	private final List<ChangeDescription> changes =
		597	new java.util.ArrayList<ChangeDescription>();
584		598
585	TransactionSniffer(TransactionalEditingDomain domain) {	599	TransactionSniffer(TransactionalEditingDomain domain) {
586	this.domain = domain;	600	this.domain = domain;
587	domain.addResourceSetListener(this);	601	domain.addResourceSetListener(this);
588	}	602	}
589		603
590	public boolean isPostcommitOnly() {	604	@Override
		605	public boolean isPostcommitOnly() {
591	return true;	606	return true;
592	}	607	}
593		608
594	public void resourceSetChanged(ResourceSetChangeEvent event) {	609	@Override
		610	public void resourceSetChanged(ResourceSetChangeEvent event) {
595	Transaction tx = event.getTransaction();	611	Transaction tx = event.getTransaction();
596		612
597	if ((tx != null) && (tx.getChangeDescription()) != null) {	613	if ((tx != null) && (tx.getChangeDescription()) != null) {
Lines 603-610 Link Here
603	// stop listening, now	619	// stop listening, now
604	domain.removeResourceSetListener(this);	620	domain.removeResourceSetListener(this);
605		621
606	for (Iterator iter = EcoreUtil.getAllContents(changes); iter.hasNext();) {	622	for (Iterator<EObject> iter = EcoreUtil.getAllContents(changes); iter.hasNext();) {
607	EObject next = (EObject) iter.next();	623	EObject next = iter.next();
608	assertEquals("Adapters not cleared.", 0, next.eAdapters().size()); //$NON-NLS-1$	624	assertEquals("Adapters not cleared.", 0, next.eAdapters().size()); //$NON-NLS-1$
609	}	625	}
610	}	626	}

Lines 161-166 Link Here

(-)src/org/eclipse/emf/workspace/tests/EMFOperationCommandTest.java (+8 lines)
161		161
162	domain.addResourceSetListener(new TriggerListener() {	162	domain.addResourceSetListener(new TriggerListener() {
163		163
		164	@Override
164	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	165	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
165	Command result = null;	166	Command result = null;
166		167
Lines 252-257 Link Here
252		253
253	domain.addResourceSetListener(new TriggerListener() {	254	domain.addResourceSetListener(new TriggerListener() {
254		255
		256	@Override
255	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	257	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
256	Command result = null;	258	Command result = null;
257		259
Lines 315-326 Link Here
315		317
316	Command cmd = new RecordingCommand(domain, "Testing") { //$NON-NLS-1$	318	Command cmd = new RecordingCommand(domain, "Testing") { //$NON-NLS-1$
317		319
		320	@Override
318	protected void doExecute() {	321	protected void doExecute() {
319	book.setTitle(newTitle);	322	book.setTitle(newTitle);
320	}};	323	}};
321		324
322	domain.addResourceSetListener(new TriggerListener() {	325	domain.addResourceSetListener(new TriggerListener() {
323		326
		327	@Override
324	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	328	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
325	Command result = null;	329	Command result = null;
326		330
Lines 391-400 Link Here
391	*/	395	*/
392	public void test_nonredoableOperation_138287() {	396	public void test_nonredoableOperation_138287() {
393	IUndoableOperation operation = new TestOperation(domain) {	397	IUndoableOperation operation = new TestOperation(domain) {
		398	@Override
394	protected void doExecute() {	399	protected void doExecute() {
395	// nothing to do	400	// nothing to do
396	}	401	}
397		402
		403	@Override
398	public boolean canRedo() {	404	public boolean canRedo() {
399	return false;	405	return false;
400	}};	406	}};
Lines 412-417 Link Here
412	// Test fixtures	418	// Test fixtures
413	//	419	//
414		420
		421	@Override
415	protected void doSetUp()	422	protected void doSetUp()
416	throws Exception {	423	throws Exception {
417		424
Lines 421-426 Link Here
421	validationEnabled = true;	428	validationEnabled = true;
422	}	429	}
423		430
		431	@Override
424	protected void doTearDown()	432	protected void doTearDown()
425	throws Exception {	433	throws Exception {
426		434

Lines 167-173 Link Here

(-)src/org/eclipse/emf/workspace/tests/EMFCommandOperationTest.java (-6 / +11 lines)
167		167
168	assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$	168	assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$
169	assertEquals(1, newLibrary.getBooks().size());	169	assertEquals(1, newLibrary.getBooks().size());
170	assertEquals("New Book", ((Book) newLibrary.getBooks().get(0)).getTitle()); //$NON-NLS-1$	170	assertEquals("New Book", newLibrary.getBooks().get(0).getTitle()); //$NON-NLS-1$
171		171
172	commit();	172	commit();
173		173
Lines 198-204 Link Here
198	assertTrue(root.getBranches().contains(newLibrary));	198	assertTrue(root.getBranches().contains(newLibrary));
199	assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$	199	assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$
200	assertEquals(1, newLibrary.getBooks().size());	200	assertEquals(1, newLibrary.getBooks().size());
201	assertEquals("New Book", ((Book) newLibrary.getBooks().get(0)).getTitle()); //$NON-NLS-1$	201	assertEquals("New Book", newLibrary.getBooks().get(0).getTitle()); //$NON-NLS-1$
202		202
203	commit();	203	commit();
204	}	204	}
Lines 237-243 Link Here
237		237
238	// the book is created by the first trigger	238	// the book is created by the first trigger
239	assertEquals(1, newLibrary.getBooks().size());	239	assertEquals(1, newLibrary.getBooks().size());
240	Book book = (Book) newLibrary.getBooks().get(0);	240	Book book = newLibrary.getBooks().get(0);
241	assertEquals("New Book", book.getTitle()); //$NON-NLS-1$	241	assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
242		242
243	// the publication date is created by the cascaded trigger	243	// the publication date is created by the cascaded trigger
Lines 271-277 Link Here
271	// verify that the changes were redone	271	// verify that the changes were redone
272	assertTrue(root.getBranches().contains(newLibrary));	272	assertTrue(root.getBranches().contains(newLibrary));
273	assertEquals(1, newLibrary.getBooks().size());	273	assertEquals(1, newLibrary.getBooks().size());
274	book = (Book) newLibrary.getBooks().get(0);	274	book = newLibrary.getBooks().get(0);
275	assertEquals("New Book", book.getTitle()); //$NON-NLS-1$	275	assertEquals("New Book", book.getTitle()); //$NON-NLS-1$
276	assertNotNull(book.getPublicationDate());	276	assertNotNull(book.getPublicationDate());
277		277
Lines 298-303 Link Here
298	IUndoContext ctx = new TestUndoContext();	298	IUndoContext ctx = new TestUndoContext();
299		299
300	Command cmd = new RecordingCommand(domain) {	300	Command cmd = new RecordingCommand(domain) {
		301	@Override
301	protected void doExecute() {	302	protected void doExecute() {
302	book.setTitle(newTitle);	303	book.setTitle(newTitle);
303	newAuthor.getBooks().add(book);	304	newAuthor.getBooks().add(book);
Lines 368-373 Link Here
368		369
369	// add a new library. Our triggers will set a default name and book	370	// add a new library. Our triggers will set a default name and book
370	Command cmd = new RecordingCommand(domain) {	371	Command cmd = new RecordingCommand(domain) {
		372	@Override
371	protected void doExecute() {	373	protected void doExecute() {
372	root.getBranches().add(newLibrary);	374	root.getBranches().add(newLibrary);
373	}};	375	}};
Lines 385-391 Link Here
385		387
386	assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$	388	assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$
387	assertEquals(1, newLibrary.getBooks().size());	389	assertEquals(1, newLibrary.getBooks().size());
388	assertEquals("New Book", ((Book) newLibrary.getBooks().get(0)).getTitle()); //$NON-NLS-1$	390	assertEquals("New Book", newLibrary.getBooks().get(0).getTitle()); //$NON-NLS-1$
389		391
390	commit();	392	commit();
391		393
Lines 416-422 Link Here
416	assertTrue(root.getBranches().contains(newLibrary));	418	assertTrue(root.getBranches().contains(newLibrary));
417	assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$	419	assertEquals("New Library", newLibrary.getName()); //$NON-NLS-1$
418	assertEquals(1, newLibrary.getBooks().size());	420	assertEquals(1, newLibrary.getBooks().size());
419	assertEquals("New Book", ((Book) newLibrary.getBooks().get(0)).getTitle()); //$NON-NLS-1$	421	assertEquals("New Book", newLibrary.getBooks().get(0).getTitle()); //$NON-NLS-1$
420		422
421	commit();	423	commit();
422	}	424	}
Lines 489-494 Link Here
489	// nothing to do	491	// nothing to do
490	}	492	}
491		493
		494	@Override
492	public boolean canRedo() {	495	public boolean canRedo() {
493	return false;	496	return false;
494	}};	497	}};
Lines 509-520 Link Here
509	public void test_nonredoableTriggerCommand_138287() {	512	public void test_nonredoableTriggerCommand_138287() {
510	// add a trigger command that is not redoable	513	// add a trigger command that is not redoable
511	domain.addResourceSetListener(new TriggerListener() {	514	domain.addResourceSetListener(new TriggerListener() {
		515	@Override
512	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {	516	protected Command trigger(TransactionalEditingDomain domain, Notification notification) {
513	return new TestCommand.Redoable() {	517	return new TestCommand.Redoable() {
514	public void execute() {	518	public void execute() {
515	// nothing to do	519	// nothing to do
516	}	520	}
517		521
		522	@Override
518	public boolean canRedo() {	523	public boolean canRedo() {
519	return false;	524	return false;
520	}};	525	}};

Lines 27-38 Link Here

(-)src/org/eclipse/emf/workspace/tests/TestsPlugin.java (+2 lines)
27	public class TestsPlugin extends Plugin {	27	public class TestsPlugin extends Plugin {
28	public static TestsPlugin instance;	28	public static TestsPlugin instance;
29		29
		30	@Override
30	public void start(BundleContext context) throws Exception {	31	public void start(BundleContext context) throws Exception {
31	super.start(context);	32	super.start(context);
32		33
33	instance = this;	34	instance = this;
34	}	35	}
35		36
		37	@Override
36	public void stop(BundleContext context) throws Exception {	38	public void stop(BundleContext context) throws Exception {
37	instance = null;	39	instance = null;
38		40

Lines 29-38 Link Here

(-)src/org/eclipse/emf/workspace/tests/fixtures/TestCommand.java (+2 lines)
29	public abstract class TestCommand	29	public abstract class TestCommand
30	extends AbstractCommand {	30	extends AbstractCommand {
31		31
		32	@Override
32	protected boolean prepare() {	33	protected boolean prepare() {
33	return true;	34	return true;
34	}	35	}
35		36
		37	@Override
36	public void undo() {	38	public void undo() {
37	// do nothing	39	// do nothing
38	}	40	}

Lines 16-22 Link Here

(-)src/org/eclipse/emf/workspace/tests/fixtures/NonEMFCompositeOperation.java (-14 / +11 lines)
16	*/	16	*/
17	package org.eclipse.emf.workspace.tests.fixtures;	17	package org.eclipse.emf.workspace.tests.fixtures;
18		18
19	import java.util.Iterator;
20	import java.util.List;	19	import java.util.List;
21	import java.util.ListIterator;	20	import java.util.ListIterator;
22		21
Lines 40-62 Link Here
40	extends AbstractOperation	39	extends AbstractOperation
41	implements ICompositeOperation {	40	implements ICompositeOperation {
42		41
43	private List children = new java.util.ArrayList();	42	private final List<IUndoableOperation> children = new java.util.ArrayList<IUndoableOperation>();
44		43
45	public NonEMFCompositeOperation() {	44	public NonEMFCompositeOperation() {
46	super("Non-EMF Composite"); //$NON-NLS-1$	45	super("Non-EMF Composite"); //$NON-NLS-1$
47	}	46	}
48		47
49	// Documentation copied from the inherited specification	48	// Documentation copied from the inherited specification
		49	@Override
50	public IStatus execute(IProgressMonitor monitor, IAdaptable info)	50	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
51	throws ExecutionException {	51	throws ExecutionException {
52		52
53	monitor.beginTask(getLabel(), children.size());	53	monitor.beginTask(getLabel(), children.size());
54		54
55	try {	55	try {
56	for (Iterator iter = children.iterator(); iter.hasNext();) {	56	for (IUndoableOperation next : children) {
57	((IUndoableOperation) iter.next()).execute(	57	next.execute(new SubProgressMonitor(monitor, 1), info);
58	new SubProgressMonitor(monitor, 1),
59	info);
60	}	58	}
61	} finally {	59	} finally {
62	monitor.done();	60	monitor.done();
Lines 66-81 Link Here
66	}	64	}
67		65
68	// Documentation copied from the inherited specification	66	// Documentation copied from the inherited specification
		67	@Override
69	public IStatus redo(IProgressMonitor monitor, IAdaptable info)	68	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
70	throws ExecutionException {	69	throws ExecutionException {
71		70
72	monitor.beginTask(getLabel(), children.size());	71	monitor.beginTask(getLabel(), children.size());
73		72
74	try {	73	try {
75	for (Iterator iter = children.iterator(); iter.hasNext();) {	74	for (IUndoableOperation next : children) {
76	((IUndoableOperation) iter.next()).redo(	75	next.redo(new SubProgressMonitor(monitor, 1), info);
77	new SubProgressMonitor(monitor, 1),
78	info);
79	}	76	}
80	} finally {	77	} finally {
81	monitor.done();	78	monitor.done();
Lines 85-100 Link Here
85	}	82	}
86		83
87	// Documentation copied from the inherited specification	84	// Documentation copied from the inherited specification
		85	@Override
88	public IStatus undo(IProgressMonitor monitor, IAdaptable info)	86	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
89	throws ExecutionException {	87	throws ExecutionException {
90		88
91	monitor.beginTask(getLabel(), children.size());	89	monitor.beginTask(getLabel(), children.size());
92		90
93	try {	91	try {
94	for (ListIterator iter = children.listIterator(children.size()); iter.hasPrevious();) {	92	for (ListIterator<IUndoableOperation> iter = children.listIterator(children.size());
95	((IUndoableOperation) iter.previous()).undo(	93	iter.hasPrevious();) {
96	new SubProgressMonitor(monitor, 1),	94	iter.previous().undo(new SubProgressMonitor(monitor, 1), info);
97	info);
98	}	95	}
99	} finally {	96	} finally {
100	monitor.done();	97	monitor.done();

Lines 53-83 Link Here

(-)src/org/eclipse/emf/workspace/tests/fixtures/NullOperation.java (+6 lines)
53	this.isRedoable = isRedoable;	53	this.isRedoable = isRedoable;
54	}	54	}
55		55
		56	@Override
56	public boolean canExecute() {	57	public boolean canExecute() {
57	return isExecutable;	58	return isExecutable;
58	}	59	}
59		60
		61	@Override
60	public boolean canUndo() {	62	public boolean canUndo() {
61	return isUndoable;	63	return isUndoable;
62	}	64	}
63		65
		66	@Override
64	public boolean canRedo() {	67	public boolean canRedo() {
65	return isRedoable;	68	return isRedoable;
66	}	69	}
67		70
68	// Documentation copied from the inherited specification	71	// Documentation copied from the inherited specification
		72	@Override
69	public IStatus execute(IProgressMonitor monitor, IAdaptable info)	73	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
70	throws ExecutionException {	74	throws ExecutionException {
71	return Status.OK_STATUS;	75	return Status.OK_STATUS;
72	}	76	}
73		77
74	// Documentation copied from the inherited specification	78	// Documentation copied from the inherited specification
		79	@Override
75	public IStatus redo(IProgressMonitor monitor, IAdaptable info)	80	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
76	throws ExecutionException {	81	throws ExecutionException {
77	return Status.OK_STATUS;	82	return Status.OK_STATUS;
78	}	83	}
79		84
80	// Documentation copied from the inherited specification	85	// Documentation copied from the inherited specification
		86	@Override
81	public IStatus undo(IProgressMonitor monitor, IAdaptable info)	87	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
82	throws ExecutionException {	88	throws ExecutionException {
83	return Status.OK_STATUS;	89	return Status.OK_STATUS;

Lines 188-193 Link Here

(-)src/org/eclipse/emf/workspace/util/tests/WorkspaceSynchronizerTest.java (-3 / +8 lines)
188	"moveDestination.extlibrary"); //$NON-NLS-1$	188	"moveDestination.extlibrary"); //$NON-NLS-1$
189		189
190	Job job = new WorkspaceJob("Modify Workspace") { //$NON-NLS-1$	190	Job job = new WorkspaceJob("Modify Workspace") { //$NON-NLS-1$
		191	@Override
191	public IStatus runInWorkspace(IProgressMonitor monitor)	192	public IStatus runInWorkspace(IProgressMonitor monitor)
192	throws CoreException {	193	throws CoreException {
193	// make two copies	194	// make two copies
Lines 223-228 Link Here
223	// make the workspace changes in a single job so that all deltas	224	// make the workspace changes in a single job so that all deltas
224	// are fired in one batch	225	// are fired in one batch
225	job = new WorkspaceJob("Modify Workspace") { //$NON-NLS-1$	226	job = new WorkspaceJob("Modify Workspace") { //$NON-NLS-1$
		227	@Override
226	public IStatus runInWorkspace(IProgressMonitor monitor)	228	public IStatus runInWorkspace(IProgressMonitor monitor)
227	throws CoreException {	229	throws CoreException {
228	// delete one file	230	// delete one file
Lines 531-536 Link Here
531	// Fixture methods	533	// Fixture methods
532	//	534	//
533		535
		536	@Override
534	protected void doSetUp()	537	protected void doSetUp()
535	throws Exception {	538	throws Exception {
536		539
Lines 540-545 Link Here
540	synch = new WorkspaceSynchronizer(domain, delegate);	543	synch = new WorkspaceSynchronizer(domain, delegate);
541	}	544	}
542		545
		546	@Override
543	protected void doTearDown()	547	protected void doTearDown()
544	throws Exception {	548	throws Exception {
545		549
Lines 563-568 Link Here
563	setSystem(true);	567	setSystem(true);
564	}	568	}
565		569
		570	@Override
566	protected IStatus run(IProgressMonitor monitor) {	571	protected IStatus run(IProgressMonitor monitor) {
567	synchronized (lock) {	572	synchronized (lock) {
568	lock.notify();	573	lock.notify();
Lines 589-597 Link Here
589	* @author Christian W. Damus (cdamus)	594	* @author Christian W. Damus (cdamus)
590	*/	595	*/
591	static class TestDelegate implements WorkspaceSynchronizer.Delegate {	596	static class TestDelegate implements WorkspaceSynchronizer.Delegate {
592	final List deletedResources = new java.util.ArrayList();	597	final List<Resource> deletedResources = new java.util.ArrayList<Resource>();
593	final Map movedResources = new java.util.LinkedHashMap();	598	final Map<Resource, URI> movedResources = new java.util.LinkedHashMap<Resource, URI>();
594	final List changedResources = new java.util.ArrayList();	599	final List<Resource> changedResources = new java.util.ArrayList<Resource>();
595		600
596	boolean defaultBehaviour = false;	601	boolean defaultBehaviour = false;
597		602

Lines 45-51 Link Here

(-)src/org/eclipse/emf/workspace/util/tests/ValidateEditTest.java (-2 / +4 lines)
45		45
46	private Book book;	46	private Book book;
47		47
48	private Command cmd = new TestCommand() {	48	private final Command cmd = new TestCommand() {
49	public void execute() {	49	public void execute() {
50	try {	50	try {
51	book.setTitle(newTitle);	51	book.setTitle(newTitle);
Lines 102-107 Link Here
102	// Fixture methods	102	// Fixture methods
103	//	103	//
104		104
		105	@Override
105	protected void doSetUp()	106	protected void doSetUp()
106	throws Exception {	107	throws Exception {
107		108
Lines 118-123 Link Here
118	assertNotNull(book);	119	assertNotNull(book);
119	}	120	}
120		121
		122	@Override
121	protected void doTearDown()	123	protected void doTearDown()
122	throws Exception {	124	throws Exception {
123		125
Lines 138-144 Link Here
138	}	140	}
139		141
140	void setValidateEdit() {	142	void setValidateEdit() {
141	TransactionalEditingDomain.DefaultOptions defaults = (TransactionalEditingDomain.DefaultOptions) TransactionUtil	143	TransactionalEditingDomain.DefaultOptions defaults = TransactionUtil
142	.getAdapter(domain, TransactionalEditingDomain.DefaultOptions.class);	144	.getAdapter(domain, TransactionalEditingDomain.DefaultOptions.class);
143		145
144	defaults.setDefaultTransactionOptions(Collections.singletonMap(	146	defaults.setDefaultTransactionOptions(Collections.singletonMap(

Lines 42-51 Link Here

(-)src/org/eclipse/emf/workspace/examples/extlibrary/console/ConsoleUtil.java (-5 / +8 lines)
42	public class ConsoleUtil {	42	public class ConsoleUtil {
43		43
44	/** cache for console name to actual console object mapping*/	44	/** cache for console name to actual console object mapping*/
45	private static Map nameToConsole = new HashMap();	45	private static Map<String, MessageConsole> nameToConsole =
		46	new HashMap<String, MessageConsole>();
46		47
47	/** cache for 'console name' to 'stream for that console' mapping */	48	/** cache for 'console name' to 'stream for that console' mapping */
48	private static Map nameToStream = new HashMap();	49	private static Map<String, MessageConsoleStream> nameToStream =
		50	new HashMap<String, MessageConsoleStream>();
49		51
50	/**	52	/**
51	* Registers the console with the Eclipse Console Manager.	53	* Registers the console with the Eclipse Console Manager.
Lines 64-70 Link Here
64	nameToConsole.put(name, console );	66	nameToConsole.put(name, console );
65	}	67	}
66		68
67	return (MessageConsole) nameToConsole.get( name);	69	return nameToConsole.get( name);
68	}	70	}
69		71
70		72
Lines 75-81 Link Here
75	*/	77	*/
76	public synchronized static void unregisterConsole(String name){	78	public synchronized static void unregisterConsole(String name){
77	if(nameToConsole.containsKey( name)){	79	if(nameToConsole.containsKey( name)){
78	ConsolePlugin.getDefault().getConsoleManager().removeConsoles( new IConsole[]{(IConsole)nameToConsole.get(name)});	80	ConsolePlugin.getDefault().getConsoleManager().removeConsoles(
		81	new IConsole[]{nameToConsole.get(name)});
79	nameToConsole.remove( name);	82	nameToConsole.remove( name);
80	}	83	}
81	}	84	}
Lines 97-103 Link Here
97		100
98	}	101	}
99		102
100	return (MessageConsoleStream) nameToStream.get(name);	103	return nameToStream.get(name);
101		104
102	}	105	}
103		106

Lines 23-28 Link Here

(-)src/org/eclipse/emf/workspace/examples/extlibrary/actions/LongRunningReadAction.java (-2 / +5 lines)
23	import org.eclipse.emf.edit.domain.IEditingDomainProvider;	23	import org.eclipse.emf.edit.domain.IEditingDomainProvider;
24	import org.eclipse.emf.transaction.RunnableWithResult;	24	import org.eclipse.emf.transaction.RunnableWithResult;
25	import org.eclipse.emf.transaction.TransactionalEditingDomain;	25	import org.eclipse.emf.transaction.TransactionalEditingDomain;
		26	import org.eclipse.emf.transaction.util.TransactionUtil;
26	import org.eclipse.emf.workspace.examples.extlibrary.console.ConsoleUtil;	27	import org.eclipse.emf.workspace.examples.extlibrary.console.ConsoleUtil;
27	import org.eclipse.emf.workspace.examples.extlibrary.internal.l10n.Messages;	28	import org.eclipse.emf.workspace.examples.extlibrary.internal.l10n.Messages;
28	import org.eclipse.jface.action.Action;	29	import org.eclipse.jface.action.Action;
Lines 50-55 Link Here
50	super(Messages.readJob_title);	51	super(Messages.readJob_title);
51	}	52	}
52		53
		54	@Override
53	public void run() {	55	public void run() {
54	if (domain != null) {	56	if (domain != null) {
55	ConsoleUtil.showConsole(CONSOLE);	57	ConsoleUtil.showConsole(CONSOLE);
Lines 92-101 Link Here
92	setPriority(Job.LONG);	94	setPriority(Job.LONG);
93	}	95	}
94		96
		97	@Override
95	protected IStatus run(final IProgressMonitor monitor) {	98	protected IStatus run(final IProgressMonitor monitor) {
96	try {	99	try {
97	return (IStatus) domain.runExclusive(	100	return TransactionUtil.runExclusive(domain,
98	new RunnableWithResult.Impl() {	101	new RunnableWithResult.Impl<IStatus>() {
99	public void run() {	102	public void run() {
100	setResult(longRunningRead(monitor));	103	setResult(longRunningRead(monitor));
101	}});	104	}});

Lines 13-25 Link Here

(-)META-INF/MANIFEST.MF (-7 / +7 lines)
13	org.eclipse.emf.workspace.examples.extlibrary.presentation	13	org.eclipse.emf.workspace.examples.extlibrary.presentation
14	Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",	14	Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
15	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,	15	org.eclipse.core.resources;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
16	org.eclipse.emf.examples.library.edit;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,	16	org.eclipse.emf.examples.library.edit;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
17	org.eclipse.emf.ecore.xmi;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,	17	org.eclipse.emf.ecore.xmi;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
18	org.eclipse.emf.edit.ui;bundle-version="[2.2.0,3.0.0)";visibility:=reexport,	18	org.eclipse.emf.edit.ui;bundle-version="[2.3.0,3.0.0)";visibility:=reexport,
19	org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,	19	org.eclipse.ui.ide;bundle-version="[3.2.0,4.0.0)";visibility:=reexport,
20	org.eclipse.emf.workspace;bundle-version="[1.0.0,2.0.0)",	20	org.eclipse.emf.workspace;bundle-version="[1.2.0,2.0.0)",
21	org.eclipse.emf.transaction.ui;bundle-version="[1.0.0,2.0.0)",	21	org.eclipse.emf.transaction.ui;bundle-version="[1.2.0,2.0.0)",
22	org.eclipse.emf.workspace.ui;bundle-version="[1.0.0,2.0.0)",	22	org.eclipse.emf.workspace.ui;bundle-version="[1.2.0,2.0.0)",
23	org.eclipse.ui.console;bundle-version="[3.1.100,4.0.0)"	23	org.eclipse.ui.console;bundle-version="[3.1.100,4.0.0)"
24	Eclipse-LazyStart: true	24	Eclipse-LazyStart: true
25	Bundle-RequiredExecutionEnvironment: J2SE-1.4	25	Bundle-RequiredExecutionEnvironment: J2SE-1.5

Lines 54-60 Link Here

(-)src/org/eclipse/emf/transaction/impl/TransactionalCommandStackImpl.java (-5 / +14 lines)
54	*	54	*
55	* @since 1.1	55	* @since 1.1
56	*/	56	*/
57	protected void doExecute(Command command, Map options) throws InterruptedException, RollbackException {	57	@Override
		58	protected void doExecute(Command command, Map<?, ?> options) throws InterruptedException, RollbackException {
58	InternalTransaction tx = createTransaction(command, options);	59	InternalTransaction tx = createTransaction(command, options);
59		60
60	try {	61	try {
Lines 98-110 Link Here
98	*	99	*
99	* @since 1.1	100	* @since 1.1
100	*/	101	*/
101	protected void handleRollback(Command command, RollbackException rbe) {	102	@Override
		103	protected void handleRollback(Command command, RollbackException rbe) {
102	if ((command != null) && (top >= 0) && (commandList.get(top) == command)) {	104	if ((command != null) && (top >= 0) && (commandList.get(top) == command)) {
103	// pop the failed command	105	// pop the failed command
104	commandList.remove(top--);	106	commandList.remove(top--);
105		107
106	if (top >= 0) {	108	if (top >= 0) {
107	mostRecentCommand = (Command) commandList.get(top);	109	mostRecentCommand = commandList.get(top);
108	} else {	110	} else {
109	mostRecentCommand = null;	111	mostRecentCommand = null;
110	}	112	}
Lines 118-123 Link Here
118	* an undo transaction (a read/write transaction with the	120	* an undo transaction (a read/write transaction with the
119	* {@link #getUndoRedoOptions() undo/redo options}).	121	* {@link #getUndoRedoOptions() undo/redo options}).
120	*/	122	*/
		123	@Override
121	public void undo() {	124	public void undo() {
122	if (canUndo()) {	125	if (canUndo()) {
123	try {	126	try {
Lines 138-143 Link Here
138	* Extends the inherited implementation to consider the redoability of	141	* Extends the inherited implementation to consider the redoability of
139	* {@link ConditionalRedoCommand}s.	142	* {@link ConditionalRedoCommand}s.
140	*/	143	*/
		144	@Override
141	public boolean canRedo() {	145	public boolean canRedo() {
142	boolean result = super.canRedo();	146	boolean result = super.canRedo();
143		147
Lines 158-163 Link Here
158	* of a redo transaction (a read/write transaction with the	162	* of a redo transaction (a read/write transaction with the
159	* {@link #getUndoRedoOptions() undo/redo options}).	163	* {@link #getUndoRedoOptions() undo/redo options}).
160	*/	164	*/
		165	@Override
161	public void redo() {	166	public void redo() {
162	if (canRedo()) {	167	if (canRedo()) {
163	try {	168	try {
Lines 175-181 Link Here
175	}	180	}
176		181
177	// Documentation copied from the inherited specification	182	// Documentation copied from the inherited specification
178	public EMFCommandTransaction createTransaction(Command command, Map options) throws InterruptedException {	183	public EMFCommandTransaction createTransaction(Command command, Map<?, ?> options)
		184	throws InterruptedException {
		185
179	EMFCommandTransaction result;	186	EMFCommandTransaction result;
180		187
181	if (command instanceof TriggerCommand) {	188	if (command instanceof TriggerCommand) {
Lines 191-197 Link Here
191	}	198	}
192		199
193	// Documentation copied from the inherited specification	200	// Documentation copied from the inherited specification
194	public void executeTriggers(Command command, List triggers, Map options) throws InterruptedException, RollbackException {	201	public void executeTriggers(Command command, List<Command> triggers,
		202	Map<?, ?> options) throws InterruptedException, RollbackException {
		203
195	if (!triggers.isEmpty()) {	204	if (!triggers.isEmpty()) {
196	TriggerCommand trigger = (command == null)	205	TriggerCommand trigger = (command == null)
197	? new TriggerCommand(triggers)	206	? new TriggerCommand(triggers)

Lines 95-101 Link Here

(-)src/org/eclipse/emf/transaction/impl/AbstractTransactionalCommandStack.java (-11 / +13 lines)
95	* transaction (if any) and passing the exception along to	95	* transaction (if any) and passing the exception along to
96	* the registered exception handler (if any).	96	* the registered exception handler (if any).
97	*/	97	*/
98	protected void handleError(Exception exception) {	98	@Override
		99	protected void handleError(Exception exception) {
99	InternalTransaction active = getDomain().getActiveTransaction();	100	InternalTransaction active = getDomain().getActiveTransaction();
100		101
101	if ((active != null) && active.isActive()) {	102	if ((active != null) && active.isActive()) {
Lines 156-162 Link Here
156	* command is rolled back. Note that <code>doExecute()</code> is only	157	* command is rolled back. Note that <code>doExecute()</code> is only
157	* called if the command is {@linkplain Command#canExecute() executable}.	158	* called if the command is {@linkplain Command#canExecute() executable}.
158	*/	159	*/
159	public void execute(Command command, Map options)	160	public void execute(Command command, Map<?, ?> options)
160	throws InterruptedException, RollbackException {	161	throws InterruptedException, RollbackException {
161		162
162	if ((command != null) && command.canExecute()) {	163	if ((command != null) && command.canExecute()) {
Lines 184-190 Link Here
184	* waiting to start the transaction	185	* waiting to start the transaction
185	* @throws RollbackException if the execution of the command is rolled back	186	* @throws RollbackException if the execution of the command is rolled back
186	*/	187	*/
187	protected abstract void doExecute(Command command, Map options)	188	protected abstract void doExecute(Command command, Map<?, ?> options)
188	throws InterruptedException, RollbackException;	189	throws InterruptedException, RollbackException;
189		190
190	/**	191	/**
Lines 212-218 Link Here
212	* checked exception thrown by that method is handled by	213	* checked exception thrown by that method is handled by
213	* {@link #handleError(Exception)} but is not propagated.	214	* {@link #handleError(Exception)} but is not propagated.
214	*/	215	*/
215	public void execute(Command command) {	216	@Override
		217	public void execute(Command command) {
216	try {	218	try {
217	execute(command, null);	219	execute(command, null);
218	} catch (InterruptedException e) {	220	} catch (InterruptedException e) {
Lines 244-250 Link Here
244	*	246	*
245	* @return my editing domain's transaction options for undo/redo	247	* @return my editing domain's transaction options for undo/redo
246	*/	248	*/
247	protected Map getUndoRedoOptions() {	249	protected Map<?, ?> getUndoRedoOptions() {
248	return domain.getUndoRedoOptions();	250	return domain.getUndoRedoOptions();
249	}	251	}
250		252
Lines 255-270 Link Here
255	* @param options a client-supplied options map	257	* @param options a client-supplied options map
256	* @return a derived map of options suitable for trigger transactions	258	* @return a derived map of options suitable for trigger transactions
257	*/	259	*/
258	public static final Map makeTriggerTransactionOptions(Map options) {	260	public static final Map<Object, Object> makeTriggerTransactionOptions(Map<?, ?> options) {
259	Map result;	261	Map<Object, Object> result;
260		262
261	if ((options == null) \|\| options.isEmpty()) {	263	if ((options == null) \|\| options.isEmpty()) {
262	result = Collections.singletonMap(	264	result = Collections.<Object, Object>singletonMap(
263	TransactionImpl.OPTION_IS_TRIGGER_TRANSACTION, Boolean.TRUE);	265	TransactionImpl.OPTION_IS_TRIGGER_TRANSACTION, true);
264	} else {	266	} else {
265	result = new java.util.HashMap(options);	267	result = new java.util.HashMap<Object, Object>(options);
266	result.put(	268	result.put(
267	TransactionImpl.OPTION_IS_TRIGGER_TRANSACTION, Boolean.TRUE);	269	TransactionImpl.OPTION_IS_TRIGGER_TRANSACTION, true);
268	}	270	}
269		271
270	return result;	272	return result;

Lines 17-23 Link Here

(-)src/org/eclipse/emf/transaction/impl/TransactionImpl.java (-29 / +33 lines)
17	package org.eclipse.emf.transaction.impl;	17	package org.eclipse.emf.transaction.impl;
18		18
19	import java.util.Collections;	19	import java.util.Collections;
20	import java.util.Iterator;
21	import java.util.List;	20	import java.util.List;
22	import java.util.Map;	21	import java.util.Map;
23		22
Lines 86-98 Link Here
86	* As of the 1.2 release, this map is immutable.	85	* As of the 1.2 release, this map is immutable.
87	* </p>	86	* </p>
88	*/	87	*/
89	public static final Map DEFAULT_UNDO_REDO_OPTIONS;	88	public static final Map<Object, Object> DEFAULT_UNDO_REDO_OPTIONS;
90	static {	89	static {
91	Map map = new java.util.HashMap();	90	Map<Object, Object> map = new java.util.HashMap<Object, Object>();
92	map.put(Transaction.OPTION_NO_TRIGGERS, Boolean.TRUE);	91	map.put(Transaction.OPTION_NO_TRIGGERS, true);
93	map.put(Transaction.OPTION_NO_UNDO, Boolean.TRUE);	92	map.put(Transaction.OPTION_NO_UNDO, true);
94	map.put(Transaction.OPTION_NO_VALIDATION, Boolean.TRUE);	93	map.put(Transaction.OPTION_NO_VALIDATION, true);
95	map.put(Transaction.OPTION_IS_UNDO_REDO_TRANSACTION, Boolean.TRUE);	94	map.put(Transaction.OPTION_IS_UNDO_REDO_TRANSACTION, true);
96	DEFAULT_UNDO_REDO_OPTIONS = Collections.unmodifiableMap(map);	95	DEFAULT_UNDO_REDO_OPTIONS = Collections.unmodifiableMap(map);
97	}	96	}
98		97
Lines 103-110 Link Here
103	private final TransactionalEditingDomain domain;	102	private final TransactionalEditingDomain domain;
104	private Thread owner;	103	private Thread owner;
105	private final boolean readOnly;	104	private final boolean readOnly;
106	private final Map options;	105	private final Map<Object, Object> options;
107	private final Map mutableOptions;	106	private final Map<Object, Object> mutableOptions;
108		107
109	private InternalTransaction parent;	108	private InternalTransaction parent;
110	private InternalTransaction root;	109	private InternalTransaction root;
Lines 112-118 Link Here
112	private boolean active;	111	private boolean active;
113	private boolean closing; // prevents re-entrant commit/rollback	112	private boolean closing; // prevents re-entrant commit/rollback
114	private boolean rollingBack;	113	private boolean rollingBack;
115	protected List notifications;	114	protected List<Notification> notifications;
116	protected final CompositeChangeDescription change;	115	protected final CompositeChangeDescription change;
117		116
118	private boolean aborted;	117	private boolean aborted;
Lines 140-151 Link Here
140	* if I am read/write	139	* if I am read/write
141	* @param options my options, or <code>null</code> for defaults	140	* @param options my options, or <code>null</code> for defaults
142	*/	141	*/
143	public TransactionImpl(TransactionalEditingDomain domain, boolean readOnly, Map options) {	142	public TransactionImpl(TransactionalEditingDomain domain, boolean readOnly,
		143	Map<?, ?> options) {
144	this.domain = domain;	144	this.domain = domain;
145	this.readOnly = readOnly;	145	this.readOnly = readOnly;
146	this.owner = Thread.currentThread();	146	this.owner = Thread.currentThread();
147		147
148	this.mutableOptions = new java.util.HashMap();	148	this.mutableOptions = new java.util.HashMap<Object, Object>();
149	this.options = Collections.unmodifiableMap(mutableOptions);	149	this.options = Collections.unmodifiableMap(mutableOptions);
150		150
151	if (options != null) {	151	if (options != null) {
Lines 159-165 Link Here
159	change = new CompositeChangeDescription();	159	change = new CompositeChangeDescription();
160		160
161	if (collectsNotifications(this)) {	161	if (collectsNotifications(this)) {
162	notifications = new org.eclipse.emf.common.util.BasicEList.FastCompare();	162	notifications = new org.eclipse.emf.common.util.BasicEList.FastCompare<Notification>();
163	} else {	163	} else {
164	// no need to collect any notifications if we won't use them	164	// no need to collect any notifications if we won't use them
165	notifications = null;	165	notifications = null;
Lines 265-271 Link Here
265	}	265	}
266		266
267	// Documentation copied from the inherited specification	267	// Documentation copied from the inherited specification
268	public final Map getOptions() {	268	public final Map<Object, Object> getOptions() {
269	return options;	269	return options;
270	}	270	}
271		271
Lines 628-635 Link Here
628	// my changes except for certain special cases where we must	628	// my changes except for certain special cases where we must
629	// prevent the passing of our changes.	629	// prevent the passing of our changes.
630		630
631	if (getOptions().get(BLOCK_CHANGE_PROPAGATION) == Boolean.TRUE	631	if (hasOption(this, BLOCK_CHANGE_PROPAGATION)
632	&& parent.getOptions().get(ALLOW_CHANGE_PROPAGATION_BLOCKING) == Boolean.TRUE) {	632	&& hasOption(parent, ALLOW_CHANGE_PROPAGATION_BLOCKING)) {
633	parent.resume(null);	633	parent.resume(null);
634	} else {	634	} else {
635	parent.resume(change);	635	parent.resume(change);
Lines 653-660 Link Here
653	}	653	}
654		654
655	// Documentation copied from the inherited specification	655	// Documentation copied from the inherited specification
656	public List getNotifications() {	656	public List<Notification> getNotifications() {
657	return (notifications == null)? Collections.EMPTY_LIST : notifications;	657	return (notifications == null)? Collections.<Notification>emptyList()
		658	: notifications;
658	}	659	}
659		660
660	/**	661	/**
Lines 679-685 Link Here
679	// Documentation copied from the inherited specification	680	// Documentation copied from the inherited specification
680	public void addTriggers(TriggerCommand triggers) {	681	public void addTriggers(TriggerCommand triggers) {
681	// extract out only the triggered commands (exclude the triggering command)	682	// extract out only the triggered commands (exclude the triggering command)
682	List triggerCommands = triggers.getTriggers();	683	List<Command> triggerCommands = triggers.getTriggers();
683	Command triggerCommand;	684	Command triggerCommand;
684		685
685	if (triggerCommands.isEmpty()) {	686	if (triggerCommands.isEmpty()) {
Lines 689-695 Link Here
689	// bug 165026: Must copy the list, because it may be read-only like	690	// bug 165026: Must copy the list, because it may be read-only like
690	// GMF's NOOP_TRIGGER command	691	// GMF's NOOP_TRIGGER command
691	triggerCommand = new ConditionalRedoCommand.Compound(	692	triggerCommand = new ConditionalRedoCommand.Compound(
692	new java.util.ArrayList(triggerCommands));	693	new java.util.ArrayList<Command>(triggerCommands));
693		694
694	if (this.triggers == null) {	695	if (this.triggers == null) {
695	this.triggers = triggerCommand;	696	this.triggers = triggerCommand;
Lines 703-709 Link Here
703	}	704	}
704		705
705	// Documentation copied from the inherited specification	706	// Documentation copied from the inherited specification
706	public void startPrivileged(PrivilegedRunnable runnable) {	707	public void startPrivileged(PrivilegedRunnable<?> runnable) {
707	if (runnable.getTransaction() != this) {	708	if (runnable.getTransaction() != this) {
708	throw new IllegalArgumentException(	709	throw new IllegalArgumentException(
709	"runnable has no privileges on this transaction"); //$NON-NLS-1$	710	"runnable has no privileges on this transaction"); //$NON-NLS-1$
Lines 723-729 Link Here
723	}	724	}
724		725
725	// Documentation copied from the inherited specification	726	// Documentation copied from the inherited specification
726	public void endPrivileged(PrivilegedRunnable runnable) {	727	public void endPrivileged(PrivilegedRunnable<?> runnable) {
727	if (runnable.getTransaction() != this) {	728	if (runnable.getTransaction() != this) {
728	throw new IllegalArgumentException(	729	throw new IllegalArgumentException(
729	"runnable has no privileges on this transaction"); //$NON-NLS-1$	730	"runnable has no privileges on this transaction"); //$NON-NLS-1$
Lines 746-757 Link Here
746		747
747	// if we have no parent transaction, then we are a root and we "inherit"	748	// if we have no parent transaction, then we are a root and we "inherit"
748	// the editing domain's default transaction options	749	// the editing domain's default transaction options
749	Map parentOptions = (parent == null) ? getDefaultOptions(getEditingDomain())	750	Map<?, ?> parentOptions = (parent == null) ?
750	: parent.getOptions();	751	getDefaultOptions(getEditingDomain()) : parent.getOptions();
751		752
752	if (parentOptions != null) {	753	if (parentOptions != null) {
753	for (Iterator iter = parentOptions.entrySet().iterator(); iter.hasNext();) {	754	for (Map.Entry<?, ?> next : parentOptions.entrySet()) {
754	Map.Entry next = (Map.Entry) iter.next();
755	Object option = next.getKey();	755	Object option = next.getKey();
756		756
757	if (ALLOW_CHANGE_PROPAGATION_BLOCKING.equals(option)) {	757	if (ALLOW_CHANGE_PROPAGATION_BLOCKING.equals(option)) {
Lines 770-775 Link Here
770	}	770	}
771	}	771	}
772		772
		773	@Override
773	public String toString() {	774	public String toString() {
774	return "Transaction[active=" + isActive() //$NON-NLS-1$	775	return "Transaction[active=" + isActive() //$NON-NLS-1$
775	+ ", read-only=" + isReadOnly() //$NON-NLS-1$	776	+ ", read-only=" + isReadOnly() //$NON-NLS-1$
Lines 889-898 Link Here
889	*	890	*
890	* @since 1.2	891	* @since 1.2
891	*/	892	*/
892	protected static Map getDefaultOptions(TransactionalEditingDomain domain) {	893	protected static Map<?, ?> getDefaultOptions(
893	TransactionalEditingDomain.DefaultOptions defaults = (TransactionalEditingDomain.DefaultOptions) TransactionUtil	894	TransactionalEditingDomain domain) {
		895
		896	TransactionalEditingDomain.DefaultOptions defaults = TransactionUtil
894	.getAdapter(domain, TransactionalEditingDomain.DefaultOptions.class);	897	.getAdapter(domain, TransactionalEditingDomain.DefaultOptions.class);
895		898
896	return (defaults == null)? Collections.EMPTY_MAP : defaults.getDefaultTransactionOptions();	899	return (defaults == null)? Collections.EMPTY_MAP
		900	: defaults.getDefaultTransactionOptions();
897	}	901	}
898	}	902	}

Lines 65-71 Link Here

(-)src/org/eclipse/emf/transaction/impl/InternalTransactionalCommandStack.java (-2 / +4 lines)
65	*	65	*
66	* @see #getDomain()	66	* @see #getDomain()
67	*/	67	*/
68	EMFCommandTransaction createTransaction(Command command, Map options) throws InterruptedException;	68	EMFCommandTransaction createTransaction(Command command, Map<?, ?> options)
		69	throws InterruptedException;
69		70
70	/**	71	/**
71	* Executes the specified list of trigger commands. All of the commands are	72	* Executes the specified list of trigger commands. All of the commands are
Lines 86-92 Link Here
86	* @see ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)	87	* @see ResourceSetListener#transactionAboutToCommit(org.eclipse.emf.transaction.ResourceSetChangeEvent)
87	* @see #createTransaction(Command, Map)	88	* @see #createTransaction(Command, Map)
88	*/	89	*/
89	void executeTriggers(Command command, List triggers, Map options) throws InterruptedException, RollbackException;	90	void executeTriggers(Command command, List<Command> triggers,
		91	Map<?, ?> options) throws InterruptedException, RollbackException;
90		92
91	/**	93	/**
92	* Disposes of my state and any additional resources that I may be	94	* Disposes of my state and any additional resources that I may be

Lines 22-30 Link Here

(-)src/org/eclipse/emf/transaction/impl/InternalTransactionalEditingDomain.java (-5 / +6 lines)
22	import org.eclipse.emf.transaction.NotificationFilter;	22	import org.eclipse.emf.transaction.NotificationFilter;
23	import org.eclipse.emf.transaction.ResourceSetListener;	23	import org.eclipse.emf.transaction.ResourceSetListener;
24	import org.eclipse.emf.transaction.RollbackException;	24	import org.eclipse.emf.transaction.RollbackException;
		25	import org.eclipse.emf.transaction.Transaction;
25	import org.eclipse.emf.transaction.TransactionalCommandStack;	26	import org.eclipse.emf.transaction.TransactionalCommandStack;
26	import org.eclipse.emf.transaction.TransactionalEditingDomain;	27	import org.eclipse.emf.transaction.TransactionalEditingDomain;
27	import org.eclipse.emf.transaction.Transaction;
28		28
29	/**	29	/**
30	* Internal interface that must be provided by any implementation of the public	30	* Internal interface that must be provided by any implementation of the public
Lines 54-60 Link Here
54	*	54	*
55	* @see #activate(InternalTransaction)	55	* @see #activate(InternalTransaction)
56	*/	56	*/
57	InternalTransaction startTransaction(boolean readOnly, Map options) throws InterruptedException;	57	InternalTransaction startTransaction(boolean readOnly, Map<?, ?> options)
		58	throws InterruptedException;
58		59
59	/**	60	/**
60	* Obtains the transaction that currently has access to me, and whose	61	* Obtains the transaction that currently has access to me, and whose
Lines 185-191 Link Here
185	*	186	*
186	* @return A map with undo/redo options.	187	* @return A map with undo/redo options.
187	*/	188	*/
188	Map getUndoRedoOptions();	189	Map<Object, Object> getUndoRedoOptions();
189		190
190	/**	191	/**
191	* Transfers ownership of this editing domain to the specified	192	* Transfers ownership of this editing domain to the specified
Lines 193-199 Link Here
193	*	194	*
194	* @param runnable the runnable whose thread is to borrow me	195	* @param runnable the runnable whose thread is to borrow me
195	*/	196	*/
196	void startPrivileged(PrivilegedRunnable runnable);	197	void startPrivileged(PrivilegedRunnable<?> runnable);
197		198
198	/**	199	/**
199	* Returns me to my previous owner, upon completion of the specified	200	* Returns me to my previous owner, upon completion of the specified
Lines 201-205 Link Here
201	*	202	*
202	* @param runnable the runnable whose thread had borrowed me	203	* @param runnable the runnable whose thread had borrowed me
203	*/	204	*/
204	void endPrivileged(PrivilegedRunnable runnable);	205	void endPrivileged(PrivilegedRunnable<?> runnable);
205	}	206	}

Lines 74-80 Link Here

(-)src/org/eclipse/emf/transaction/impl/ReadWriteValidatorImpl.java (-35 / +31 lines)
74	private NotificationTree transactionToPrecommit = null;	74	private NotificationTree transactionToPrecommit = null;
75		75
76	// maps the active transaction and its ancestors to notification tree nodes	76	// maps the active transaction and its ancestors to notification tree nodes
77	private final Map txToNode = new java.util.HashMap();	77	private final Map<InternalTransaction, NotificationTree> txToNode =
		78	new java.util.HashMap<InternalTransaction, NotificationTree>();
78		79
79	/**	80	/**
80	* Initializes me.	81	* Initializes me.
Lines 143-150 Link Here
143	}	144	}
144		145
145	// Documentation copied from the inherited method specification	146	// Documentation copied from the inherited method specification
146	public synchronized List getNotificationsForValidation(Transaction tx) {	147	public synchronized List<Notification> getNotificationsForValidation(Transaction tx) {
147	List result = null;	148	List<Notification> result = null;
148		149
149	if (tree != null) {	150	if (tree != null) {
150	NotificationTree nested = findTree(tx);	151	NotificationTree nested = findTree(tx);
Lines 158-165 Link Here
158	}	159	}
159		160
160	// Documentation copied from the inherited method specification	161	// Documentation copied from the inherited method specification
161	public synchronized List getNotificationsForPrecommit(Transaction tx) {	162	public synchronized List<Notification> getNotificationsForPrecommit(Transaction tx) {
162	List result = null;	163	List<Notification> result = null;
163		164
164	if ((transactionToPrecommit != null)	165	if ((transactionToPrecommit != null)
165	&& (transactionToPrecommit == findTree(tx))) {	166	&& (transactionToPrecommit == findTree(tx))) {
Lines 175-182 Link Here
175	}	176	}
176		177
177	// Documentation copied from the inherited method specification	178	// Documentation copied from the inherited method specification
178	public synchronized List getNotificationsForPostcommit(Transaction tx) {	179	public synchronized List<Notification> getNotificationsForPostcommit(Transaction tx) {
179	List result = null;	180	List<Notification> result = null;
180		181
181	if (tree != null) {	182	if (tree != null) {
182	NotificationTree nested = findTree(tx);	183	NotificationTree nested = findTree(tx);
Lines 203-209 Link Here
203	NotificationTree result = null;	204	NotificationTree result = null;
204		205
205	if (tree != null) {	206	if (tree != null) {
206	result = (NotificationTree) txToNode.get(tx);	207	result = txToNode.get(tx);
207	}	208	}
208		209
209	return result;	210	return result;
Lines 215-221 Link Here
215	IStatus result;	216	IStatus result;
216		217
217	try {	218	try {
218	IValidator validator = createValidator();	219	IValidator<Notification> validator = createValidator();
219		220
220	result = validator.validate(getNotificationsForValidation(tx));	221	result = validator.validate(getNotificationsForValidation(tx));
221	} catch (Exception e) {	222	} catch (Exception e) {
Lines 238-244 Link Here
238	*	239	*
239	* @return the validator	240	* @return the validator
240	*/	241	*/
241	protected IValidator createValidator() {	242	protected IValidator<Notification> createValidator() {
242	return ModelValidationService.getInstance().newValidator(EvaluationMode.LIVE);	243	return ModelValidationService.getInstance().newValidator(EvaluationMode.LIVE);
243	}	244	}
244		245
Lines 297-309 Link Here
297	* @author Christian W. Damus (cdamus)	298	* @author Christian W. Damus (cdamus)
298	*/	299	*/
299	private static class NotificationTree {	300	private static class NotificationTree {
300	private final List children = new org.eclipse.emf.common.util.BasicEList.FastCompare();	301	private final List<NotificationTree> children =
		302	new org.eclipse.emf.common.util.BasicEList.FastCompare<NotificationTree>();
301		303
302	// number of notifications in parent before start of child transaction	304	// number of notifications in parent before start of child transaction
303	private int parentNotificationCount;	305	private int parentNotificationCount;
304		306
305	private InternalTransaction transaction;	307	private InternalTransaction transaction;
306	private List notifications; // stores the notifications	308	private List<Notification> notifications; // stores the notifications
307		309
308	private final byte notificationMask;	310	private final byte notificationMask;
309		311
Lines 355-361 Link Here
355	*	357	*
356	* @return my children	358	* @return my children
357	*/	359	*/
358	List getChildren() {	360	List<NotificationTree> getChildren() {
359	return children;	361	return children;
360	}	362	}
361		363
Lines 372-385 Link Here
372	* @see ReadWriteValidatorImpl#PRECOMMIT	374	* @see ReadWriteValidatorImpl#PRECOMMIT
373	* @see ReadWriteValidatorImpl#POSTCOMMIT	375	* @see ReadWriteValidatorImpl#POSTCOMMIT
374	*/	376	*/
375	List collectNotifications(byte purpose) {	377	List<Notification> collectNotifications(byte purpose) {
376	List result;	378	List<Notification> result;
377		379
378	if ((notificationMask & purpose) == purpose) {	380	if ((notificationMask & purpose) == purpose) {
379	result = new java.util.ArrayList();	381	result = new java.util.ArrayList<Notification>();
380	collectNotifications(result, purpose);	382	collectNotifications(result, purpose);
381	} else {	383	} else {
382	result = Collections.EMPTY_LIST;	384	result = Collections.emptyList();
383	}	385	}
384		386
385	return result;	387	return result;
Lines 394-407 Link Here
394	*	396	*
395	* @see #collectNotifications()	397	* @see #collectNotifications()
396	*/	398	*/
397	private void collectNotifications(List notifications, byte purpose) {	399	private void collectNotifications(List<? super Notification> notifications, byte purpose) {
398	if ((notificationMask & purpose) == purpose) {	400	if ((notificationMask & purpose) == purpose) {
399	int lastIndex = 0;	401	int lastIndex = 0;
400	List parentNotifications = getNotifications();	402	List<Notification> parentNotifications = getNotifications();
401		403
402	for (Iterator iter = children.iterator(); iter.hasNext();) {	404	for (NotificationTree next : children) {
403	NotificationTree next = (NotificationTree) iter.next();
404
405	// append the parent transaction's notifications from the	405	// append the parent transaction's notifications from the
406	// last position to this child's position	406	// last position to this child's position
407	notifications.addAll(parentNotifications.subList(	407	notifications.addAll(parentNotifications.subList(
Lines 427-443 Link Here
427	* change, etc.).	427	* change, etc.).
428	*/	428	*/
429	void setRolledBack() {	429	void setRolledBack() {
430	Iterator children = getChildren().iterator();	430	Iterator<NotificationTree> children = getChildren().iterator();
431	boolean inPlace = transaction == null;	431	boolean inPlace = transaction == null;
432		432
433	ListIterator iter;	433	ListIterator<Notification> iter;
434	if (inPlace) {	434	if (inPlace) {
435	// already committed? Some ancestor transaction is rolling back	435	// already committed? Some ancestor transaction is rolling back
436	iter = notifications.listIterator();	436	iter = notifications.listIterator();
437	} else {	437	} else {
438	// transaction has the notifications	438	// transaction has the notifications
439	iter = transaction.getNotifications().listIterator();	439	iter = transaction.getNotifications().listIterator();
440	notifications = new org.eclipse.emf.common.util.BasicEList.FastCompare();	440	notifications = new org.eclipse.emf.common.util.BasicEList.FastCompare<Notification>();
441	}	441	}
442		442
443	// filter out all undoable notifications, leaving only those that	443	// filter out all undoable notifications, leaving only those that
Lines 446-459 Link Here
446	// where in the notification ordering the child transactions fit	446	// where in the notification ordering the child transactions fit
447	// so that we retain correct linear ordering overall	447	// so that we retain correct linear ordering overall
448	for (int i = 0; children.hasNext();) {	448	for (int i = 0; children.hasNext();) {
449	NotificationTree child = (NotificationTree) children.next();	449	NotificationTree child = children.next();
450	int parentNotificationCount = child.parentNotificationCount;	450	int parentNotificationCount = child.parentNotificationCount;
451		451
452	if (inPlace) {	452	if (inPlace) {
453	for (; (i < parentNotificationCount) && iter.hasNext(); i++) {	453	for (; (i < parentNotificationCount) && iter.hasNext(); i++) {
454	Notification next = (Notification) iter.next();	454	if (isUndoableObjectChange(iter.next())) {
455
456	if (isUndoableObjectChange(next)) {
457	iter.remove();	455	iter.remove();
458	}	456	}
459	}	457	}
Lines 464-470 Link Here
464	child.parentNotificationCount = iter.nextIndex();	462	child.parentNotificationCount = iter.nextIndex();
465	} else {	463	} else {
466	for (; (i < parentNotificationCount) && iter.hasNext(); i++) {	464	for (; (i < parentNotificationCount) && iter.hasNext(); i++) {
467	Notification next = (Notification) iter.next();	465	Notification next = iter.next();
468		466
469	if (!isUndoableObjectChange(next)) {	467	if (!isUndoableObjectChange(next)) {
470	notifications.add(next);	468	notifications.add(next);
Lines 484-498 Link Here
484	// filter the remaining notifications	482	// filter the remaining notifications
485	if (inPlace) {	483	if (inPlace) {
486	while (iter.hasNext()) {	484	while (iter.hasNext()) {
487	Notification next = (Notification) iter.next();	485	if (isUndoableObjectChange(iter.next())) {
488
489	if (isUndoableObjectChange(next)) {
490	iter.remove();	486	iter.remove();
491	}	487	}
492	}	488	}
493	} else {	489	} else {
494	while (iter.hasNext()) {	490	while (iter.hasNext()) {
495	Notification next = (Notification) iter.next();	491	Notification next = iter.next();
496		492
497	if (!isUndoableObjectChange(next)) {	493	if (!isUndoableObjectChange(next)) {
498	notifications.add(next);	494	notifications.add(next);
Lines 522-528 Link Here
522	*	518	*
523	* @return my notifications	519	* @return my notifications
524	*/	520	*/
525	List getNotifications() {	521	List<Notification> getNotifications() {
526	return (notifications != null)? notifications :	522	return (notifications != null)? notifications :
527	transaction.getNotifications();	523	transaction.getNotifications();
528	}	524	}

Lines 1-7 Link Here

(-)src/org/eclipse/emf/transaction/NotificationFilter.java (-3 / +18 lines)
1	/**	1	/**
2	* <copyright>	2	* <copyright>
3	*	3	*
4	* Copyright (c) 2005, 2006 IBM Corporation and others.	4	* Copyright (c) 2005, 2007 IBM Corporation and others.
5	* All rights reserved. This program and the accompanying materials	5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0	6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at	7	* which accompanies this distribution, and is available at
Lines 49-54 Link Here
49	public abstract class NotificationFilter {	49	public abstract class NotificationFilter {
50	/** As its name implies, this filter matches any notification. */	50	/** As its name implies, this filter matches any notification. */
51	public static final NotificationFilter ANY = new NotificationFilter() {	51	public static final NotificationFilter ANY = new NotificationFilter() {
		52	@Override
52	public boolean matches(Notification notification) {	53	public boolean matches(Notification notification) {
53	return true;	54	return true;
54	}};	55	}};
Lines 59-64 Link Here
59	* @see Notification#isTouch()	60	* @see Notification#isTouch()
60	*/	61	*/
61	public static final NotificationFilter NOT_TOUCH = new NotificationFilter() {	62	public static final NotificationFilter NOT_TOUCH = new NotificationFilter() {
		63	@Override
62	public boolean matches(Notification notification) {	64	public boolean matches(Notification notification) {
63	return !notification.isTouch();	65	return !notification.isTouch();
64	}};	66	}};
Lines 83-88 Link Here
83	* A filter matching "resource loaded" events.	85	* A filter matching "resource loaded" events.
84	*/	86	*/
85	public static final NotificationFilter RESOURCE_LOADED = new NotificationFilter() {	87	public static final NotificationFilter RESOURCE_LOADED = new NotificationFilter() {
		88	@Override
86	public boolean matches(Notification notification) {	89	public boolean matches(Notification notification) {
87	return (notification.getNotifier() instanceof Resource)	90	return (notification.getNotifier() instanceof Resource)
88	&& (notification.getFeatureID(Resource.class)	91	&& (notification.getFeatureID(Resource.class)
Lines 95-100 Link Here
95	* A filter matching "resource unloaded" events.	98	* A filter matching "resource unloaded" events.
96	*/	99	*/
97	public static final NotificationFilter RESOURCE_UNLOADED = new NotificationFilter() {	100	public static final NotificationFilter RESOURCE_UNLOADED = new NotificationFilter() {
		101	@Override
98	public boolean matches(Notification notification) {	102	public boolean matches(Notification notification) {
99	return (notification.getNotifier() instanceof Resource)	103	return (notification.getNotifier() instanceof Resource)
100	&& (notification.getFeatureID(Resource.class)	104	&& (notification.getFeatureID(Resource.class)
Lines 137-142 Link Here
137	*/	141	*/
138	public static NotificationFilter createNotifierFilter(final Object notifier) {	142	public static NotificationFilter createNotifierFilter(final Object notifier) {
139	return new NotificationFilter() {	143	return new NotificationFilter() {
		144	@Override
140	public boolean matches(Notification notification) {	145	public boolean matches(Notification notification) {
141	return notification.getNotifier() == notifier;	146	return notification.getNotifier() == notifier;
142	}};	147	}};
Lines 152-157 Link Here
152	*/	157	*/
153	public static NotificationFilter createEventTypeFilter(final int eventType) {	158	public static NotificationFilter createEventTypeFilter(final int eventType) {
154	return new NotificationFilter() {	159	return new NotificationFilter() {
		160	@Override
155	public boolean matches(Notification notification) {	161	public boolean matches(Notification notification) {
156	return notification.getEventType() == eventType;	162	return notification.getEventType() == eventType;
157	}};	163	}};
Lines 166-171 Link Here
166	*/	172	*/
167	public static NotificationFilter createFeatureFilter(final EStructuralFeature feature) {	173	public static NotificationFilter createFeatureFilter(final EStructuralFeature feature) {
168	return new NotificationFilter() {	174	return new NotificationFilter() {
		175	@Override
169	public boolean matches(Notification notification) {	176	public boolean matches(Notification notification) {
170	return notification.getFeature() == feature;	177	return notification.getFeature() == feature;
171	}};	178	}};
Lines 180-187 Link Here
180	*	187	*
181	* @return the filter	188	* @return the filter
182	*/	189	*/
183	public static NotificationFilter createFeatureFilter(final Class ownerType, final int featureId) {	190	public static NotificationFilter createFeatureFilter(
		191	final Class<?> ownerType, final int featureId) {
184	return new NotificationFilter() {	192	return new NotificationFilter() {
		193	@Override
185	public boolean matches(Notification notification) {	194	public boolean matches(Notification notification) {
186	return ownerType.isInstance(notification.getNotifier())	195	return ownerType.isInstance(notification.getNotifier())
187	&& (notification.getFeatureID(ownerType) == featureId);	196	&& (notification.getFeatureID(ownerType) == featureId);
Lines 202-207 Link Here
202	*/	211	*/
203	public static NotificationFilter createFeatureFilter(final EClassifier ownerType, final int featureId) {	212	public static NotificationFilter createFeatureFilter(final EClassifier ownerType, final int featureId) {
204	return new NotificationFilter() {	213	return new NotificationFilter() {
		214	@Override
205	public boolean matches(Notification notification) {	215	public boolean matches(Notification notification) {
206	return ownerType.isInstance(notification.getNotifier())	216	return ownerType.isInstance(notification.getNotifier())
207	&& (notification.getFeatureID(ownerType.getInstanceClass()) == featureId);	217	&& (notification.getFeatureID(ownerType.getInstanceClass()) == featureId);
Lines 217-224 Link Here
217	*	227	*
218	* @return the filter	228	* @return the filter
219	*/	229	*/
220	public static NotificationFilter createNotifierTypeFilter(final Class type) {	230	public static NotificationFilter createNotifierTypeFilter(final Class<?> type) {
221	return new NotificationFilter() {	231	return new NotificationFilter() {
		232	@Override
222	public boolean matches(Notification notification) {	233	public boolean matches(Notification notification) {
223	return type.isInstance(notification.getNotifier());	234	return type.isInstance(notification.getNotifier());
224	}};	235	}};
Lines 235-240 Link Here
235	*/	246	*/
236	public static NotificationFilter createNotifierTypeFilter(final EClassifier type) {	247	public static NotificationFilter createNotifierTypeFilter(final EClassifier type) {
237	return new NotificationFilter() {	248	return new NotificationFilter() {
		249	@Override
238	public boolean matches(Notification notification) {	250	public boolean matches(Notification notification) {
239	return type.isInstance(notification.getNotifier());	251	return type.isInstance(notification.getNotifier());
240	}};	252	}};
Lines 251-256 Link Here
251	*/	263	*/
252	public final NotificationFilter and(final NotificationFilter other) {	264	public final NotificationFilter and(final NotificationFilter other) {
253	return new NotificationFilter() {	265	return new NotificationFilter() {
		266	@Override
254	public boolean matches(Notification notification) {	267	public boolean matches(Notification notification) {
255	return NotificationFilter.this.matches(notification)	268	return NotificationFilter.this.matches(notification)
256	&& other.matches(notification);	269	&& other.matches(notification);
Lines 268-273 Link Here
268	*/	281	*/
269	public final NotificationFilter or(final NotificationFilter other) {	282	public final NotificationFilter or(final NotificationFilter other) {
270	return new NotificationFilter() {	283	return new NotificationFilter() {
		284	@Override
271	public boolean matches(Notification notification) {	285	public boolean matches(Notification notification) {
272	return NotificationFilter.this.matches(notification)	286	return NotificationFilter.this.matches(notification)
273	\|\| other.matches(notification);	287	\|\| other.matches(notification);
Lines 281-286 Link Here
281	*/	295	*/
282	public final NotificationFilter negated() {	296	public final NotificationFilter negated() {
283	return new NotificationFilter() {	297	return new NotificationFilter() {
		298	@Override
284	public boolean matches(Notification notification) {	299	public boolean matches(Notification notification) {
285	return !NotificationFilter.this.matches(notification);	300	return !NotificationFilter.this.matches(notification);
286	}};	301	}};

Lines 16-23 Link Here

(-)src/org/eclipse/emf/transaction/TriggerListener.java (-5 / +3 lines)
16	*/	16	*/
17	package org.eclipse.emf.transaction;	17	package org.eclipse.emf.transaction;
18		18
19	import java.util.Iterator;
20
21	import org.eclipse.emf.common.command.Command;	19	import org.eclipse.emf.common.command.Command;
22	import org.eclipse.emf.common.notify.Notification;	20	import org.eclipse.emf.common.notify.Notification;
23	import org.eclipse.emf.transaction.util.ConditionalRedoCommand;	21	import org.eclipse.emf.transaction.util.ConditionalRedoCommand;
Lines 55-66 Link Here
55	* @return a composite of the commands returned by the subclass	53	* @return a composite of the commands returned by the subclass
56	* implementation of the {@link #trigger} method	54	* implementation of the {@link #trigger} method
57	*/	55	*/
		56	@Override
58	public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {	57	public Command transactionAboutToCommit(ResourceSetChangeEvent event) throws RollbackException {
59	Command result = null;	58	Command result = null;
60		59
61	for (Iterator iter = event.getNotifications().iterator(); iter.hasNext();) {	60	for (Notification next : event.getNotifications()) {
62	Notification next = (Notification) iter.next();
63
64	Command trigger = trigger(event.getEditingDomain(), next);	61	Command trigger = trigger(event.getEditingDomain(), next);
65	if (trigger != null) {	62	if (trigger != null) {
66	if (result == null) {	63	if (result == null) {
Lines 96-101 Link Here
96	/**	93	/**
97	* I want only ppre-commit events, not post-commit events.	94	* I want only ppre-commit events, not post-commit events.
98	*/	95	*/
		96	@Override
99	public boolean isPrecommitOnly() {	97	public boolean isPrecommitOnly() {
100	return true;	98	return true;
101	}	99	}

Lines 93-98 Link Here

(-)src/org/eclipse/emf/transaction/RecordingCommand.java (-1 / +6 lines)
93	* Subclasses should override this if they have more preparation to do.	93	* Subclasses should override this if they have more preparation to do.
94	* By default, the result is just <code>true</code>.	94	* By default, the result is just <code>true</code>.
95	*/	95	*/
		96	@Override
96	protected boolean prepare() {	97	protected boolean prepare() {
97	return true;	98	return true;
98	}	99	}
Lines 151-156 Link Here
151	* I can be undone if I successfully recorded the changes that I executed.	152	* I can be undone if I successfully recorded the changes that I executed.
152	* Subclasses would not normally need to override this method.	153	* Subclasses would not normally need to override this method.
153	*/	154	*/
		155	@Override
154	public boolean canUndo() {	156	public boolean canUndo() {
155	return canApplyChange();	157	return canApplyChange();
156	}	158	}
Lines 175-180 Link Here
175	* Undoes the changes that I recorded.	177	* Undoes the changes that I recorded.
176	* Subclasses would not normally need to override this method.	178	* Subclasses would not normally need to override this method.
177	*/	179	*/
		180	@Override
178	public final void undo() {	181	public final void undo() {
179	if (change != null) {	182	if (change != null) {
180	change.applyAndReverse();	183	change.applyAndReverse();
Lines 199-204 Link Here
199	protected abstract void doExecute();	202	protected abstract void doExecute();
200		203
201	// Documentation copied from the inherited specification	204	// Documentation copied from the inherited specification
		205	@Override
202	public Command chain(Command command) {	206	public Command chain(Command command) {
203	return new ConditionalRedoCommand.Compound().chain(this).chain(command);	207	return new ConditionalRedoCommand.Compound().chain(this).chain(command);
204	}	208	}
Lines 245-251 Link Here
245	* Extends the inherited implementation by disposing my change description,	249	* Extends the inherited implementation by disposing my change description,
246	* if any.	250	* if any.
247	*/	251	*/
248	public void dispose() {	252	@Override
		253	public void dispose() {
249	super.dispose();	254	super.dispose();
250		255
251	if (change != null) {	256	if (change != null) {

Lines 16-23 Link Here

(-)src/org/eclipse/emf/transaction/DemultiplexingListener.java (-5 / +3 lines)
16	*/	16	*/
17	package org.eclipse.emf.transaction;	17	package org.eclipse.emf.transaction;
18		18
19	import java.util.Iterator;
20
21	import org.eclipse.emf.common.notify.Notification;	19	import org.eclipse.emf.common.notify.Notification;
22		20
23	/**	21	/**
Lines 50-59 Link Here
50	*	48	*
51	* @see #handleNotification(TransactionalEditingDomain, Notification)	49	* @see #handleNotification(TransactionalEditingDomain, Notification)
52	*/	50	*/
		51	@Override
53	public void resourceSetChanged(ResourceSetChangeEvent event) {	52	public void resourceSetChanged(ResourceSetChangeEvent event) {
54	for (Iterator iter = event.getNotifications().iterator(); iter.hasNext();) {	53	for (Notification next : event.getNotifications()) {
55	Notification next = (Notification) iter.next();
56
57	handleNotification(event.getEditingDomain(), next);	54	handleNotification(event.getEditingDomain(), next);
58	}	55	}
59	}	56	}
Lines 71-76 Link Here
71	/**	68	/**
72	* I want only post-commit events, not pre-commit events.	69	* I want only post-commit events, not pre-commit events.
73	*/	70	*/
		71	@Override
74	public boolean isPostcommitOnly() {	72	public boolean isPostcommitOnly() {
75	return true;	73	return true;
76	}	74	}

Lines 23-31 Link Here

(-)src/org/eclipse/emf/transaction/Transaction.java (-4 / +4 lines)
23		23
24		24
25	/**	25	/**
26	* Specification of a transaction in a {@link TransactionalEditingDomain}. All reading and	26	* Specification of a transaction in a {@link TransactionalEditingDomain}. All
27	* writing of data in a <code>TransactionalEditingDomain</code> is performed in the context	27	* reading and writing of data in a <code>TransactionalEditingDomain</code> is
28	* of a transaction.	28	* performed in the context of a transaction.
29	* <p>	29	* <p>
30	* This interface is not intended to be implemented by clients. It is used	30	* This interface is not intended to be implemented by clients. It is used
31	* internally and by frameworks extending this API. It is mostly of use to	31	* internally and by frameworks extending this API. It is mostly of use to
Lines 191-197 Link Here
191	*	191	*
192	* @return an unmodifiable view of my options	192	* @return an unmodifiable view of my options
193	*/	193	*/
194	Map getOptions();	194	Map<?, ?> getOptions();
195		195
196	/**	196	/**
197	* Queries whether I am active. I am active after I have started and	197	* Queries whether I am active. I am active after I have started and

Lines 1-7 Link Here

(-)src/org/eclipse/emf/transaction/ResourceSetChangeEvent.java (-4 / +5 lines)
1	/**	1	/**
2	* <copyright>	2	* <copyright>
3	*	3	*
4	* Copyright (c) 2005, 2006 IBM Corporation and others.	4	* Copyright (c) 2005, 2007 IBM Corporation and others.
5	* All rights reserved. This program and the accompanying materials	5	* All rights reserved. This program and the accompanying materials
6	* are made available under the terms of the Eclipse Public License v1.0	6	* are made available under the terms of the Eclipse Public License v1.0
7	* which accompanies this distribution, and is available at	7	* which accompanies this distribution, and is available at
Lines 43-49 Link Here
43	private static final long serialVersionUID = -6265603064286194469L;	43	private static final long serialVersionUID = -6265603064286194469L;
44		44
45	private final Transaction transaction;	45	private final Transaction transaction;
46	private final List notifications;	46	private final List<Notification> notifications;
47		47
48	/**	48	/**
49	* Initializes me with my source editing domain.	49	* Initializes me with my source editing domain.
Lines 62-68 Link Here
62	* @param notifications a list of events (as {@link Notification}s), in the	62	* @param notifications a list of events (as {@link Notification}s), in the
63	* order in which they occurred	63	* order in which they occurred
64	*/	64	*/
65	public ResourceSetChangeEvent(TransactionalEditingDomain source, Transaction transaction, List notifications) {	65	public ResourceSetChangeEvent(TransactionalEditingDomain source,
		66	Transaction transaction, List<Notification> notifications) {
66	super(source);	67	super(source);
67		68
68	this.transaction = transaction;	69	this.transaction = transaction;
Lines 105-111 Link Here
105	*	106	*
106	* @see Notification	107	* @see Notification
107	*/	108	*/
108	public List getNotifications() {	109	public List<Notification> getNotifications() {
109	return notifications;	110	return notifications;
110	}	111	}
111	}	112	}

Lines 36-42 Link Here

(-)src/org/eclipse/emf/transaction/util/TriggerCommand.java (-13 / +18 lines)
36	*/	36	*/
37	public class TriggerCommand extends ConditionalRedoCommand.Compound {	37	public class TriggerCommand extends ConditionalRedoCommand.Compound {
38	private final Command triggeringCommand;	38	private final Command triggeringCommand;
39	private final List triggers;	39	private final List<Command> triggers;
40		40
41	/**	41	/**
42	* Initializes me with a list of commands triggered not by the execution of	42	* Initializes me with a list of commands triggered not by the execution of
Lines 47-57 Link Here
47	*	47	*
48	* @param triggers the trigger commands that I encapsulate	48	* @param triggers the trigger commands that I encapsulate
49	*/	49	*/
50	public TriggerCommand(List triggers) {	50	public TriggerCommand(List<? extends Command> triggers) {
51	super(0, "Triggers", "Triggered Changes", triggers); //$NON-NLS-1$ //$NON-NLS-2$	51	super(0, "Triggers", "Triggered Changes", //$NON-NLS-1$ //$NON-NLS-2$
		52	new java.util.ArrayList<Command>(triggers));
52		53
53	this.triggeringCommand = null;	54	this.triggeringCommand = null;
54	this.triggers = triggers;	55	this.triggers = commandList;
55	}	56	}
56		57
57	/**	58	/**
Lines 62-72 Link Here
62	* @param triggeringCommand the command that triggered further commands	63	* @param triggeringCommand the command that triggered further commands
63	* @param triggers the trigger commands that I encapsulate	64	* @param triggers the trigger commands that I encapsulate
64	*/	65	*/
65	public TriggerCommand(Command triggeringCommand, List triggers) {	66	public TriggerCommand(Command triggeringCommand, List<? extends Command> triggers) {
66	super(0, triggeringCommand.getLabel(), triggeringCommand.getDescription(), triggers);	67	super(0, triggeringCommand.getLabel(), triggeringCommand.getDescription(),
		68	new java.util.ArrayList<Command>(triggers));
67		69
68	this.triggeringCommand = triggeringCommand;	70	this.triggeringCommand = triggeringCommand;
69	this.triggers = triggers;	71	this.triggers = commandList;
70	}	72	}
71		73
72	/**	74	/**
Lines 85-95 Link Here
85	*	87	*
86	* @return my triggers, as a list of {@link Command}s. Will not be empty	88	* @return my triggers, as a list of {@link Command}s. Will not be empty
87	*/	89	*/
88	public final List getTriggers() {	90	public final List<Command> getTriggers() {
89	return triggers;	91	return triggers;
90	}	92	}
91		93
92	// Documentation copied from the inherited specification	94	// Documentation copied from the inherited specification
		95	@Override
93	protected boolean prepare() {	96	protected boolean prepare() {
94	// we will check canExecute() as we go	97	// we will check canExecute() as we go
95	return !triggers.isEmpty();	98	return !triggers.isEmpty();
Lines 99-109 Link Here
99	* Executes all of my trigger commands, then prepends the original triggering	102	* Executes all of my trigger commands, then prepends the original triggering
100	* command (if any) so that it will be undone/redone with the others.	103	* command (if any) so that it will be undone/redone with the others.
101	*/	104	*/
		105	@Override
102	public void execute() {	106	public void execute() {
103	// execute just the triggers	107	// execute just the triggers
104	for (ListIterator iter = commandList.listIterator(); iter.hasNext();) {	108	for (ListIterator<Command> iter = commandList.listIterator(); iter.hasNext();) {
105	try {	109	try {
106	Command command = (Command) iter.next();	110	Command command = iter.next();
107		111
108	if (command.canExecute()) {	112	if (command.canExecute()) {
109	command.execute();	113	command.execute();
Lines 123-129 Link Here
123	// Iterate back over the executed commands to undo them.	127	// Iterate back over the executed commands to undo them.
124	//	128	//
125	while (iter.hasPrevious()) {	129	while (iter.hasPrevious()) {
126	Command command = (Command) iter.previous();	130	Command command = iter.previous();
127	if (command.canUndo()) {	131	if (command.canUndo()) {
128	command.undo();	132	command.undo();
129	} else {	133	} else {
Lines 147-153 Link Here
147	// then replace the command-list with a new list that includes	151	// then replace the command-list with a new list that includes
148	// the	152	// the
149	// originally executed command (for undo/redo)	153	// originally executed command (for undo/redo)
150	commandList = new java.util.ArrayList(triggers.size() + 1);	154	commandList = new java.util.ArrayList<Command>(triggers.size() + 1);
151	commandList.add(triggeringCommand);	155	commandList.add(triggeringCommand);
152	commandList.addAll(triggers);	156	commandList.addAll(triggers);
153	}	157	}
Lines 157-163 Link Here
157	* Extends the inherited implementation by disposing my triggering command,	161	* Extends the inherited implementation by disposing my triggering command,
158	* also (if any).	162	* also (if any).
159	*/	163	*/
160	public void dispose() {	164	@Override
		165	public void dispose() {
161	super.dispose();	166	super.dispose();
162		167
163	if (triggeringCommand != null) {	168	if (triggeringCommand != null) {

Lines 21-27 Link Here

(-)src/org/eclipse/emf/transaction/util/Lock.java (-10 / +13 lines)
21	import org.eclipse.core.runtime.IProgressMonitor;	21	import org.eclipse.core.runtime.IProgressMonitor;
22	import org.eclipse.core.runtime.IStatus;	22	import org.eclipse.core.runtime.IStatus;
23	import org.eclipse.core.runtime.OperationCanceledException;	23	import org.eclipse.core.runtime.OperationCanceledException;
24	import org.eclipse.core.runtime.Platform;
25	import org.eclipse.core.runtime.Status;	24	import org.eclipse.core.runtime.Status;
26	import org.eclipse.core.runtime.jobs.IJobManager;	25	import org.eclipse.core.runtime.jobs.IJobManager;
27	import org.eclipse.core.runtime.jobs.ILock;	26	import org.eclipse.core.runtime.jobs.ILock;
Lines 72-78 Link Here
72	* @author Christian W. Damus (cdamus)	71	* @author Christian W. Damus (cdamus)
73	*/	72	*/
74	public class Lock {	73	public class Lock {
75	private static final IJobManager jobmgr = Platform.getJobManager();	74	private static final IJobManager jobmgr = Job.getJobManager();
76		75
77	private static long nextId = 0;	76	private static long nextId = 0;
78		77
Lines 99-114 Link Here
99		98
100	// threads currently yielding read access	99	// threads currently yielding read access
101	// must use identity map because threads can override equals()	100	// must use identity map because threads can override equals()
102	private final Map yielders = new java.util.IdentityHashMap();	101	private final Map<Thread, Lock> yielders =
		102	new java.util.IdentityHashMap<Thread, Lock>();
103		103
104	// every thread has its own ILock that it acquires while it owns the	104	// every thread has its own ILock that it acquires while it owns the
105	// transaction lock, to ensure that the thread is registered as a	105	// transaction lock, to ensure that the thread is registered as a
106	// "lock owner" in the lock table. This ensures that Display.syncExec()	106	// "lock owner" in the lock table. This ensures that Display.syncExec()
107	// calls from these threads will use the work queue to communicate	107	// calls from these threads will use the work queue to communicate
108	// runnables to a waiting UI thread	108	// runnables to a waiting UI thread
109	private ThreadLocal threadLock = new ThreadLocal() {	109	private final ThreadLocal<ILock> threadLock = new ThreadLocal<ILock>() {
110	protected Object initialValue() {	110	@Override
111	return Platform.getJobManager().newLock();	111	protected ILock initialValue() {
		112	return Job.getJobManager().newLock();
112	}};	113	}};
113		114
114	/**	115	/**
Lines 693-699 Link Here
693	} else if (current == owner) {	694	} else if (current == owner) {
694	// current thread no longer needs the dummy lock	695	// current thread no longer needs the dummy lock
695	getThreadLock().release();	696	getThreadLock().release();
696	} // else non-owner is transfering. Shouldn't happen	697	} // else non-owner is transferring. Shouldn't happen
697		698
698	owner = thread;	699	owner = thread;
699	}	700	}
Lines 705-713 Link Here
705	* @return the current thread's thread lock	706	* @return the current thread's thread lock
706	*/	707	*/
707	private ILock getThreadLock() {	708	private ILock getThreadLock() {
708	return (ILock) threadLock.get();	709	return threadLock.get();
709	}	710	}
710		711
		712	@Override
711	public String toString() {	713	public String toString() {
712	Thread lastKnownOwner = owner;	714	Thread lastKnownOwner = owner;
713		715
Lines 729-735 Link Here
729	private final Thread thread;	731	private final Thread thread;
730	private final boolean exclusive;	732	private final boolean exclusive;
731		733
732	private ILock ilock = jobmgr.newLock();	734	private final ILock ilock = jobmgr.newLock();
733	private IStatus acquireStatus;	735	private IStatus acquireStatus;
734		736
735	private boolean aborted;	737	private boolean aborted;
Lines 747-753 Link Here
747	/**	749	/**
748	* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)	750	* @see org.eclipse.core.runtime.jobs.Job#run(org.eclipse.core.runtime.IProgressMonitor)
749	*/	751	*/
750	protected IStatus run(IProgressMonitor monitor) {	752	@Override
		753	protected IStatus run(IProgressMonitor monitor) {
751	try {	754	try {
752	ilock.acquire();	755	ilock.acquire();
753		756