Bugs: identitymap for datatype attributes

use-core/src/main/java/org/tzi/use/uml/mm/MAttribute.java

@@ -24,6 +24,8 @@
 
 import com.google.common.base.Optional;
 
+import java.util.Objects;
+
 /**
  * An Attribute is a model element that is part of a classifier.
  *
@@ -73,7 +75,7 @@ public Type type() {
     /**
      * <code>true</code> if a derive expression is specified for
      * this attribute.
-     * @return
+     * @return <code>true</code> if a derive expression is specified for this attribute.
      */
     public boolean isDerived() {
     	return deriveExpression != null;
@@ -141,14 +143,18 @@ public String toString() {
     public boolean equals(Object obj) {
         if (obj == this )
             return true;
-        if (obj instanceof MAttribute ) {
-        	MAttribute other = (MAttribute)obj;
+        if (obj instanceof MAttribute other) {
             return fOwner.equals(other.fOwner) && name().equals(other.name());
         }
 
         return false;
     }
-
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(super.hashCode(), fOwner);
+    }
+
     /**
      * Process this element with visitor.
      */

use-core/src/main/java/org/tzi/use/uml/sys/MDataTypeValueState.java

@@ -47,7 +47,7 @@ public MDataTypeValueState(MDataTypeValue instance) {
 
         List<MAttribute> atts = instance.cls().allAttributes();
         // initialize attribute slots with instance values
-        fAttrSlots = new IdentityHashMap<MAttribute, Value>(atts.size());
+        fAttrSlots = new HashMap<>(atts.size());
 
         for (MAttribute attr : atts) {
             fAttrSlots.put(attr, instance.value().getValues().get(attr.name()));
@@ -58,7 +58,7 @@ public MDataTypeValueState(MDataTypeValue instance) {
      * Copy constructor.
      */
     public MDataTypeValueState(MDataTypeValueState x) {
-        this.fAttrSlots = new IdentityHashMap<MAttribute, Value>(x.fAttrSlots);
+        this.fAttrSlots = new HashMap<>(x.fAttrSlots);
         this.fInstance = x.fInstance;
     }
 

use-core/src/main/resources/examples/Documentation/Imports/Time.use

@@ -6,4 +6,9 @@ dataType Time
     pre: hour >= 0 and hour < 24
     pre: minute >= 0 and minute < 60
     pre: second >= 0 and second < 60
+
+    before(other: Time) : Boolean =
+       self.hour < other.hour implies
+         self.minute < other.minute implies
+           self.second < other.second
 end