Updates for V2.3

Author: kevinlano

BasicExpression.java

@@ -3632,9 +3632,9 @@ else if (objectRef.type != null &&
       { context.add(0,objectRef.type.getEntity(entities)); }
       else 
       { System.err.println("! Warning: Cannot locate class of " + objectRef); 
-        JOptionPane.showMessageDialog(null, 
+        /* JOptionPane.showMessageDialog(null, 
            "Warning!: Cannot locate class of " + objectRef, 
-           "Semantic error", JOptionPane.ERROR_MESSAGE);
+           "Semantic error", JOptionPane.ERROR_MESSAGE); */ 
       } 
     }
     else // objectRef == null
@@ -5427,8 +5427,8 @@ else if (objectRef.type != null && objectRef.type.isEntity(entities))
 
     if (context.size() == 0)
     { if (entity == null) 
-      { System.out.println(">> No owning class found for " + this);
-        System.out.println();  
+      { // System.out.println(">> No owning class found for " + this);
+        // System.out.println();  
         //  + 
         //         " -- it must be a local variable/parameter");
         // System.out.println(">> Or static feature/global use case"); 
@@ -7894,6 +7894,11 @@ public String queryFormJava7(java.util.Map env, boolean local)
       return cmd; 
     } 
 
+    if (data.equals("OclFile") && arrayIndex != null)
+    { String ind = arrayIndex.queryFormJava7(env,local); 
+      return "OclFile.OclFile_index.get(" + ind + ")"; 
+    } 
+
     if (umlkind == VALUE || umlkind == CONSTANT)
     { if (data.equals("{}") || data.equals("Set{}")) 
       { return "new HashSet<Object>()"; }    // new Set really

CGCondition.java

@@ -224,6 +224,9 @@ public void applyAction(Vector vars, Vector eargs,
     // If vv is ww`mf then evaluate ww`mf, if null then 
     // it is intended as stereotype mf=stereo for ww.
 
+    // _* all stereo 
+    // sets the stereotype for each term in the _* list
+
     if (isSubstitute || isMatches) 
     { return; } 
 
@@ -282,6 +285,29 @@ public void applyAction(Vector vars, Vector eargs,
     String varx = variable; 
     String mffeat = null; 
 
+    if (quantifier.equals("all") && "_*".equals(varx))
+    { // set each term in _* to the stereo 
+
+      int starind = vars.indexOf(varx);
+ 
+      if (starind >= 0)
+      { Object obj = eargs.get(starind); 
+        if (obj instanceof Vector) 
+        { Vector termlist = (Vector) obj; 
+          for (int p = 0; p < termlist.size(); p++) 
+          { if (termlist.get(p) instanceof ASTTerm)
+            { ASTTerm trm = (ASTTerm) termlist.get(p); 
+              ASTTerm.setType(trm,stereo);
+              ASTTerm.addStereo(trm,stereo);
+              System.out.println("***>> Applying action _* all " + stereo + " to: " + trm); 
+            }
+          }
+        }  
+      }
+      return;  
+    }
+
+
     Vector metafs = CGRule.metafeatures(variable); 
 
     // System.out.println("***>> Action metafeatures of " + variable + " are: " + metafs); 

Compiler2.java

@@ -2086,6 +2086,7 @@ public static Vector parse_rule_actions(String str)
   { // _i v
     // _i not v
     // e / x
+    // _* all v
 
     Vector conds = new Vector();
     Compiler2 newc = new Compiler2(); 
@@ -2106,6 +2107,13 @@ public static Vector parse_rule_actions(String str)
         expectVar = true; 
         expectStereo = false; 
       } 
+      else if (se.equals("_") && i + 1 < lexs.size() && 
+               "*".equals(lexs.get(i+1) + ""))
+      { cg.setVariable("_*"); 
+        i++; 
+        expectVar = false; 
+        expectStereo = true;
+      } 
       else if (se.equals("not"))
       { cg.setNegative();
         expectVar = false; 
@@ -2116,6 +2124,11 @@ else if (se.equals("/"))
         expectVar = false; 
         expectStereo = true;
       } 
+      else if (se.equals("all"))
+      { cg.setUniversal(); 
+        expectVar = false; 
+        expectStereo = true;
+      } 
       else if (se.equals("`") && 
                i + 1 < lexs.size())
       { String mt = "" + lexs.get(i+1); 
@@ -2136,7 +2149,7 @@ else if (expectStereo)
         expectStereo = false; 
       } 
 
-      System.out.println(se + " " + expectVar + " " + expectStereo + " " + cg); 
+      // System.out.println(se + " " + expectVar + " " + expectStereo + " " + cg); 
     }
 
     conds.add(cg); 

UCDArea.java

@@ -11,9 +11,9 @@
 /*
  * Classname : UCDArea
  * 
- * Version information : 2.2
+ * Version information : 2.3
  *
- * Date :  January 2023
+ * Date :  December 2023
  * 
  * Description: This class describes the area that all the painting for 
  * the CD diagram will be performed and deals with painting them

UmlTool.java

@@ -10,9 +10,9 @@
 /* 
  * Classname : UmlTool
  * 
- * Version information : 2.2
+ * Version information : 2.3
  *
- * Date : January 2023
+ * Date : December 2023
  * 
  * Description : This describes the GUI interface of 
  * the UML RSDS tool,
@@ -4327,7 +4327,7 @@ public static void main(String[] args)
       return; 
     } 
 
-    window.setTitle("Agile UML Toolset, Eclipse Incubation Project Version 2.2");
+    window.setTitle("AgileUML Toolset, Eclipse Incubation Project Version 2.3");
     window.setControllerName("Controller"); 
     window.setSize(500, 400);
     window.setVisible(true);