Updated source files for version 1.9.8

Author: kevinlano

AndroidAppGenerator.java

@@ -0,0 +1,28 @@
+import java.util.Vector; 
+import java.io.*; 
+
+/* Package: Mobile */ 
+/******************************
+* Copyright (c) 2003,2020 Kevin Lano
+* This program and the accompanying materials are made available under the
+* terms of the Eclipse Public License 2.0 which is available at
+* http://www.eclipse.org/legal/epl-2.0
+*
+* SPDX-License-Identifier: EPL-2.0
+* *****************************/
+
+
+public abstract class AppGenerator
+{ 
+
+  public abstract void modelFacade(String packageName, Vector usecases, CGSpec cgs, 
+    Vector entities, Vector clouds, Vector types, 
+    int remoteCalls, boolean needsMaps, PrintWriter out); 
+
+  public abstract void singlePageApp(UseCase uc, String appName, String image, CGSpec cgs, Vector types, Vector entities, PrintWriter out); 
+
+  public abstract void listViewController(Entity e, PrintWriter out); 
+
+  // public static void generateInternetAccessor(String packagename, PrintWriter out); 
+  
+}

AppGenerator.java

@@ -3,7 +3,7 @@
 import java.util.List; 
 
 /******************************
-* Copyright (c) 2003,2019 Kevin Lano
+* Copyright (c) 2003,2020 Kevin Lano
 * This program and the accompanying materials are made available under the
 * terms of the Eclipse Public License 2.0 which is available at
 * http://www.eclipse.org/legal/epl-2.0
@@ -36,13 +36,41 @@ public class Association extends ModelElement
 
   public Association(Entity e1, Entity e2, int c1,
                      int c2, String r1, String r2)
-  { super(e1.getName() + "_" + e2.getName());
+  { super(e1 + "_" + e2);
+    
     entity1 = e1;
     entity2 = e2;
     card1 = c1;
     card2 = c2;
     role1 = r1;
     role2 = r2;
+    if (e1 == null) 
+    { System.err.println("!!! FATAL ERROR: null class at association end 1"); 
+      return; 
+    } 
+    if (e2 == null) 
+    { System.err.println("!!! FATAL ERROR: null class at association end 2"); 
+      return; 
+    } 
+  }
+
+  public Association(Entity e1, Entity e2, String r2)
+  { super(e1 + "_" + e2);
+    
+    entity1 = e1;
+    entity2 = e2;
+    card1 = MANY; 
+    card2 = MANY; 
+    // role1 = r1;
+    role2 = r2;
+    /* if (e1 == null) 
+    { System.err.println("!!! FATAL ERROR: null class at association end 1"); 
+      return; 
+    } 
+    if (e2 == null) 
+    { System.err.println("!!! FATAL ERROR: null class at association end 2"); 
+      return; 
+    } */ 
   }
 
   public Association(Entity e1, Attribute att) 
@@ -294,6 +322,15 @@ public boolean isManyOne()  // either way round
            card1 == ONE && card2 == MANY; 
   }
 
+  public boolean isZeroOne()
+  { return card2 == ZEROONE; } 
+
+  public boolean isOptional()
+  { return card2 == ZEROONE || card2 == MANY; } 
+
+  public boolean isMandatory()
+  { return card2 == ONE || card2 > 1; } 
+
   public boolean isPersistent()
   { return hasStereotype("persistent"); } 
 
@@ -596,13 +633,15 @@ public void generateJava(PrintWriter out)
 
       if (qualifier != null)
       { out.println("java.util.Map " + role2 + " = new java.util.HashMap();"); } 
-      else if (card2 == ONE)
+      else if (card2 == ONE && entity2 != null)
       { out.println(entity2.getName() + " " + role2 + ";"); }
-      else
+      else if (entity2 != null)
       { out.println("List " +
                     role2 + initialiser + "; // of " +
                     entity2.getName());
       }
+	  else 
+	  { out.println("Object " + role2 + "; // Undefined class type"); }
     }
   }  // not valid for a..b a > 0. Should be array then?