Attachment 63907 Details for Bug 182546 – complete patch

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

[patch] complete patch

182546_patch.txt (text/plain), 7.62 KB, created by Jerome Gout

on 2007-04-16 10:13:35 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jerome Gout

Created: 2007-04-16 10:13:35 EDT

Size: 7.62 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.hyades.test.ui
>Index: src/org/eclipse/hyades/test/ui/internal/navigator/proxy/DefaultExecutionResultProxyNode.java
>===================================================================
>RCS file: /cvsroot/tptp/test/org.eclipse.hyades.test.ui/src/org/eclipse/hyades/test/ui/internal/navigator/proxy/DefaultExecutionResultProxyNode.java,v
>retrieving revision 1.9
>diff -u -r1.9 DefaultExecutionResultProxyNode.java
>--- src/org/eclipse/hyades/test/ui/internal/navigator/proxy/DefaultExecutionResultProxyNode.java	15 Dec 2006 17:05:47 -0000	1.9
>+++ src/org/eclipse/hyades/test/ui/internal/navigator/proxy/DefaultExecutionResultProxyNode.java	16 Apr 2007 14:13:43 -0000
>@@ -11,25 +11,16 @@
>  *******************************************************************************/
> package org.eclipse.hyades.test.ui.internal.navigator.proxy;
> 
>-import java.util.Iterator;
>-import java.util.LinkedList;
>-import java.util.List;
>-
>-import org.eclipse.emf.common.util.EList;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.hyades.models.common.testprofile.TPFExecutionEvent;
>-import org.eclipse.hyades.models.common.testprofile.TPFExecutionHistory;
> import org.eclipse.hyades.models.common.testprofile.TPFExecutionResult;
>-import org.eclipse.hyades.models.common.testprofile.TPFInvocationEvent;
> import org.eclipse.hyades.models.common.testprofile.TPFTest;
> import org.eclipse.hyades.test.ui.TestUIConstants;
> import org.eclipse.hyades.test.ui.TestUIImages;
> import org.eclipse.hyades.test.ui.internal.model.EventUtil;
> import org.eclipse.hyades.test.ui.navigator.IExecutionResultProxyNode;
> import org.eclipse.hyades.test.ui.navigator.IPersistableProxyNode;
>-import org.eclipse.hyades.test.ui.navigator.IPersistableTypedElementProxyFactory;
> import org.eclipse.hyades.test.ui.navigator.IProxyNode;
>-import org.eclipse.hyades.test.ui.navigator.ITypedElementProxyFactory;
> import org.eclipse.hyades.test.ui.navigator.ProxyNeedToBeRebuiltException;
> import org.eclipse.hyades.test.ui.navigator.TypedElementProxyNode;
> import org.eclipse.swt.graphics.Image;
>@@ -57,15 +48,16 @@
> 	public DefaultExecutionResultProxyNode(TPFExecutionResult er, Object parent) {
> 		super(er, parent);
> 		
>-		LinkedList c = new LinkedList();
>-		TPFExecutionHistory history = er.getExecutionHistory();
>-		if (history != null ) {
>-			EList events = history.getExecutionEvents();
>-			for (Iterator it = events.iterator(); it.hasNext();) {
>-				getEventChildren((TPFExecutionEvent) it.next(), c, er);
>-			}
>-		}
>-		children = (IProxyNode[]) c.toArray(new IProxyNode[c.size()]);
>+//		LinkedList c = new LinkedList();
>+//		TPFExecutionHistory history = er.getExecutionHistory();
>+//		if (history != null ) {
>+//			EList events = history.getExecutionEvents();
>+//			for (Iterator it = events.iterator(); it.hasNext();) {
>+//				getEventChildren((TPFExecutionEvent) it.next(), c, er);
>+//			}
>+//		}
>+//		children = (IProxyNode[]) c.toArray(new IProxyNode[c.size()]);
>+		children = new IProxyNode[0];
> 		//- save the name of this element
> 		String name = er.getName();
> 		String testName = null; 
>@@ -106,44 +98,45 @@
>         } catch (NumberFormatException e) {
>         	timestamp = 0L;
>         }
>-		IMemento [] childrenMemento = memento.getChildren(TestUIConstants.TAG_CHILD);
>-        LinkedList execChildren = new LinkedList();
>-		for (int i = 0; i < childrenMemento.length; i++) {
>-			IMemento mementoChild = childrenMemento[i];
>-            //- inherit the TAG_URI_ROOT which is an extra data contained by the parent
>-            mementoChild.putString(TestUIConstants.TAG_URI_ROOT, memento.getString(TestUIConstants.TAG_URI_ROOT));
>-			String type = getType();
>-			if(type == null) {
>-				throw new ProxyNeedToBeRebuiltException();
>-			}
>-			ITypedElementProxyFactory factory = TypedElementFactoryManager.getInstance().getFactory(type);
>-			if(factory instanceof IPersistableTypedElementProxyFactory) {
>-                IProxyNode proxy = ((IPersistableTypedElementProxyFactory)factory).recreate(mementoChild, this);
>-                if(proxy != null) {
>-                    execChildren.add(proxy);
>-                }
>-			}
>-		}
>-        children = (IProxyNode[]) execChildren.toArray(new IProxyNode[execChildren.size()]);
>-	}
>-	
>-	/**
>-	 * @param event
>-	 * @param parent
>-	 */
>-	private void getEventChildren(TPFExecutionEvent event, List c, TPFExecutionResult parent) {
>-		if ( event instanceof TPFInvocationEvent) {
>-			TPFExecutionResult er = ((TPFInvocationEvent)event).getInvokedExecutionResult();
>-            if(er != null) {
>-                c.add(new DefaultExecutionResultProxyNode(er, parent));
>-            }
>-		} else {
>-			Iterator iterator = event.getChildren().iterator();
>-			while (iterator.hasNext()) {
>-				getEventChildren((TPFExecutionEvent) iterator.next(), c, parent);
>-			}
>-		}
>-	}
>+//		IMemento [] childrenMemento = memento.getChildren(TestUIConstants.TAG_CHILD);
>+//        LinkedList execChildren = new LinkedList();
>+//		for (int i = 0; i < childrenMemento.length; i++) {
>+//			IMemento mementoChild = childrenMemento[i];
>+//            //- inherit the TAG_URI_ROOT which is an extra data contained by the parent
>+//            mementoChild.putString(TestUIConstants.TAG_URI_ROOT, memento.getString(TestUIConstants.TAG_URI_ROOT));
>+//			String type = getType();
>+//			if(type == null) {
>+//				throw new ProxyNeedToBeRebuiltException();
>+//			}
>+//			ITypedElementProxyFactory factory = TypedElementFactoryManager.getInstance().getFactory(type);
>+//			if(factory instanceof IPersistableTypedElementProxyFactory) {
>+//                IProxyNode proxy = ((IPersistableTypedElementProxyFactory)factory).recreate(mementoChild, this);
>+//                if(proxy != null) {
>+//                    execChildren.add(proxy);
>+//                }
>+//			}
>+//		}
>+//        children = (IProxyNode[]) execChildren.toArray(new IProxyNode[execChildren.size()]);
>+        children = new IProxyNode[0];
>+	}
>+	
>+//	/**
>+//	 * @param event
>+//	 * @param parent
>+//	 */
>+//	private void getEventChildren(TPFExecutionEvent event, List c, TPFExecutionResult parent) {
>+//		if ( event instanceof TPFInvocationEvent) {
>+//			TPFExecutionResult er = ((TPFInvocationEvent)event).getInvokedExecutionResult();
>+//            if(er != null) {
>+//                c.add(new DefaultExecutionResultProxyNode(er, parent));
>+//            }
>+//		} else {
>+//			Iterator iterator = event.getChildren().iterator();
>+//			while (iterator.hasNext()) {
>+//				getEventChildren((TPFExecutionEvent) iterator.next(), c, parent);
>+//			}
>+//		}
>+//	}
> 
> 	public String getText() {
> 		if (timestamp != 0L) {
>@@ -185,14 +178,14 @@
>         //- data to retrieve the correct object 
>         memento.putInteger(TAG_VERDICT, getVerdict());
>         memento.putString(TAG_TIMESTAMP, Long.toString(timestamp));
>-        //- children (testcases)
>-        for (int i = 0; i < children.length; i++) {
>-            DefaultExecutionResultProxyNode child = (DefaultExecutionResultProxyNode)children[i];
>-            IMemento childMemento = memento.createChild(TestUIConstants.TAG_CHILD);
>-            if(!child.saveState(childMemento)) {
>-                return false;
>-            }
>-        }
>+//        //- children (testcases)
>+//        for (int i = 0; i < children.length; i++) {
>+//            DefaultExecutionResultProxyNode child = (DefaultExecutionResultProxyNode)children[i];
>+//            IMemento childMemento = memento.createChild(TestUIConstants.TAG_CHILD);
>+//            if(!child.saveState(childMemento)) {
>+//                return false;
>+//            }
>+//        }
>         return super.saveState(memento);
>     }
>

Actions: View | Diff

Attachments on bug 182546: 63903 | 63906 | 63907