Issue #101 - Fixed implementation of QueueImpl::firstImpl.

- Also updated compiled implementation in Alf.library.uml.
ModelDriven · Aug 23, 2022 · c3b5d77 · c3b5d77
1 parent 35a9a56
commit c3b5d77
Show file tree

Hide file tree

Showing 13 changed files with 74 additions and 65 deletions.
diff --git a/org.modeldriven.alf.bundle/META-INF/MANIFEST.MF b/org.modeldriven.alf.bundle/META-INF/MANIFEST.MF
@@ -1,14 +1,14 @@
 Manifest-Version: 1.0
 Automatic-Module-Name: org.modeldriven.alf.bundle
-Bnd-LastModified: 1604033112555
+Bnd-LastModified: 1661297744222
 Build-Jdk: 1.8.0_31
 Built-By: seidewitz
 Bundle-ClassPath: .,jars/org.modeldriven.alf-1.0.0-SNAPSHOT.jar
 Bundle-ManifestVersion: 2
 Bundle-Name: org.modeldriven.alf.bundle
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.modeldriven.alf.bundle
-Bundle-Version: 1.0.0.20201030044434
+Bundle-Version: 1.0.0.20220823233512
 Created-By: Apache Maven Bundle Plugin
 Embed-Dependency: *;scope=compile;groupId=!org.modeldriven
 Embed-Directory: jars

diff --git a/...deldriven.alf.eclipse.moka/Libraries/alf/Alf/Library/CollectionClasses/Impl/QueueImpl.alf b/...deldriven.alf.eclipse.moka/Libraries/alf/Alf/Library/CollectionClasses/Impl/QueueImpl.alf
@@ -27,7 +27,7 @@ abstract class QueueImpl specializes CollectionImpl {
   }
 
   protected firstImpl(): any[0..1] {
-    this.content->First();
+    return this.content->First();
   }
 
   protected removeFirstImpl (): any[0..1] {

diff --git a/org.modeldriven.alf.eclipse.moka/dist/fuml-eclipse.jar b/org.modeldriven.alf.eclipse.moka/dist/fuml-eclipse.jar
diff --git a/org.modeldriven.alf.eclipse/Libraries/uml/Alf.library.uml b/org.modeldriven.alf.eclipse/Libraries/uml/Alf.library.uml
diff --git a/org.modeldriven.alf.eclipse/Models/Alf/Library/CollectionClasses/Impl/QueueImpl.alf b/org.modeldriven.alf.eclipse/Models/Alf/Library/CollectionClasses/Impl/QueueImpl.alf
@@ -27,7 +27,7 @@ abstract class QueueImpl specializes CollectionImpl {
   }
 
   protected firstImpl(): any[0..1] {
-    this.content->First();
+    return this.content->First();
   }
 
   protected removeFirstImpl (): any[0..1] {

diff --git a/org.modeldriven.alf.eclipse/dist/alf-eclipse.jar b/org.modeldriven.alf.eclipse/dist/alf-eclipse.jar
diff --git a/org.modeldriven.alf.eclipse/launch/alfc.launch b/org.modeldriven.alf.eclipse/launch/alfc.launch
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/execution/AlfCompiler.java"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="1"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
-        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
-        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
-    </listAttribute>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.modeldriven.alf.eclipse.fuml.execution.AlfCompiler"/>
-    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.modeldriven.alf.eclipse"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-v -m &quot;${container_loc}&quot; -f &quot;${selected_resource_loc}&quot;"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.modeldriven.alf.eclipse"/>
-    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+        <listEntry value="/org.modeldriven.alf.eclipse/src/org/modeldriven/alf/eclipse/fuml/execution/AlfCompiler.java"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+        <listEntry value="1"/>
+    </listAttribute>
+    <listAttribute key="org.eclipse.debug.ui.favoriteGroups">
+        <listEntry value="org.eclipse.debug.ui.launchGroup.debug"/>
+        <listEntry value="org.eclipse.debug.ui.launchGroup.run"/>
+    </listAttribute>
+    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
+    <stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.modeldriven.alf.eclipse.fuml.execution.AlfCompiler"/>
+    <stringAttribute key="org.eclipse.jdt.launching.MODULE_NAME" value="org.modeldriven.alf.eclipse"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-v -m &quot;${container_loc}&quot; -f &quot;${selected_resource_loc}&quot;"/>
+    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.modeldriven.alf.eclipse"/>
+    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xmx800M"/>
+</launchConfiguration>
diff --git a/org.modeldriven.alf.fuml.impl.bundle/META-INF/MANIFEST.MF b/org.modeldriven.alf.fuml.impl.bundle/META-INF/MANIFEST.MF
@@ -1,6 +1,6 @@
 Manifest-Version: 1.0
 Automatic-Module-Name: org.modeldriven.alf.fuml.impl.bundle
-Bnd-LastModified: 1604033113634
+Bnd-LastModified: 1661297745291
 Build-Jdk: 1.8.0_31
 Built-By: seidewitz
 Bundle-ClassPath: .,jars/org.modeldriven.alf-1.0.0-SNAPSHOT.jar,jars/org
@@ -9,7 +9,7 @@ Bundle-ManifestVersion: 2
 Bundle-Name: org.modeldriven.alf.fuml.impl.bundle
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-SymbolicName: org.modeldriven.alf.fuml.impl.bundle
-Bundle-Version: 1.0.0.20201030044434
+Bundle-Version: 1.0.0.20220823233512
 Created-By: Apache Maven Bundle Plugin
 Embed-Dependency: *;scope=compile;groupId=!org.modeldriven
 Embed-Directory: jars

diff --git a/org.modeldriven.alf.fuml.impl/Libraries/alf/Alf/Library/CollectionClasses/Impl/QueueImpl.alf b/org.modeldriven.alf.fuml.impl/Libraries/alf/Alf/Library/CollectionClasses/Impl/QueueImpl.alf
@@ -27,7 +27,7 @@ abstract class QueueImpl specializes CollectionImpl {
   }
 
   protected firstImpl(): any[0..1] {
-    this.content->First();
+    return this.content->First();
   }
 
   protected removeFirstImpl (): any[0..1] {

diff --git a/org.modeldriven.alf.fuml.impl/dist/alf.jar b/org.modeldriven.alf.fuml.impl/dist/alf.jar
diff --git a/org.modeldriven.alf/Libraries/alf/Alf/Library/CollectionClasses/Impl/QueueImpl.alf b/org.modeldriven.alf/Libraries/alf/Alf/Library/CollectionClasses/Impl/QueueImpl.alf
@@ -27,7 +27,7 @@ abstract class QueueImpl specializes CollectionImpl {
   }
 
   protected firstImpl(): any[0..1] {
-    this.content->First();
+    return this.content->First();
   }
 
   protected removeFirstImpl (): any[0..1] {

diff --git a/org.modeldriven.alf/dist/alf-base.jar b/org.modeldriven.alf/dist/alf-base.jar
diff --git a/org.modeldriven.alf/src/org/modeldriven/alf/execution/AlfBase.java b/org.modeldriven.alf/src/org/modeldriven/alf/execution/AlfBase.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright 2011-2020 Model Driven Solutions, Inc.
+ * Copyright 2011-2022 Model Driven Solutions, Inc.
  * All rights reserved worldwide. This program and the accompanying materials
  * are made available for use under the terms of the GNU General Public License 
  * (GPL) version 3 that accompanies this distribution and is available at 
@@ -24,7 +24,7 @@
 
 public abstract class AlfBase {
 
-    public static final String ALF_VERSION = "1.1.0k";
+    public static final String ALF_VERSION = "1.1.0l-maint";
 
     protected boolean isVerbose = false;