Updated web/Android app generators

Author: kevinlano

AndroidAppGenerator.java

@@ -357,6 +357,9 @@ public boolean isManyOne()  // either way round
   public boolean isOneMany()
   { return card1 == ONE && card2 == MANY; } 
 
+  public boolean isZeroOneMany()
+  { return card1 == ZEROONE && card2 == MANY; } 
+
   public boolean isZeroOne()
   { return card2 == ZEROONE; } 
 
@@ -9778,7 +9781,7 @@ public String ejbBeanGet()
     String fl = role2.substring(0,1);
     String rem = role2.substring(1,role2.length());
     res = res + fl.toUpperCase() +
-          rem + "();\n";
+          rem + "();\n\n";
     return res;
   }
 
@@ -9792,7 +9795,15 @@ public String ejbBeanSet()
     { res = res + "Collection"; }
     else 
     { res = res + entity2.getName(); }
-    res = res + " x);\n";
+    res = res + " x);\n\n";
+
+    if (card2 == MANY)
+    { res = res + "  public abstract void add" + role2 + 
+                  "(" + entity2.getName() + " x);\n\n"; 
+      res = res + "  public abstract void remove" + role2 + 
+                  "(" + entity2.getName() + " x);\n\n"; 
+    } 
+
     return res;
   }
 

Association.java

@@ -7997,8 +7997,8 @@ else if (isCollection())
   { res2 = "  <EditText\n\r" +
     "    android:id=\"@+id/" + attfield + "\"\n" +
     "    android:inputType=\"text|textMultiLine\"\n" +
-	"    android:minLines=\"5\"\n" + 
-	"    android:gravity=\"top\"\n" +   
+    "    android:minLines=\"5\"\n" + 
+    "    android:gravity=\"top\"\n" +   
     "    android:layout_span=\"4\" />\n\r"; }
   else  
   { res2 = "  <EditText\n\r" +

Attribute.java

@@ -1590,6 +1590,11 @@ public Expression invert()
   public void findClones(java.util.Map clones, String rule, String op)
   { return; } 
 
+  public void findClones(java.util.Map clones, 
+                         java.util.Map cloneDefs, 
+                         String rule, String op)
+  { return; } 
+
   public void findMagicNumbers(java.util.Map mgns, String rule, String op)
   { if (umlkind == VALUE)
     { if ("0".equals(data) || "1".equals(data) || 

BasicExpression.java

@@ -3698,6 +3698,24 @@ else if (useCase != null)
     { activity.findClones(clones, null, nme); } 
   } 
 
+  public void findClones(java.util.Map clones, 
+                         java.util.Map cloneDefinitions)
+  { String nme = getName(); 
+    if (entity != null) 
+    { nme = entity.getName() + "::" + nme; } 
+    else if (useCase != null) 
+    { nme = useCase.getName() + "::" + nme; } 
+
+    if (pre != null) 
+    { pre.findClones(clones, cloneDefinitions, null, nme); } 
+    if (post != null) 
+    { post.findClones(clones, cloneDefinitions, null, nme); } 
+    if (activity != null) 
+    { activity.findClones(clones, cloneDefinitions, 
+                          null, nme); 
+    } 
+  } 
+
   public void findMagicNumbers(java.util.Map mgns)
   { String nme = getName(); 
     if (entity != null) 

BehaviouralFeature.java

@@ -2926,7 +2926,12 @@ public Vector allValuesUsedIn()
   } // ->iterate, add accumulator expression
 
 public void findClones(java.util.Map clones, String rule, String op)
-{ if (this.syntacticComplexity() < UCDArea.CLONE_LIMIT) 
+{ /* System.out.println(">>> complexity of " + this + " = " + 
+                     this.syntacticComplexity()); 
+  System.out.println(">>> Clone limit = " + 
+                     UCDArea.CLONE_LIMIT); */ 
+
+  if (this.syntacticComplexity() < UCDArea.CLONE_LIMIT) 
   { return; }
   String val = this + ""; 
   Vector used = (Vector) clones.get(val);
@@ -2941,6 +2946,30 @@ else if (op != null)
   right.findClones(clones,rule,op);
 }
 
+public void findClones(java.util.Map clones, 
+                       java.util.Map cloneDefs,
+                       String rule, String op)
+{ /* System.out.println(">>> complexity of " + this + " = " + 
+                     this.syntacticComplexity()); 
+  System.out.println(">>> Clone limit = " + 
+                     UCDArea.CLONE_LIMIT); */ 
+
+  if (this.syntacticComplexity() < UCDArea.CLONE_LIMIT) 
+  { return; }
+  String val = this + ""; 
+  Vector used = (Vector) clones.get(val);
+  if (used == null)
+  { used = new Vector(); }
+  if (rule != null)
+  { used.add(rule); }
+  else if (op != null)
+  { used.add(op); }
+  clones.put(val,used);
+  cloneDefs.put(val, this); 
+  left.findClones(clones,cloneDefs,rule,op);
+  right.findClones(clones,cloneDefs,rule,op);
+}
+
   public void findMagicNumbers(java.util.Map mgns, String rule, String op)
   { left.findMagicNumbers(mgns,rule,op);
     right.findMagicNumbers(mgns,rule,op);

BinaryExpression.java

@@ -5389,6 +5389,16 @@ public static String isKeywordOrPart(String st, String[] mess)
         return "arg->prd()"; 
       }
 
+      if ("->pow".startsWith(st))
+      { mess[0] = "Power operator on numbers"; 
+        return "arg->pow(exponent)"; 
+      }
+
+      if ("->gcd".startsWith(st))
+      { mess[0] = "GCD operator on integers"; 
+        return "arg->gcd(arg2)"; 
+      }
+
       if ("->display".startsWith(st))
       { mess[0] = "Display operator on strings"; 
         return "arg->display()"; 
@@ -5571,7 +5581,8 @@ public static String isKeywordOrPart(String st, String[] mess)
           "OclRandom".startsWith(st) || 
           "OclFile".startsWith(st) || 
           "OclException".startsWith(st) ||
-          "OclIterator".startsWith(st))
+          "OclIterator".startsWith(st) ||
+          "OclDatasource".startsWith(st))
       { mess[0] = "OclAny -- universal type.\n" + 
                   "OclType -- metatype of types. Requires ocltype.km3 library\n" + 
                   "OclAttribute -- metatype of fields. Requires ocltype.km3 library\n" + 
@@ -5580,7 +5591,8 @@ public static String isKeywordOrPart(String st, String[] mess)
                   "OclRandom -- random number generator. Needs oclrandom.km3\n" + 
                   "OclFile -- type of files. Needs oclfile.km3\n" + 
                   "OclIterator -- type of iterators. Needs ocliterator.km3\n" + 
-                  "OclException -- type of exceptions. Needs oclexception.km3\n"; 
+                  "OclException -- type of exceptions. Needs oclexception.km3\n" +  
+                  "OclDatasource -- type of relational databases and remote datasources.\n  Needs ocldatasource.km3, oclfile.km3, ocliterator.km3, ocldate.km3\n"; 
         return "Ocl library type"; 
       } 
     } 

Compiler2.java

@@ -168,6 +168,26 @@ else if (op != null)
   elseExp.findClones(clones,rule,op);
 }
 
+public void findClones(java.util.Map clones,
+                       java.util.Map cloneDefs,
+                       String rule, String op)
+{ if (this.syntacticComplexity() < UCDArea.CLONE_LIMIT) 
+  { return; }
+  String val = this + ""; 
+  Vector used = (Vector) clones.get(val);
+  if (used == null)
+  { used = new Vector(); }
+  if (rule != null)
+  { used.add(rule); }
+  else if (op != null)
+  { used.add(op); }
+  clones.put(val,used);
+  cloneDefs.put(val, this); 
+  test.findClones(clones,cloneDefs, rule,op); 
+  ifExp.findClones(clones,cloneDefs, rule,op);
+  elseExp.findClones(clones,cloneDefs, rule,op);
+}
+
   public void findMagicNumbers(java.util.Map mgns, String rule, String op)
   { test.findMagicNumbers(mgns,rule,op);
     ifExp.findMagicNumbers(mgns,rule,op);