Attachment #102870 for bug #201896

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

Lines 1-5 Link Here

(-)src-test/org/eclipse/hyades/models/common/facades/behavioral/impl/HyadesTPFTestSuiteAdapter.java (-2 / +6 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2003, 2006 IBM Corporation and others.	2	* Copyright (c) 2003, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 303-309 Link Here
303	// we want to remove.	303	// we want to remove.
304	else if ( fragment instanceof BVRExecutionOccurrence )	304	else if ( fragment instanceof BVRExecutionOccurrence )
305	{	305	{
306	if ( behavior.equals(((BVRExecutionOccurrence)fragment).getOtherBehavior()))	306	// bugzilla 201896, added the check for getOtherBehavior() returns null
		307	// if return is null, the invocation should be deleted since it no longer
		308	// contains a reference to an executable behavior
		309	TPFBehavior otherBehavior = ((BVRExecutionOccurrence)fragment).getOtherBehavior();
		310	if ( otherBehavior == null \|\| behavior.equals(otherBehavior))
307	{	311	{
308	fragments.add(fragment);	312	fragments.add(fragment);
309	}	313	}




/**********************************************************************
 * Copyright (c) 2003, 2008 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

		while (iter.hasNext()) {
			EObject traversedElement = (EObject) iter.next();
			EObject visitorElement = getElement(traversedElement);
			
			if (traversedElement != null  && visitorElement != null){
				
				if (!beforeChildren(visitorElement))
					return false;
	
				if (pruneSubtree)
					pruneSubtree = false;
				else
					traverseEObject(traversedElement);
	
				if (!afterChildren(visitorElement))
					return false;
	
				if (pruneSubtree) {
					pruneSubtree = false;
					break;
				}
			}
		}
		return true;

Return to bug 201896

Lines 1-5 Link Here

(-)src-hierarchy/org/eclipse/hyades/models/hierarchy/util/EObjectsTraverser.java (-16 / +19 lines)
1	/**********************************************************************	1	/**********************************************************************
2	* Copyright (c) 2003, 2007 IBM Corporation and others.	2	* Copyright (c) 2003, 2008 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 99-119 Link Here
99	while (iter.hasNext()) {	99	while (iter.hasNext()) {
100	EObject traversedElement = (EObject) iter.next();	100	EObject traversedElement = (EObject) iter.next();
101	EObject visitorElement = getElement(traversedElement);	101	EObject visitorElement = getElement(traversedElement);
102		102
103	if (!beforeChildren(visitorElement))	103	if (traversedElement != null && visitorElement != null){
104	return false;	104
105		105	if (!beforeChildren(visitorElement))
106	if (pruneSubtree)	106	return false;
107	pruneSubtree = false;	107
108	else	108	if (pruneSubtree)
109	traverseEObject(traversedElement);	109	pruneSubtree = false;
110		110	else
111	if (!afterChildren(visitorElement))	111	traverseEObject(traversedElement);
112	return false;	112
113		113	if (!afterChildren(visitorElement))
114	if (pruneSubtree) {	114	return false;
115	pruneSubtree = false;	115
116	break;	116	if (pruneSubtree) {
		117	pruneSubtree = false;
		118	break;
		119	}
117	}	120	}
118	}	121	}
119	return true;	122	return true;