Commit 18d82bdd authored by Philip Makedonski's avatar Philip Makedonski
Browse files

* factored out sto generation

parent bfa14ab7
Loading
Loading
Loading
Loading
+14 −16
Original line number Diff line number Diff line
@@ -74,15 +74,9 @@ public class Generator {
			generatePackageHeadings(resource, document, prefix, hLevel);
		} else {
			//flat generation
			List<StructuredTestObjective> stos = EcoreUtil2.getAllContentsOfType(resource.getContents().get(0), StructuredTestObjective.class);
			
			for (StructuredTestObjective sto : stos) {
				String sectionTitle = sto.getName();
				LinkedHashMap<String, String> map = getReplacementMap(sto);
				generateTable(document, sectionTitle, map);
				LinkedHashMap<String, LinkedHashMap<String,String>> variants = getVariantsMap(sto);
				generateVariants(document, variants);
			}
			EObject p = resource.getContents().get(0);
			List<StructuredTestObjective> stos = EcoreUtil2.getAllContentsOfType(p, StructuredTestObjective.class);
			generateSTOs(document, stos);
		}
		
		storeDocument(filename, document);
@@ -100,6 +94,13 @@ public class Generator {
		for (Package p : packages) {
			generatePackageHeading(document, prefix, i, p, hLevel);
			List<StructuredTestObjective> stos = getContentsOfType(p, StructuredTestObjective.class);
			generateSTOs(document, stos);
			generatePackageHeadings(document, getContentsOfType(p, Package.class), prefix+"."+i, hLevel+1);
			i++;
		}
	}

	private void generateSTOs(XWPFDocument document, List<StructuredTestObjective> stos) {
		for (StructuredTestObjective sto : stos) {
			String sectionTitle = sto.getName();
			LinkedHashMap<String, String> map = getReplacementMap(sto);
@@ -107,9 +108,6 @@ public class Generator {
			LinkedHashMap<String, LinkedHashMap<String,String>> variants = getVariantsMap(sto);
			generateVariants(document, variants);
		}
			generatePackageHeadings(document, getContentsOfType(p, Package.class), prefix+"."+i, hLevel+1);
			i++;
		}
	}

	private void generatePackageHeading(XWPFDocument document, String prefix, int i, Package p, int hLevel) {