Attachment #37150 for bug #132367





import org.eclipse.core.commands.operations.IOperationHistory;
import org.eclipse.core.commands.operations.OperationHistoryFactory;
import org.eclipse.emf.common.command.Command;
import org.eclipse.emf.common.notify.AdapterFactory;
import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
import org.eclipse.emf.transaction.NotificationFilter;
import org.eclipse.emf.transaction.ResourceSetChangeEvent;
import org.eclipse.emf.transaction.ResourceSetListener;
import org.eclipse.emf.transaction.ResourceSetListenerImpl;
import org.eclipse.emf.transaction.RollbackException;
import org.eclipse.emf.transaction.Transaction;
import org.eclipse.emf.transaction.TransactionalCommandStack;

		//  while handling a post-commit event.
		private InternalTransaction originatingTransaction = null;
		private DiagramEventBroker deb = null;
		private ResourceSetListener debWrapper = null;
		
		public void addResourceSetListener(ResourceSetListener l) {
			if (l.getClass() == DiagramEventBroker.class) {
				assert deb == null;
				deb = (DiagramEventBroker)l;
				debWrapper = new ResourceSetListenerImpl() {
					public boolean isAggregatePrecommitListener() {
						return deb.isAggregatePrecommitListener();
					}
					
					public boolean isPrecommitOnly() {
						return true;
					}
					
					public Command transactionAboutToCommit(ResourceSetChangeEvent event)
						throws RollbackException {
						return deb.transactionAboutToCommit(event);
					}
					
					public void resourceSetChanged(ResourceSetChangeEvent event) {
						deb.resourceSetChanged(event);
					}
					
					public NotificationFilter getFilter() {
						return deb.getFilter();
					}
					
					public boolean isPostcommitOnly() {
						return false;
					}
				};
				
				super.addResourceSetListener(debWrapper);
			} else {
				super.addResourceSetListener(l);
			}
			
			super.addResourceSetListener(l);
		}
		
		public void removeResourceSetListener(ResourceSetListener l) {
			if (l.getClass() == DiagramEventBroker.class) {
				assert deb != null;
				deb = null;
				super.removeResourceSetListener(debWrapper);
				debWrapper = null;
			} else {
				super.removeResourceSetListener(l);
			}
			
			super.removeResourceSetListener(l);
		}
		
		public DiagramEditingDomain(AdapterFactory adapterFactory, ResourceSet resourceSet) {




    public boolean isAggregatePrecommitListener() {
    	return true;
    }
    
    public boolean isPrecommitOnly() {
    	// We aren't really a precommit only listener, the DiagramEditingDomain
    	//  has a special case for us to be a special postcommit listener
    	//  that can make changes while responding to batched events.
    	return true;
    }

    /**
     * Helper method to add all the listners of the given <code>notifier</code>

Return to bug 132367

Lines 17-27 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/core/DiagramEditingDomainFactory.java (-4 / +38 lines)
17		17
18	import org.eclipse.core.commands.operations.IOperationHistory;	18	import org.eclipse.core.commands.operations.IOperationHistory;
19	import org.eclipse.core.commands.operations.OperationHistoryFactory;	19	import org.eclipse.core.commands.operations.OperationHistoryFactory;
		20	import org.eclipse.emf.common.command.Command;
20	import org.eclipse.emf.common.notify.AdapterFactory;	21	import org.eclipse.emf.common.notify.AdapterFactory;
21	import org.eclipse.emf.ecore.resource.ResourceSet;	22	import org.eclipse.emf.ecore.resource.ResourceSet;
22	import org.eclipse.emf.edit.provider.ComposedAdapterFactory;	23	import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
		24	import org.eclipse.emf.transaction.NotificationFilter;
23	import org.eclipse.emf.transaction.ResourceSetChangeEvent;	25	import org.eclipse.emf.transaction.ResourceSetChangeEvent;
24	import org.eclipse.emf.transaction.ResourceSetListener;	26	import org.eclipse.emf.transaction.ResourceSetListener;
		27	import org.eclipse.emf.transaction.ResourceSetListenerImpl;
25	import org.eclipse.emf.transaction.RollbackException;	28	import org.eclipse.emf.transaction.RollbackException;
26	import org.eclipse.emf.transaction.Transaction;	29	import org.eclipse.emf.transaction.Transaction;
27	import org.eclipse.emf.transaction.TransactionalCommandStack;	30	import org.eclipse.emf.transaction.TransactionalCommandStack;
Lines 57-79 Link Here
57	// while handling a post-commit event.	60	// while handling a post-commit event.
58	private InternalTransaction originatingTransaction = null;	61	private InternalTransaction originatingTransaction = null;
59	private DiagramEventBroker deb = null;	62	private DiagramEventBroker deb = null;
		63	private ResourceSetListener debWrapper = null;
60		64
61	public void addResourceSetListener(ResourceSetListener l) {	65	public void addResourceSetListener(ResourceSetListener l) {
62	if (l.getClass() == DiagramEventBroker.class) {	66	if (l.getClass() == DiagramEventBroker.class) {
63	assert deb == null;	67	assert deb == null;
64	deb = (DiagramEventBroker)l;	68	deb = (DiagramEventBroker)l;
		69	debWrapper = new ResourceSetListenerImpl() {
		70	public boolean isAggregatePrecommitListener() {
		71	return deb.isAggregatePrecommitListener();
		72	}
		73
		74	public boolean isPrecommitOnly() {
		75	return true;
		76	}
		77
		78	public Command transactionAboutToCommit(ResourceSetChangeEvent event)
		79	throws RollbackException {
		80	return deb.transactionAboutToCommit(event);
		81	}
		82
		83	public void resourceSetChanged(ResourceSetChangeEvent event) {
		84	deb.resourceSetChanged(event);
		85	}
		86
		87	public NotificationFilter getFilter() {
		88	return deb.getFilter();
		89	}
		90
		91	public boolean isPostcommitOnly() {
		92	return false;
		93	}
		94	};
		95
		96	super.addResourceSetListener(debWrapper);
		97	} else {
		98	super.addResourceSetListener(l);
65	}	99	}
66
67	super.addResourceSetListener(l);
68	}	100	}
69		101
70	public void removeResourceSetListener(ResourceSetListener l) {	102	public void removeResourceSetListener(ResourceSetListener l) {
71	if (l.getClass() == DiagramEventBroker.class) {	103	if (l.getClass() == DiagramEventBroker.class) {
72	assert deb != null;	104	assert deb != null;
73	deb = null;	105	deb = null;
		106	super.removeResourceSetListener(debWrapper);
		107	debWrapper = null;
		108	} else {
		109	super.removeResourceSetListener(l);
74	}	110	}
75
76	super.removeResourceSetListener(l);
77	}	111	}
78		112
79	public DiagramEditingDomain(AdapterFactory adapterFactory, ResourceSet resourceSet) {	113	public DiagramEditingDomain(AdapterFactory adapterFactory, ResourceSet resourceSet) {

Lines 587-599 Link Here

(-)src/org/eclipse/gmf/runtime/diagram/core/listener/DiagramEventBroker.java (-7 lines)
587	public boolean isAggregatePrecommitListener() {	587	public boolean isAggregatePrecommitListener() {
588	return true;	588	return true;
589	}	589	}
590
591	public boolean isPrecommitOnly() {
592	// We aren't really a precommit only listener, the DiagramEditingDomain
593	// has a special case for us to be a special postcommit listener
594	// that can make changes while responding to batched events.
595	return true;
596	}
597		590
598	/**	591	/**
599	* Helper method to add all the listners of the given <code>notifier</code>	592	* Helper method to add all the listners of the given <code>notifier</code>