Set project and code generator to Java 5 compliance and regenerate -

fixes #2156
osate · Jan 16, 2020 · 593c671 · 593c671
1 parent b2e17c6
commit 593c671
Show file tree

Hide file tree

Showing 601 changed files with 3,817 additions and 11,770 deletions.
diff --git a/core/org.osate.aadl2.edit/.settings/org.eclipse.jdt.core.prefs b/core/org.osate.aadl2.edit/.settings/org.eclipse.jdt.core.prefs
@@ -1,7 +1,15 @@
 eclipse.preferences.version=1
 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
-org.eclipse.jdt.core.compiler.compliance=1.8
+org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
 org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
 org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
+org.eclipse.jdt.core.compiler.release=disabled
+org.eclipse.jdt.core.compiler.source=1.5
diff --git a/core/org.osate.aadl2.edit/build.properties b/core/org.osate.aadl2.edit/build.properties
@@ -5,3 +5,4 @@ bin.includes = icons/,\
                .
 source.. = src/
 output.. = bin/
+jre.compilation.profile = JavaSE-1.6
diff --git a/...osate.aadl2.edit/src/org/osate/aadl2/instance/provider/ComponentInstanceItemProvider.java b/...osate.aadl2.edit/src/org/osate/aadl2/instance/provider/ComponentInstanceItemProvider.java
@@ -23,11 +23,8 @@
  */
 package org.osate.aadl2.instance.provider;
 
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -36,7 +33,6 @@
 import org.eclipse.emf.edit.provider.IItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.xtext.xbase.lib.StringExtensions;
 import org.osate.aadl2.ComponentCategory;
 import org.osate.aadl2.instance.ComponentInstance;
 import org.osate.aadl2.instance.InstancePackage;
@@ -229,8 +225,18 @@ public Object getImage(Object object) {
 	public String getText(Object object) {
 		ComponentInstance ci = (ComponentInstance) object;
 		String label = ci.getFullName();
-		Stream<String> categoryParts = Arrays.stream(ci.getCategory().getName().split(" "));
-		String ctype = categoryParts.map(part -> StringExtensions.toFirstUpper(part)).collect(Collectors.joining(" "));
+		String[] categoryParts = ci.getCategory().getName().split(" ");
+		String ctype = "";
+		for (int i = 0; i < categoryParts.length; i++) {
+			if (i > 0) {
+				ctype += " ";
+			}
+			String s = categoryParts[i];
+			ctype += s.toUpperCase().substring(0, 1);
+			if (s.length() > 1) {
+				ctype += s.substring(1);
+			}
+		}
 		return (ctype == null || ctype.length() == 0 ? getString("_UI_ComponentInstance_type") : ctype) //$NON-NLS-1$
 				+ (label == null || label.length() == 0 ? "" : " " + label);
 	}

diff --git a/...te.aadl2.edit/src/org/osate/aadl2/instance/provider/EndToEndFlowInstanceItemProvider.java b/...te.aadl2.edit/src/org/osate/aadl2/instance/provider/EndToEndFlowInstanceItemProvider.java
@@ -23,11 +23,10 @@
  */
 package org.osate.aadl2.instance.provider;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
-import java.util.stream.Stream;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -185,9 +184,12 @@ public void notifyChanged(Notification notification) {
 	@Override
 	public Collection<?> getChildren(Object object) {
 		EndToEndFlowInstance etef = (EndToEndFlowInstance) object;
-		Stream<EndToEndFlowInstanceFlowElementItemProvider> flowElements = etef.getFlowElements().stream()
-				.map(flowElement -> new EndToEndFlowInstanceFlowElementItemProvider(adapterFactory, etef, flowElement));
-		return Stream.concat(flowElements, super.getChildren(object).stream()).collect(Collectors.toList());
+		List<Object> result = new ArrayList<Object>();
+		for (FlowElementInstance flowElement : etef.getFlowElements()) {
+			result.add(new EndToEndFlowInstanceFlowElementItemProvider(adapterFactory, etef, flowElement));
+		}
+		result.addAll(super.getChildren(object));
+		return result;
 	}
 
 	public static class EndToEndFlowInstanceFlowElementItemProvider extends ItemProviderAdapter

diff --git a/....aadl2.edit/src/org/osate/aadl2/instance/provider/InstanceItemProviderAdapterFactory.java b/....aadl2.edit/src/org/osate/aadl2/instance/provider/InstanceItemProviderAdapterFactory.java
@@ -75,7 +75,7 @@ public class InstanceItemProviderAdapterFactory extends InstanceAdapterFactory
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	protected Collection<Object> supportedTypes = new ArrayList<>();
+	protected Collection<Object> supportedTypes = new ArrayList<Object>();
 
 	/**
 	 * This constructs an instance.
@@ -373,7 +373,6 @@ public Adapter createInstanceReferenceValueAdapter() {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public ComposeableAdapterFactory getRootAdapterFactory() {
 		return parentAdapterFactory == null ? this : parentAdapterFactory.getRootAdapterFactory();
 	}
@@ -384,7 +383,6 @@ public ComposeableAdapterFactory getRootAdapterFactory() {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void setParentAdapterFactory(ComposedAdapterFactory parentAdapterFactory) {
 		this.parentAdapterFactory = parentAdapterFactory;
 	}
@@ -433,7 +431,6 @@ public Object adapt(Object object, Object type) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void addListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.addListener(notifyChangedListener);
 	}
@@ -444,7 +441,6 @@ public void addListener(INotifyChangedListener notifyChangedListener) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void removeListener(INotifyChangedListener notifyChangedListener) {
 		changeNotifier.removeListener(notifyChangedListener);
 	}
@@ -455,7 +451,6 @@ public void removeListener(INotifyChangedListener notifyChangedListener) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void fireNotifyChanged(Notification notification) {
 		changeNotifier.fireNotifyChanged(notification);
 
@@ -470,7 +465,6 @@ public void fireNotifyChanged(Notification notification) {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	@Override
 	public void dispose() {
 		if (featureInstanceItemProvider != null) {
 			featureInstanceItemProvider.dispose();

diff --git a/...ate.aadl2.edit/src/org/osate/aadl2/instance/provider/SystemOperationModeItemProvider.java b/...ate.aadl2.edit/src/org/osate/aadl2/instance/provider/SystemOperationModeItemProvider.java
@@ -23,10 +23,10 @@
  */
 package org.osate.aadl2.instance.provider;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.eclipse.emf.common.notify.AdapterFactory;
 import org.eclipse.emf.common.notify.Notification;
@@ -148,8 +148,11 @@ public ResourceLocator getResourceLocator() {
 	@Override
 	public Collection<?> getChildren(Object object) {
 		SystemOperationMode som = (SystemOperationMode) object;
-		return som.getCurrentModes().stream().map(subMode -> new SubModeItemProvider(adapterFactory, som, subMode))
-				.collect(Collectors.toList());
+		List<SubModeItemProvider> result = new ArrayList<SubModeItemProvider>();
+		for (ModeInstance subMode : som.getCurrentModes()) {
+			result.add(new SubModeItemProvider(adapterFactory, som, subMode));
+		}
+		return result;
 	}
 
 	public static class SubModeItemProvider extends ItemProviderAdapter implements IEditingDomainItemProvider,

diff --git a/core/org.osate.aadl2.edit/src/org/osate/aadl2/provider/Aadl2EditPlugin.java b/core/org.osate.aadl2.edit/src/org/osate/aadl2/provider/Aadl2EditPlugin.java
@@ -68,7 +68,6 @@ public Aadl2EditPlugin() {
 	 * @return the singleton instance.
 	 * @generated
 	 */
-	@Override
 	public ResourceLocator getPluginResourceLocator() {
 		return plugin;
 	}