Attachment 102870 Details for Bug 201896 – Combined patch for Model and Test code changes

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

[patch] Combined patch for Model and Test code changes

defect_201896_patch.txt (text/plain), 3.65 KB, created by DuWayne Morris

on 2008-05-30 10:40:30 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: DuWayne Morris

Created: 2008-05-30 10:40:30 EDT

Size: 3.65 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.models
>Index: src-test/org/eclipse/hyades/models/common/facades/behavioral/impl/HyadesTPFTestSuiteAdapter.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.models/src-test/org/eclipse/hyades/models/common/facades/behavioral/impl/HyadesTPFTestSuiteAdapter.java,v
>retrieving revision 1.4
>diff -u -r1.4 HyadesTPFTestSuiteAdapter.java
>--- src-test/org/eclipse/hyades/models/common/facades/behavioral/impl/HyadesTPFTestSuiteAdapter.java	8 Feb 2006 19:56:39 -0000	1.4
>+++ src-test/org/eclipse/hyades/models/common/facades/behavioral/impl/HyadesTPFTestSuiteAdapter.java	30 May 2008 14:36:53 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2003, 2006 IBM Corporation and others.
>+ * 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
>@@ -303,7 +303,11 @@
> 			// we want to remove.
> 			else if ( fragment instanceof BVRExecutionOccurrence )
> 			{
>-				if ( behavior.equals(((BVRExecutionOccurrence)fragment).getOtherBehavior()))
>+				// bugzilla 201896, added the check for getOtherBehavior() returns null
>+				// if return is null, the invocation should be deleted since it no longer
>+				// contains a reference to an executable behavior
>+				TPFBehavior otherBehavior = ((BVRExecutionOccurrence)fragment).getOtherBehavior();
>+				if ( otherBehavior == null || behavior.equals(otherBehavior))
> 				{
> 					fragments.add(fragment);
> 				}
>#P org.eclipse.tptp.platform.models.hierarchy
>Index: src-hierarchy/org/eclipse/hyades/models/hierarchy/util/EObjectsTraverser.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.models.hierarchy/src-hierarchy/org/eclipse/hyades/models/hierarchy/util/EObjectsTraverser.java,v
>retrieving revision 1.1
>diff -u -r1.1 EObjectsTraverser.java
>--- src-hierarchy/org/eclipse/hyades/models/hierarchy/util/EObjectsTraverser.java	27 Nov 2007 04:28:31 -0000	1.1
>+++ src-hierarchy/org/eclipse/hyades/models/hierarchy/util/EObjectsTraverser.java	30 May 2008 14:36:54 -0000
>@@ -1,5 +1,5 @@
> /**********************************************************************
>- * Copyright (c) 2003, 2007 IBM Corporation and others.
>+ * 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
>@@ -99,21 +99,24 @@
> 		while (iter.hasNext()) {
> 			EObject traversedElement = (EObject) iter.next();
> 			EObject visitorElement = getElement(traversedElement);
>-
>-			if (!beforeChildren(visitorElement))
>-				return false;
>-
>-			if (pruneSubtree)
>-				pruneSubtree = false;
>-			else
>-				traverseEObject(traversedElement);
>-
>-			if (!afterChildren(visitorElement))
>-				return false;
>-
>-			if (pruneSubtree) {
>-				pruneSubtree = false;
>-				break;
>+			
>+			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;

Actions: View | Diff

Attachments on bug 201896: 96875 | 101374 | 102224 | 102683 | 102870