Commit 7e61dc95 authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* missing part of handling files with multiple modules #21

parent f77c6675

de.ugoe.cs.swe.T3Q/src/de/ugoe/cs/swe/T3Q/TTCN3ResourceProvider.java

+11 −4
Original line number Diff line number Diff line
@@ -108,9 +108,11 @@ public class TTCN3ResourceProvider { 
			for (Future<Resource> f : list) {

				Resource r = f.get();

				TTCN3GlobalScopeProvider.RESOURCES.add(r);

				TTCN3Module module = CommonHelper.getModule(r);

				List<TTCN3Module> modules = CommonHelper.getModules(r);

				for (TTCN3Module module : modules) {

					TTCN3GlobalScopeProvider.NAMED_MODULES.put(module.getName(), module);

				}

			}

		} catch (InterruptedException | ExecutionException e) {

			// TODO Auto-generated catch block

			e.printStackTrace();
@@ -160,11 +162,16 @@ public class TTCN3ResourceProvider { 
				

			//parallel

			ExecutorService resolverPool = Executors.newFixedThreadPool(getCores());

			Pattern pattern = Pattern.compile(activeProfile.getIgnoredResourceRegExp());

			Matcher matcher = null;		



			ArrayList<Resolver> resolver = new ArrayList<Resolver>();

			for (Resource r : TTCN3GlobalScopeProvider.RESOURCES) {

				matcher = pattern.matcher(r.getURI().toFileString());

				if(matcher.matches()) {

					resolver.add(new Resolver(r, logger));

				}

			}

			try {

				List<Future<String>> output = resolverPool.invokeAll(resolver);

				resolverPool.shutdown();