| commit | 4181df3e9f5bea45c7afe65fd782dc8ec5f7a0e0 | [log] [tgz] |
|---|---|---|
| author | Ed Willink <ed@willink.me.uk> | Thu Oct 23 16:08:29 2014 +0100 |
| committer | Ed Willink <ed@willink.me.uk> | Sat Oct 25 18:00:04 2014 +0100 |
| tree | ee9f1a695658d3e0fd742e34787aa2c08cc0195c | |
| parent | a386438637581c0b0391cb7b55f89def8f8bd13e [diff] |
[448470] WIP on EnumerationLiteralId is OCLValue
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/EnumerationLiteralId.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/EnumerationLiteralId.java index c0648ce..35bb2c2 100644 --- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/EnumerationLiteralId.java +++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/EnumerationLiteralId.java
@@ -11,11 +11,12 @@ package org.eclipse.ocl.examples.domain.ids; import org.eclipse.jdt.annotation.NonNull; +import org.eclipse.ocl.examples.domain.values.OCLValue; /** * A EnumerationLiteralId provides a unique hierarchical identifier for an enumeration literal. */ -public interface EnumerationLiteralId extends ElementId +public interface EnumerationLiteralId extends ElementId, OCLValue { @NonNull String getName(); @NonNull EnumerationId getParentId();
diff --git a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/impl/EnumerationLiteralIdImpl.java b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/impl/EnumerationLiteralIdImpl.java index 4bdcc02..1d2ca7b 100644 --- a/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/impl/EnumerationLiteralIdImpl.java +++ b/examples/org.eclipse.ocl.examples.domain/src/org/eclipse/ocl/examples/domain/ids/impl/EnumerationLiteralIdImpl.java
@@ -16,6 +16,7 @@ import org.eclipse.ocl.examples.domain.ids.EnumerationLiteralId; import org.eclipse.ocl.examples.domain.ids.IdVisitor; import org.eclipse.ocl.examples.domain.ids.TypeId; +import org.eclipse.ocl.examples.domain.values.OCLValue; public class EnumerationLiteralIdImpl extends UnscopedId implements EnumerationLiteralId { @@ -42,4 +43,12 @@ public @NonNull EnumerationId getParentId() { return parentId; } + + public boolean oclEquals(@NonNull OCLValue thatValue) { + return equals(thatValue); + } + + public int oclHashCode() { + return hashCode(); + } } \ No newline at end of file
diff --git a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java index dfa009c..f489947 100644 --- a/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java +++ b/tests/org.eclipse.ocl.examples.xtext.tests/src/org/eclipse/ocl/examples/pivot/tests/UMLValidateTest.java
@@ -375,7 +375,7 @@ ocl.dispose(); } - public void test_umlValidation_Bug447557() throws IOException { // This is org.eclipse.ocl.doc/doc/models/1710-m1.uml + public void test_umlValidation_Bug447557() throws IOException { // UML2Pivot.TYPE_EXTENSIONS.setState(true); // resetRegistries(); CommonOptions.DEFAULT_DELEGATION_MODE.setDefaultValue(OCLDelegateDomain.OCL_DELEGATE_URI_PIVOT);