Merge pull request #48 from xtuml/lps-kafka5

fix merge conflict in BasicType
xtuml · Apr 16, 2024 · 96948e3 · 96948e3
2 parents 40fc4d9 + bdda7d6
commit 96948e3
Showing 1 changed file with 11 additions and 13 deletions.
diff --git a/core-java/src/main/java/org/xtuml/masl/metamodelImpl/type/BasicType.java b/core-java/src/main/java/org/xtuml/masl/metamodelImpl/type/BasicType.java
@@ -104,27 +104,25 @@ public final boolean isAssignableFrom(final Expression rhs, final boolean allowS
         return isAssignableFrom(rhs,allowSeqPromote,true);
     }
 
-
     public final boolean isAssignableFrom(final Expression rhs, final boolean allowSeqPromote, boolean allowRelaxed) {
         return isAssignableFrom(rhs.resolve(this, allowSeqPromote).getType(),allowRelaxed);
     }
 
-    @Override
-    public final boolean isAssignableFrom(final org.xtuml.masl.metamodel.type.BasicType type) {
-        if (type instanceof org.xtuml.masl.metamodel.type.BasicType) {
-            final BasicType rhs = (BasicType) type;
-            if (isAnonymousType() || rhs.isAnonymousType()) {
-                return getPrimitiveType().isAssignableFromInner(rhs.getPrimitiveType());
-            } else {
-                return isAssignableFromInner(rhs);
-            }
+    public final boolean isAssignableFrom(final BasicType rhs, boolean allowRelaxed) {
+        if (isAnonymousType() || rhs.isAnonymousType()) {
+            return getPrimitiveType().isAssignableFromInner(rhs.getPrimitiveType(), allowRelaxed);
         } else {
-            return false;
+            return isAssignableFromInner(rhs,allowRelaxed);
         }
     }
 
-    public final boolean isAssignableFrom(final BasicType rhs) {
-        return isAssignableFrom(rhs,true);
+    @Override
+    public final boolean isAssignableFrom(final org.xtuml.masl.metamodel.type.BasicType rhs) {
+        if (rhs instanceof BasicType) {
+            return isAssignableFrom((BasicType) rhs,true);
+        } else {
+            return false;
+        }
     }
 
     private final boolean isAssignableFromInner(final BasicType rhs, boolean allowRelaxed) {