Attachment 89459 Details for Bug 218550 – JScrib Patch

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

[patch] JScrib Patch

org.eclipse.tptp.platform.models_defect_218550_patch.txt (text/plain), 2.16 KB, created by Paul Slauenwhite

on 2008-02-11 17:36:32 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Slauenwhite

Created: 2008-02-11 17:36:32 EST

Size: 2.16 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.tptp.platform.models
>Index: src-test/org/eclipse/hyades/models/common/util/ExecutionUtil.java
>===================================================================
>RCS file: /cvsroot/tptp/platform/org.eclipse.tptp.platform.models/src-test/org/eclipse/hyades/models/common/util/ExecutionUtil.java,v
>retrieving revision 1.18
>diff -u -r1.18 ExecutionUtil.java
>--- src-test/org/eclipse/hyades/models/common/util/ExecutionUtil.java	24 Jan 2008 18:46:22 -0000	1.18
>+++ src-test/org/eclipse/hyades/models/common/util/ExecutionUtil.java	11 Feb 2008 22:35:41 -0000
>@@ -56,7 +56,7 @@
> /**
>  * @author  Marcelo Paternostro
>  * @author  Paul E. Slauenwhite
>- * @version January 24, 2008
>+ * @version February 11, 2008
>  * @since   January 25, 2005
>  */
> public class ExecutionUtil
>@@ -329,6 +329,7 @@
> 	{
> 		if((tests != null) && (!tests.isEmpty()))
> 		{
>+			ResourceSet resourceSet = null;
> 			Set resourcePrefixes = new HashSet(tests.size()+1);
> 			for (Iterator i = tests.iterator(); i.hasNext();)
> 			{
>@@ -338,6 +339,9 @@
> 					TPFTest test = (TPFTest)object;
> 					if(test.eResource() != null)
> 					{
>+						if(resourceSet == null)
>+							resourceSet = test.eResource().getResourceSet();
>+						
> 						URI uri = test.eResource().getURI().trimFileExtension();
> 						resourcePrefixes.add(uri.lastSegment().toString());
> 					}					
>@@ -346,6 +350,7 @@
> 			
> 			if(!resourcePrefixes.isEmpty())
> 			{
>+				final ResourceSet finalResourceSet = resourceSet;
> 				final String[] prefixes = (String[])resourcePrefixes.toArray(new String[resourcePrefixes.size()]); 
> 				final Map ret = new HashMap(resourcePrefixes.size()+1,1);
> 				ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()
>@@ -356,7 +361,7 @@
> 						{
> 							if(file.getName().startsWith(prefixes[i]))
> 							{
>-								EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
>+								EObject[] eObjects = ResourceUtil.load(finalResourceSet, file);
> 								if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
> 								{
> 									TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];

Actions: View | Diff

Attachments on bug 218550: 89445 | 89459