Commit de3764fb authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* adjusted resource loading

parent 6684b9b6
Loading
Loading
Loading
Loading
+10 −7
Changes for plugins/org.etsi.mts.tdl.constraints.ui/src/org/etsi/mts/tdl/constraints/ui/handlers/ValidationHandler.java: 10 added lines, 7 removed lines.
Original line number Original line Diff line number Diff line
@@ -76,15 +76,18 @@ public class ValidationHandler extends AbstractHandler {
		if (file !=null) {
		if (file !=null) {
			URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);
			URI uri = URI.createPlatformResourceURI(file.getFullPath().toString(), true);


			//TODO: recommended manner for loading xtext resources, does not work for non-xtext resources
//			IResourceServiceProvider resourceServiceProvider = IResourceServiceProvider.Registry.INSTANCE
//			    .getResourceServiceProvider(uri);
//			XtextResourceSetProvider rsp = (XtextResourceSetProvider) resourceServiceProvider
//			    .get(IResourceSetProvider.class);
//			XtextResourceSet rs = (XtextResourceSet) rsp.get(project);

			ResourceSet rs = new ResourceSetImpl();
			ResourceSet rs = new ResourceSetImpl();
			
			
			//DONE: recommended manner for loading xtext resources, does not work for non-xtext resources -> use default resource set for the time being
			IResourceServiceProvider resourceServiceProvider = IResourceServiceProvider.Registry.INSTANCE
			    .getResourceServiceProvider(uri);
			if (resourceServiceProvider != null) {
				XtextResourceSetProvider rsp = (XtextResourceSetProvider) resourceServiceProvider
						.get(IResourceSetProvider.class);
				rs = (XtextResourceSet) rsp.get(project);
			}


			Resource r = rs.getResource(uri, true);
			Resource r = rs.getResource(uri, true);
			//DONE: either here or in Validator -> currently Validator
			//DONE: either here or in Validator -> currently Validator
//			EcoreUtil.resolveAll(xr);
//			EcoreUtil.resolveAll(xr);