Attachment 85715 Details for Bug 190453 – Partial patch.

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

[patch] Partial patch.

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

on 2007-12-21 10:33:24 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Paul Slauenwhite

Created: 2007-12-21 10:33:24 EST

Size: 5.36 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.17
>diff -u -r1.17 ExecutionUtil.java
>--- src-test/org/eclipse/hyades/models/common/util/ExecutionUtil.java	12 Dec 2007 19:45:50 -0000	1.17
>+++ src-test/org/eclipse/hyades/models/common/util/ExecutionUtil.java	21 Dec 2007 15:24:32 -0000
>@@ -26,6 +26,7 @@
> import org.eclipse.emf.common.util.URI;
> import org.eclipse.emf.ecore.EObject;
> import org.eclipse.emf.ecore.resource.ResourceSet;
>+import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
> import org.eclipse.emf.ecore.util.EcoreUtil;
> import org.eclipse.hyades.loaders.util.HyadesResourceExtensions;
> import org.eclipse.hyades.loaders.util.LoadersUtils;
>@@ -55,7 +56,7 @@
> /**
>  * @author  Marcelo Paternostro
>  * @author  Paul E. Slauenwhite
>- * @version December 12, 2007
>+ * @version December 21, 2007
>  * @since   January 25, 2005
>  */
> public class ExecutionUtil
>@@ -72,7 +73,6 @@
> 		if((test != null) && (test.eResource() != null))
> 		{
> 			URI uri = test.eResource().getURI().trimFileExtension();
>-			final ResourceSet resourceSet = test.eResource().getResourceSet(); 
> 			final String executionPrefix = uri.lastSegment().toString();
> 			ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()
> 			{
>@@ -80,7 +80,7 @@
> 				{
> 					if(file.getName().startsWith(executionPrefix))
> 					{
>-						EObject[] eObjects = ResourceUtil.load(resourceSet, file);
>+						EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
> 						if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
> 						{
> 							TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];
>@@ -130,14 +130,13 @@
> 			
> 			final long fEndTime = endTime;
> 				
>-			final ResourceSet resourceSet = test.eResource().getResourceSet(); 
> 			ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()
> 			{
> 				public Object visit(IFile file)
> 				{
> 					//Open the execution result file only if modified after the start time stamp:
> 					if(file.getLocalTimeStamp() >= fStartTime){
>-						EObject[] eObjects = ResourceUtil.load(resourceSet, file);
>+						EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
> 						if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
> 						{
> 							TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];
>@@ -189,8 +188,6 @@
> 				
> 				final long fEndTime = endTime;
> 					
>-				final ResourceSet resourceSet = test.eResource().getResourceSet(); 
>-			 
> 				ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()
> 				{
> 					public Object visit(IFile file)
>@@ -199,7 +196,7 @@
> 						//Open the execution result file only if modified after the start time stamp:
> 						if(file.getLocalTimeStamp() >= fStartTime){
> 							
>-							EObject[] eObjects = ResourceUtil.load(resourceSet, file);							
>+							EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);							
> 							if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
> 							{
> 								TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];
>@@ -296,12 +293,11 @@
> 		if((test != null) && (test.eResource() != null))
> 		{
> 			
>-			final ResourceSet resourceSet = test.eResource().getResourceSet(); 
> 			ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()
> 			{
> 				public Object visit(IFile file)
> 				{
>-					EObject[] eObjects = ResourceUtil.load(resourceSet, file);
>+					EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
> 					if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
> 					{
> 						TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];
>@@ -333,7 +329,6 @@
> 	{
> 		if((tests != null) && (!tests.isEmpty()))
> 		{
>-			ResourceSet resourceSet = null;
> 			Set resourcePrefixes = new HashSet(tests.size()+1);
> 			for (Iterator i = tests.iterator(); i.hasNext();)
> 			{
>@@ -343,9 +338,6 @@
> 					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());
> 					}					
>@@ -354,7 +346,6 @@
> 			
> 			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()
>@@ -365,7 +356,7 @@
> 						{
> 							if(file.getName().startsWith(prefixes[i]))
> 							{
>-								EObject[] eObjects = ResourceUtil.load(finalResourceSet, file);
>+								EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
> 								if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
> 								{
> 									TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];

Actions: View | Diff

Attachments on bug 190453: 69684 | 85715