Updates for Version 2.0 beta

kevinlano · web-flow · commit 2bd33c9157e1 · 2020-10-27T16:20:41.000Z
diff --git a/Attribute.java b/Attribute.java
@@ -1027,14 +1027,20 @@ public void saveEMF(PrintWriter out)
 
   public void saveKM3(PrintWriter out)
   { if (isStatic())
-    { out.println("    static attribute " + getName() + " : " + getType() + ";"); } 
-    out.println("    attribute " + getName() + " : " + getType() + ";");
+    { out.println("    static attribute " + getName() + " : " + getType() + ";"); }
+    else if (isIdentity())
+    { out.println("    attribute " + getName() + " identity : " + getType() + ";"); } 
+    else  
+    { out.println("    attribute " + getName() + " : " + getType() + ";"); } 
   } 
 
   public String getKM3()
   { if (isStatic())
     { return "    static attribute " + getName() + " : " + getType() + ";"; } 
-    return "    attribute " + getName() + " : " + getType() + ";"; 
+    else if (isIdentity())
+    { return "    attribute " + getName() + " identity : " + getType() + ";"; }
+    else  
+    { return "    attribute " + getName() + " : " + getType() + ";"; } 
   } 
 
   public void saveEcore(PrintWriter out)
@@ -3516,6 +3522,19 @@ public String getHtmlGen()
   public String getFormInput()
   { String nme = getName();
     String label = nme; 
+    String res = ""; 
+
+    if (type != null && type.isEnumerated())
+    { Vector vals = type.getValues(); 
+      res = "<p><strong>" + label + "</strong>\n" + 
+            "<select name=\"" + nme + "\">\n"; 
+      for (int i = 0; i < vals.size(); i++) 
+      { String val = (String) vals.get(i); 
+        res = res + "  <option value=\"" + val + "\">" + val + "</option>\n"; 
+      } 
+      res = res + "</select>\n"; 
+      return res; 
+    } 
 
     if (type != null && type.isEntity())
     { Entity etype = type.getEntity(); 
@@ -3524,7 +3543,7 @@ public String getFormInput()
       { label = nme + " (" + pk.getName() + ")"; } 
     } 
 
-    String res = 
+    res = 
       "<p><strong>" + label + "</strong>\n" +
       "<input type = \"text\" name = \"" + nme + "\"/></p>\n";
     return res;
diff --git a/Compiler2.java b/Compiler2.java
@@ -3767,7 +3767,7 @@ else if ("\"".equals(ss) && instring)
 
 
 
-  public Vector parseKM3(Vector entities, Vector types, Vector gens, Vector pasts)
+  public Vector parseKM3(Vector entities, Vector types, Vector gens, Vector pasts, Vector pnames)
   { Vector res = new Vector(); 
     int en = lexicals.size()-1; 
     
@@ -3787,13 +3787,13 @@ public Vector parseKM3(Vector entities, Vector types, Vector gens, Vector pasts)
     { String lex = lexicals.get(i) + "";
       if ("package".equals(lex))
       { // parse contents of previous package: 
-        Vector resp = parseKM3package(prevstart,i-1,entities,types,gens,pasts); 
+        Vector resp = parseKM3package(prevstart,i-1,entities,types,gens,pasts,pnames); 
         res.addAll(resp); 
         prevstart = i; 
       } 
     } 
        
-    Vector resp = parseKM3package(prevstart,en-1,entities,types,gens,pasts); 
+    Vector resp = parseKM3package(prevstart,en-1,entities,types,gens,pasts,pnames); 
     res.addAll(resp); 
     return res; 
   } 
@@ -3806,12 +3806,13 @@ public UseCase parseKM3UseCase(Vector entities, Vector types,
 
 
   public Vector parseKM3package(int st, int en, 
-                                Vector entities, Vector types, Vector gens, Vector pasts)
+                                Vector entities, Vector types, Vector gens, Vector pasts, Vector pnames)
   { Vector res = new Vector(); 
     if ("package".equals(lexicals.get(st) + "") && 
         "{".equals(lexicals.get(st+2) + ""))
     { String pname = lexicals.get(st+1) + ""; 
       System.out.println(">> Parsing package " + pname); 
+      pnames.add(pname); 
 
       for (int i = st+3; i < en;  i++) 
       { String lx = lexicals.get(i) + ""; 
diff --git a/Entity.java b/Entity.java
@@ -11222,9 +11222,9 @@ guard sqlite3_step(insertStatement) == SQLITE_DONE
 }
  
   public String generateBean(Vector useCases, Vector cons, Vector entities,
-                             Vector types)
+                             Vector types, String appName)
   { String ename = getName(); 
-    String res = "package beans;\n\n" + 
+    String res = "package " + appName + ";\n\n" + 
       "import java.util.*;\n" + 
       "import java.sql.*;\n\n" + 
       "public class " + ename + "Bean\n{ Dbi dbi = new Dbi();\n"; 
@@ -11348,6 +11348,134 @@ else if (tname.equals("double"))
     return res + "}\n"; 
   }
 
+  public String generateJSPBean(String packageName, Vector useCases, 
+      Vector cons, Vector entities, Vector types, CGSpec cgs)
+  { String ename = getName(); 
+    String res = "package " + packageName + ";\n\n" + 
+      "import java.util.Vector;\n" + 
+	  "import java.util.List;\n" + 
+	  "import java.util.Iterator;\n\n" + 
+	  
+      "public class " + ename + "Bean\n{ ModelFacade model;\n"; 
+    for (int i = 0; i < attributes.size(); i++) 
+    { Attribute att = (Attribute) attributes.get(i); 
+      String attnme = att.getName(); 
+	  Type atttype = att.getType(); 
+      String tname = atttype.getName(); 
+      res = res + "  private String " + attnme + " = \"\";\n";
+      if (tname.equals("int") || tname.equals("long"))
+      { res = res + "  private int i" + attnme + " = 0;\n"; } 
+      else if (tname.equals("double"))
+      { res = res + "  private double d" + attnme + " = 0;\n"; } 
+	  else if (att.isEnumeration())
+	  { Vector vals = atttype.getValues(); 
+	    res = res + "  private " + tname + " e" + attnme + " = " + tname + "." + vals.get(0) + ";\n"; 
+	  }
+      // booleans are treated as strings. 
+    } 
+    res = res + "  private Vector errors = new Vector();\n\n" +
+          "  public " + ename + "Bean()\n" + 
+          "  { model = ModelFacade.getInstance(); }\n\n"; 
+    for (int i = 0; i < attributes.size(); i++) 
+    { Attribute att = (Attribute) attributes.get(i); 
+      String attnme = att.getName(); 
+      res = res + "  public void set" + attnme + "(String " + attnme + "x)\n  { " + 
+            attnme + " = " + attnme + "x; }\n\n"; 
+    } 
+
+    res = res + "  public void resetData()\n  { "; 
+    for (int i = 0; i < attributes.size(); i++) 
+    { Attribute att = (Attribute) attributes.get(i); 
+      String attname = att.getName(); 
+      res = res + attname + " = \"\";\n    "; 
+    } 
+    res = res + "}\n\n";     
+
+    for (int j = 0; j < useCases.size(); j++)
+    { if (!(useCases.get(j) instanceof OperationDescription)) { continue; } 
+
+      OperationDescription od = (OperationDescription) useCases.get(j); 
+      if (this != od.getEntity()) { continue; } 
+
+      Vector pars = od.getParameters(); 
+      String odname = od.getODName(); 
+      String action = od.getStereotype(0); 
+      // build op that checks if parameters are correct, and does data conversions:
+      res = res + "  public boolean is" + odname + "error()\n" + 
+            "  { errors.clear(); \n"; 
+      for (int k = 0; k < pars.size(); k++) 
+      { Attribute att = (Attribute) pars.get(k); 
+        String check = att.getBeanCheckCode(); 
+        res = res + check; 
+      }
+	   
+      if (action.equals("create") || action.equals("edit") || action.equals("set"))
+      { Vector tests = getInvariantCheckTests(types,entities,pars,cgs); 
+        for (int p = 0; p < tests.size(); p++)
+        { String test = (String) tests.get(p); 
+          res = res + 
+                "    if (" + test + ") { }\n" + 
+                "    else { errors.add(\"" + ename + " constraint " + (p+1) + " failed\"); }\n";
+        }
+      }
+      res = res + "    return errors.size() > 0; }\n\n";
+    }
+
+    res = res + "  public String errors() { return errors.toString(); }\n\n"; 
+
+    for (int j = 0; j < useCases.size(); j++)
+    { if (!(useCases.get(j) instanceof OperationDescription)) { continue; } 
+      OperationDescription od = (OperationDescription) useCases.get(j); 
+      // and is responsibility of this bean
+      if (this != od.getEntity()) { continue; } 
+
+      Vector pars = od.getParameters(); 
+      String odname = od.getODName(); 
+      String action = od.getStereotype(0); 
+      String dbiop = od.getAndroidModelOpCall(); 
+      Vector correc = new Vector(); 
+
+      if (action.equals("create") || action.equals("delete") || 
+          action.equals("add") || action.equals("remove") ||
+          action.equals("edit") || action.equals("set"))
+      { res = res + "  public void " + odname + "()\n" +  "  { "; 
+        res = res + dbiop + "\n    ";  
+        /* if (action.equals("set"))
+        { Attribute att = (Attribute) pars.get(0); 
+          Vector allinvs = new Vector();
+          allinvs.addAll(invariants); 
+          allinvs.addAll(cons); 
+
+          correc = att.sqlSetOperations(this,allinvs,entities,types); 
+          res = res + odname + "(" + att.getBeanForm() + 
+                               ", i" + ename.toLowerCase() + "Id);\n  ";
+        } */ 
+        res = res + "resetData(); }\n\n";
+
+        /* if (correc.size() > 0)
+        { res = res + correc.get(0) + "\n\n"; 
+          correc.remove(0); 
+          od.addDbiMaintainOps(correc); 
+        } */ 
+      }   // for set, correcting code goes here as well. 
+      else 
+      { Entity ent2 = this; 
+
+        if (action.equals("get"))
+        { String role = od.getStereotype(1); 
+          Association ast = getRole(role); 
+          if (ast != null)
+          { ent2 = ast.getEntity2(); }
+        }
+
+        res = res + "  public Iterator " + odname + "()\n" +  "  { "; 
+        res = res + "List<" + ename + "VO> rs = " + dbiop + "\n" +
+              "   return rs.iterator();\n  }\n"; 
+      }  // for getrole it is the TARGET entities fields
+    }
+    return res + "}\n"; 
+  }
+
   public String generateAndroidBean(String packageName, Vector useCases, 
       Vector cons, Vector entities, Vector types, CGSpec cgs)
   { String ename = getName(); 
diff --git a/KM3Editor.java b/KM3Editor.java
@@ -465,9 +465,12 @@ public void actionPerformed(ActionEvent e)
       Vector typs = new Vector(); 
       Vector pregens = new Vector(); 
       Vector preassocs = new Vector(); 
+	  Vector pnames = new Vector(); 
 
-      Vector items = comp.parseKM3(ents,typs,pregens,preassocs);
+      Vector items = comp.parseKM3(ents,typs,pregens,preassocs,pnames);
       classArea.processKM3(ents,typs,pregens,preassocs,items); 
+	  if (pnames.size() > 0) 
+	  { classArea.setSystemName((String) pnames.get(0)); }
 
       File file = new File("output/mm.km3");  /* default */ 
       try
diff --git a/OperationDescription.java b/OperationDescription.java
@@ -752,11 +752,11 @@ public String getServletCode()
     return res;
   }
 
-  public String jspUpdateDeclarations(String ename)
+  public String jspUpdateDeclarations(String ename, String appName)
   { String bean = ename.toLowerCase();
-    String beanclass = "beans." + ename + "Bean";
+    String beanclass = appName + "." + ename + "Bean";
     return "<jsp:useBean id=\"" + bean +
-           "\" scope=\"session\" \n " + 
+           "\" scope=\"request\" \n " + 
            "class=\"" + beanclass + "\"/>";
   }
 
@@ -775,9 +775,9 @@ public String jspParamTransfers(String ename, Vector atts)
   }
 
   
-  public String jspUpdateText(String op, String ename, Vector atts)
+  public String jspUpdateText(String op, String ename, Vector atts, String appName)
   { String bean = ename.toLowerCase();
-    String dec = jspUpdateDeclarations(ename);
+    String dec = jspUpdateDeclarations(ename,appName);
     String sets = jspParamTransfers(ename, atts);
     String res = dec + "\n\r" + sets + "\n\r" +
       "<html>\n\r" +
@@ -792,26 +792,26 @@ public String jspUpdateText(String op, String ename, Vector atts)
       "<h2>" + op + " performed</h2>\n\r" +
       "<% } %>\n\r\n\r" +
       "<hr>\n\r\n\r" +
-      "<%@ include file=\"commands.html\" %>\n\r" +
+      "<%@ include file=\"index.html\" %>\n\r" +
       "</body>\n\r</html>\n\r";
     return res;
   }
 
-  public String jspQueryDeclarations(String ename)
+  public String jspQueryDeclarations(String ename, String appName)
   { String bean = ename.toLowerCase();
-    String beanclass = "beans." + ename + "Bean";
+    String beanclass = appName + "." + ename + "Bean";
     String res = "<%@ page import = \"java.util.*\" %>\n\r" +
-      "<%@ page import = \"beans.*\" %>\n\r" +
+      "<%@ page import = \"" + appName + ".*\" %>\n\r" +
       "<jsp:useBean id=\"" + bean +
-           "\" scope=\"session\" \n\r " + 
+           "\" scope=\"request\" \n\r " + 
            "class=\"" + beanclass + "\"/>";
       return res;
   }
 
   public String jspQueryText(String op,
-                             String ename, Vector atts, Entity ent)
+                             String ename, Vector atts, Entity ent, String appName)
   { String bean = ename.toLowerCase();
-    String dec = jspQueryDeclarations(ename);
+    String dec = jspQueryDeclarations(ename,appName);
     String sets = jspParamTransfers(ename, atts);
     Entity ent2 = ent; 
     String action = getStereotype(0); 
@@ -838,21 +838,21 @@ public String jspQueryText(String op,
       e2name + "VO) " + bean + "s.next(); %>\n\r" +
       ent2.getTableRow() + "\n\r" +
       "<% } %>\n\r</table>\n\r\n\r<hr>\n\r\n\r" +
-      "<%@ include file=\"commands.html\" %>\n\r" +
+      "<%@ include file=\"index.html\" %>\n\r" +
       "</body>\n\r</html>\n\r";
     return res;
   }
 
-  public String getJsp()
+  public String getJsp(String appName)
   { String action = getODName();
     String op = getStereotype(0);
     String ename = entity.getName();
     Vector pars = getParameters();
     if (op.equals("create") || op.equals("delete") ||
         op.equals("edit") || op.equals("add") ||
         op.equals("set") || op.equals("remove"))
-    { return jspUpdateText(action,ename,pars); }
-    return jspQueryText(action,ename,pars,entity);
+    { return jspUpdateText(action,ename,pars,appName); }
+    return jspQueryText(action,ename,pars,entity,appName);
   }
 
   public String getRESTJsp(String appname)
@@ -960,8 +960,8 @@ public String jspRESTParamTransfers(Vector atts)
   }
 
 
-  public String getInputPage()
-  { String codebase = "http://127.0.0.1:8080/servlets/";
+  public String getInputPage(String appName)
+  { String codebase = "http://127.0.0.1:8080/examples/jsp/" + appName + "/";
     String op = getODName();
     String action = getStereotype(0);
     String jsp = codebase + op + ".jsp";
@@ -986,7 +986,7 @@ public String getInputPage()
     return res;
   }
 
-  public String getInputPage(String appname)
+ /*  public String getInputPage(String appname)
   { String codebase = "http://127.0.0.1:8080/" + appname + "/servlets/";
     String op = getODName();
     String action = getStereotype(0);
@@ -1011,7 +1011,7 @@ public String getInputPage(String appname)
     res = res + "<input type=\"submit\" value = \"" + 
           op + "\"/>\n\r</form>\n\r</body>\n\r</html>";
     return res;
-  }
+  } */ 
 
   public String getGenerationClass()
   { String nme = getName();
diff --git a/UCDArea.java b/UCDArea.java
diff --git a/UseCase.java b/UseCase.java
