Attachment #85715 for bug #190453

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

View | Details | Raw Unified | Return to bug 190453
Collapse All | Expand All




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;

/**
 * @author  Marcelo Paternostro
 * @author  Paul E. Slauenwhite
 * @version December 21, 2007
 * @since   January 25, 2005
 */
public class ExecutionUtil

		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()
			{

				{
					if(file.getName().startsWith(executionPrefix))
					{
						EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
						if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
						{
							TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];

			
			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(new ResourceSetImpl(), file);
						if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
						{
							TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];

				
				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(new ResourceSetImpl(), file);							
							if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
							{
								TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];

		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(new ResourceSetImpl(), file);
					if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
					{
						TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];

	{
		if((tests != null) && (!tests.isEmpty()))
		{
			ResourceSet resourceSet = null;
			Set resourcePrefixes = new HashSet(tests.size()+1);
			for (Iterator i = tests.iterator(); i.hasNext();)
			{

					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());
					}					

			
			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()

						{
							if(file.getName().startsWith(prefixes[i]))
							{
								EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
								if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
								{
									TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];

Return to bug 190453

Lines 26-31 Link Here

(-)src-test/org/eclipse/hyades/models/common/util/ExecutionUtil.java (-16 / +7 lines)
26	import org.eclipse.emf.common.util.URI;	26	import org.eclipse.emf.common.util.URI;
27	import org.eclipse.emf.ecore.EObject;	27	import org.eclipse.emf.ecore.EObject;
28	import org.eclipse.emf.ecore.resource.ResourceSet;	28	import org.eclipse.emf.ecore.resource.ResourceSet;
		29	import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
29	import org.eclipse.emf.ecore.util.EcoreUtil;	30	import org.eclipse.emf.ecore.util.EcoreUtil;
30	import org.eclipse.hyades.loaders.util.HyadesResourceExtensions;	31	import org.eclipse.hyades.loaders.util.HyadesResourceExtensions;
31	import org.eclipse.hyades.loaders.util.LoadersUtils;	32	import org.eclipse.hyades.loaders.util.LoadersUtils;
Lines 55-61 Link Here
55	/**	56	/**
56	* @author Marcelo Paternostro	57	* @author Marcelo Paternostro
57	* @author Paul E. Slauenwhite	58	* @author Paul E. Slauenwhite
58	* @version December 12, 2007	59	* @version December 21, 2007
59	* @since January 25, 2005	60	* @since January 25, 2005
60	*/	61	*/
61	public class ExecutionUtil	62	public class ExecutionUtil
Lines 72-78 Link Here
72	if((test != null) && (test.eResource() != null))	73	if((test != null) && (test.eResource() != null))
73	{	74	{
74	URI uri = test.eResource().getURI().trimFileExtension();	75	URI uri = test.eResource().getURI().trimFileExtension();
75	final ResourceSet resourceSet = test.eResource().getResourceSet();
76	final String executionPrefix = uri.lastSegment().toString();	76	final String executionPrefix = uri.lastSegment().toString();
77	ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()	77	ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()
78	{	78	{
Lines 80-86 Link Here
80	{	80	{
81	if(file.getName().startsWith(executionPrefix))	81	if(file.getName().startsWith(executionPrefix))
82	{	82	{
83	EObject[] eObjects = ResourceUtil.load(resourceSet, file);	83	EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
84	if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))	84	if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
85	{	85	{
86	TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];	86	TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];
Lines 130-143 Link Here
130		130
131	final long fEndTime = endTime;	131	final long fEndTime = endTime;
132		132
133	final ResourceSet resourceSet = test.eResource().getResourceSet();
134	ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()	133	ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()
135	{	134	{
136	public Object visit(IFile file)	135	public Object visit(IFile file)
137	{	136	{
138	//Open the execution result file only if modified after the start time stamp:	137	//Open the execution result file only if modified after the start time stamp:
139	if(file.getLocalTimeStamp() >= fStartTime){	138	if(file.getLocalTimeStamp() >= fStartTime){
140	EObject[] eObjects = ResourceUtil.load(resourceSet, file);	139	EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
141	if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))	140	if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
142	{	141	{
143	TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];	142	TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];
Lines 189-196 Link Here
189		188
190	final long fEndTime = endTime;	189	final long fEndTime = endTime;
191		190
192	final ResourceSet resourceSet = test.eResource().getResourceSet();
193
194	ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()	191	ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()
195	{	192	{
196	public Object visit(IFile file)	193	public Object visit(IFile file)
Lines 199-205 Link Here
199	//Open the execution result file only if modified after the start time stamp:	196	//Open the execution result file only if modified after the start time stamp:
200	if(file.getLocalTimeStamp() >= fStartTime){	197	if(file.getLocalTimeStamp() >= fStartTime){
201		198
202	EObject[] eObjects = ResourceUtil.load(resourceSet, file);	199	EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
203	if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))	200	if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
204	{	201	{
205	TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];	202	TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];
Lines 296-307 Link Here
296	if((test != null) && (test.eResource() != null))	293	if((test != null) && (test.eResource() != null))
297	{	294	{
298		295
299	final ResourceSet resourceSet = test.eResource().getResourceSet();
300	ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()	296	ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()
301	{	297	{
302	public Object visit(IFile file)	298	public Object visit(IFile file)
303	{	299	{
304	EObject[] eObjects = ResourceUtil.load(resourceSet, file);	300	EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
305	if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))	301	if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
306	{	302	{
307	TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];	303	TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];
Lines 333-339 Link Here
333	{	329	{
334	if((tests != null) && (!tests.isEmpty()))	330	if((tests != null) && (!tests.isEmpty()))
335	{	331	{
336	ResourceSet resourceSet = null;
337	Set resourcePrefixes = new HashSet(tests.size()+1);	332	Set resourcePrefixes = new HashSet(tests.size()+1);
338	for (Iterator i = tests.iterator(); i.hasNext();)	333	for (Iterator i = tests.iterator(); i.hasNext();)
339	{	334	{
Lines 343-351 Link Here
343	TPFTest test = (TPFTest)object;	338	TPFTest test = (TPFTest)object;
344	if(test.eResource() != null)	339	if(test.eResource() != null)
345	{	340	{
346	if(resourceSet == null)
347	resourceSet = test.eResource().getResourceSet();
348
349	URI uri = test.eResource().getURI().trimFileExtension();	341	URI uri = test.eResource().getURI().trimFileExtension();
350	resourcePrefixes.add(uri.lastSegment().toString());	342	resourcePrefixes.add(uri.lastSegment().toString());
351	}	343	}
Lines 354-360 Link Here
354		346
355	if(!resourcePrefixes.isEmpty())	347	if(!resourcePrefixes.isEmpty())
356	{	348	{
357	final ResourceSet finalResourceSet = resourceSet;
358	final String[] prefixes = (String[])resourcePrefixes.toArray(new String[resourcePrefixes.size()]);	349	final String[] prefixes = (String[])resourcePrefixes.toArray(new String[resourcePrefixes.size()]);
359	final Map ret = new HashMap(resourcePrefixes.size()+1,1);	350	final Map ret = new HashMap(resourcePrefixes.size()+1,1);
360	ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()	351	ResourceUtil.IGetFilesVisitor visitor = new ResourceUtil.IGetFilesVisitor()
Lines 365-371 Link Here
365	{	356	{
366	if(file.getName().startsWith(prefixes[i]))	357	if(file.getName().startsWith(prefixes[i]))
367	{	358	{
368	EObject[] eObjects = ResourceUtil.load(finalResourceSet, file);	359	EObject[] eObjects = ResourceUtil.load(new ResourceSetImpl(), file);
369	if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))	360	if((eObjects.length == 1) && (eObjects[0] instanceof TPFExecutionResult))
370	{	361	{
371	TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];	362	TPFExecutionResult executionResult = (TPFExecutionResult)eObjects[0];