[472466] Correct Sequence returning Sequence declarations
diff --git a/plugins/org.eclipse.ocl.ecore/model/oclstdlib.ecore b/plugins/org.eclipse.ocl.ecore/model/oclstdlib.ecore
index 401f968..64427f9 100644
--- a/plugins/org.eclipse.ocl.ecore/model/oclstdlib.ecore
+++ b/plugins/org.eclipse.ocl.ecore/model/oclstdlib.ecore
@@ -1100,17 +1100,17 @@
<eOperations name="union" eType="#/0/Sequence(T)">
<eParameters name="s" eType="#/0/Sequence(T)"/>
</eOperations>
- <eOperations name="append" eType="#/0/Boolean">
+ <eOperations name="append" eType="#/0/Sequence(T)">
<eParameters name="object" eType="#/0/T"/>
</eOperations>
- <eOperations name="prepend" eType="#/0/Boolean">
+ <eOperations name="prepend" eType="#/0/Sequence(T)">
<eParameters name="object" eType="#/0/T"/>
</eOperations>
- <eOperations name="insertAt" eType="#/0/Boolean">
+ <eOperations name="insertAt" eType="#/0/Sequence(T)">
<eParameters name="index" eType="#/0/Integer"/>
<eParameters name="object" eType="#/0/T"/>
</eOperations>
- <eOperations name="subSequence" eType="#/0/Boolean">
+ <eOperations name="subSequence" eType="#/0/Sequence(T)">
<eParameters name="lower" eType="#/0/Integer"/>
<eParameters name="upper" eType="#/0/Integer"/>
</eOperations>
@@ -1120,10 +1120,10 @@
<eOperations name="indexOf" eType="#/0/Integer">
<eParameters name="object" eType="#/0/T"/>
</eOperations>
- <eOperations name="including" eType="#/0/Boolean">
+ <eOperations name="including" eType="#/0/Sequence(T)">
<eParameters name="object" eType="#/0/T"/>
</eOperations>
- <eOperations name="excluding" eType="#/0/Boolean">
+ <eOperations name="excluding" eType="#/0/Sequence(T)">
<eParameters name="object" eType="#/0/T"/>
</eOperations>
<eOperations name="first" eType="#/0/T"/>
diff --git a/plugins/org.eclipse.ocl.uml/model/oclstdlib.uml b/plugins/org.eclipse.ocl.uml/model/oclstdlib.uml
index 212414b..051cb76 100644
--- a/plugins/org.eclipse.ocl.uml/model/oclstdlib.uml
+++ b/plugins/org.eclipse.ocl.uml/model/oclstdlib.uml
@@ -1585,20 +1585,20 @@
<ownedParameter xmi:id="_awXV3KjQEdu4LJng8Rasow" name="s" type="_awXVuKjQEdu4LJng8Rasow"/>
</ownedOperation>
<ownedOperation xmi:id="_awXV3ajQEdu4LJng8Rasow" name="append" isQuery="true">
- <ownedParameter xmi:id="_awXV3qjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
+ <ownedParameter xmi:id="_awXV3qjQEdu4LJng8Rasow" type="_awXVuKjQEdu4LJng8Rasow" direction="return"/>
<ownedParameter xmi:id="_awXV36jQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>
</ownedOperation>
<ownedOperation xmi:id="_awXV4KjQEdu4LJng8Rasow" name="prepend" isQuery="true">
- <ownedParameter xmi:id="_awXV4ajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
+ <ownedParameter xmi:id="_awXV4ajQEdu4LJng8Rasow" type="_awXVuKjQEdu4LJng8Rasow" direction="return"/>
<ownedParameter xmi:id="_awXV4qjQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>
</ownedOperation>
<ownedOperation xmi:id="_awXV46jQEdu4LJng8Rasow" name="insertAt" isQuery="true">
- <ownedParameter xmi:id="_awXV5KjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
+ <ownedParameter xmi:id="_awXV5KjQEdu4LJng8Rasow" type="_awXVuKjQEdu4LJng8Rasow" direction="return"/>
<ownedParameter xmi:id="_awXV5ajQEdu4LJng8Rasow" name="index" type="_alYNtqjQEdu4LJng8Rasow"/>
<ownedParameter xmi:id="_awXV5qjQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>
</ownedOperation>
<ownedOperation xmi:id="_awXV56jQEdu4LJng8Rasow" name="subSequence" isQuery="true">
- <ownedParameter xmi:id="_awXV6KjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
+ <ownedParameter xmi:id="_awXV6KjQEdu4LJng8Rasow" type="_awXVuKjQEdu4LJng8Rasow" direction="return"/>
<ownedParameter xmi:id="_awXV6ajQEdu4LJng8Rasow" name="lower" type="_alYNtqjQEdu4LJng8Rasow"/>
<ownedParameter xmi:id="_awXV6qjQEdu4LJng8Rasow" name="upper" type="_alYNtqjQEdu4LJng8Rasow"/>
</ownedOperation>
@@ -1611,11 +1611,11 @@
<ownedParameter xmi:id="_awXV8KjQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>
</ownedOperation>
<ownedOperation xmi:id="_awXV8ajQEdu4LJng8Rasow" name="including" isQuery="true">
- <ownedParameter xmi:id="_awXV8qjQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
+ <ownedParameter xmi:id="_awXV8qjQEdu4LJng8Rasow" type="_awXVuKjQEdu4LJng8Rasow" direction="return"/>
<ownedParameter xmi:id="_awXV86jQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>
</ownedOperation>
<ownedOperation xmi:id="_awXV9KjQEdu4LJng8Rasow" name="excluding" isQuery="true">
- <ownedParameter xmi:id="_awXV9ajQEdu4LJng8Rasow" type="_ak_zNKjQEdu4LJng8Rasow" direction="return"/>
+ <ownedParameter xmi:id="_awXV9ajQEdu4LJng8Rasow" type="_awXVuKjQEdu4LJng8Rasow" direction="return"/>
<ownedParameter xmi:id="_awXV9qjQEdu4LJng8Rasow" name="object" type="_awji1ajQEdu4LJng8Rasow"/>
</ownedOperation>
<ownedOperation xmi:id="_awXV96jQEdu4LJng8Rasow" name="first" isQuery="true">
diff --git a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java
index 787c313..3401659 100644
--- a/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java
+++ b/plugins/org.eclipse.ocl/src/org/eclipse/ocl/util/OCLStandardLibraryUtil.java
@@ -2183,23 +2183,23 @@
NOT_EQUAL_NAME, stdlib.getSequence(), "s")); //$NON-NLS-1$
result.add(createBinaryOperation(uml, stdlib.getSequence(), UNION_NAME,
stdlib.getSequence(), "s")); //$NON-NLS-1$
- result.add(createBinaryOperation(uml, stdlib.getBoolean(), APPEND_NAME,
+ result.add(createBinaryOperation(uml, stdlib.getSequence(), APPEND_NAME,
stdlib.getT(), "object"));//$NON-NLS-1$
- result.add(createBinaryOperation(uml, stdlib.getBoolean(),
+ result.add(createBinaryOperation(uml, stdlib.getSequence(),
PREPEND_NAME, stdlib.getT(), "object"));//$NON-NLS-1$
- result.add(createTernaryOperation(uml, stdlib.getBoolean(),
+ result.add(createTernaryOperation(uml, stdlib.getSequence(),
INSERT_AT_NAME, stdlib.getInteger(), "index", //$NON-NLS-1$
stdlib.getT(), "object"));//$NON-NLS-1$
- result.add(createTernaryOperation(uml, stdlib.getBoolean(),
+ result.add(createTernaryOperation(uml, stdlib.getSequence(),
SUB_SEQUENCE_NAME, stdlib.getInteger(), "lower", //$NON-NLS-1$
stdlib.getInteger(), "upper"));//$NON-NLS-1$
result.add(createBinaryOperation(uml, stdlib.getT(), AT_NAME, stdlib
.getInteger(), "index")); //$NON-NLS-1$
result.add(createBinaryOperation(uml, stdlib.getInteger(),
INDEX_OF_NAME, stdlib.getT(), "object"));//$NON-NLS-1$
- result.add(createBinaryOperation(uml, stdlib.getBoolean(),
+ result.add(createBinaryOperation(uml, stdlib.getSequence(),
INCLUDING_NAME, stdlib.getT(), "object"));//$NON-NLS-1$
- result.add(createBinaryOperation(uml, stdlib.getBoolean(),
+ result.add(createBinaryOperation(uml, stdlib.getSequence(),
EXCLUDING_NAME, stdlib.getT(), "object"));//$NON-NLS-1$
result.add(createUnaryOperation(uml, stdlib.getT(), FIRST_NAME));
result.add(createUnaryOperation(uml, stdlib.getT(), LAST_NAME));
