osate.patch

diff --git a/org.osate.xtext.aadl2/src/org/osate/xtext/aadl2/validation/Aadl2JavaValidator.java b/org.osate.xtext.aadl2/src/org/osate/xtext/aadl2/validation/Aadl2JavaValidator.java
index b962369..8dbc324 100644
--- a/org.osate.xtext.aadl2/src/org/osate/xtext/aadl2/validation/Aadl2JavaValidator.java
+++ b/org.osate.xtext.aadl2/src/org/osate/xtext/aadl2/validation/Aadl2JavaValidator.java
@@ -3564,7 +3564,7 @@
 		Property dataSizeProperty = GetProperties.lookupPropertyDefinition(dataImplementation, MemoryProperties._NAME, MemoryProperties.SOURCE_DATA_SIZE);
 		try {
 			LongWithUnits implementationSize = new LongWithUnits((IntegerLiteral)PropertyUtils.getSimplePropertyValue(dataImplementation, dataSizeProperty));
-			List<Optional<LongWithUnits>> subcomponentSizes = getSizesForSubcomponents(dataImplementation, dataSizeProperty).collect(Collectors.toList());
+			List<Optional<LongWithUnits>> subcomponentSizes = (List<Optional<LongWithUnits>>) getSizesForSubcomponents(dataImplementation, dataSizeProperty).collect(Collectors.toList());
 			Optional<LongWithUnits> optionalSum = subcomponentSizes.stream().filter(subcomponentSize -> subcomponentSize.isPresent()).map(subcomponentSize -> subcomponentSize.get()).reduce((a, b) -> a.add(b));
 			if (optionalSum.isPresent()) {
 				LongWithUnits sum = optionalSum.get();
@@ -3583,7 +3583,7 @@
 		}
 	}
 	
-	private static Stream<Optional<LongWithUnits>> getSizesForSubcomponents(DataImplementation dataImplementation, Property dataSizeProperty) {
+	private static Stream getSizesForSubcomponents(DataImplementation dataImplementation, Property dataSizeProperty) {
 		return dataImplementation.getAllSubcomponents().stream().filter(subcomponent -> subcomponent instanceof DataSubcomponent).flatMap(dataSubcomponent -> {
 			try {
 				return Stream.of(Optional.of(new LongWithUnits((IntegerLiteral)PropertyUtils.getSimplePropertyValue(dataSubcomponent, dataSizeProperty))));