#457: added UTs for Operand methods and filled in some gaps in type conversion functionality; fixed bug in Java method execution re: instance object handling vs first parameter in VeLa function; unrelated but added uppercase options for special keystroke characters

Author: dbenn

src/org/aavso/tools/vstar/ui/vela/VeLaDialog.java

@@ -182,22 +182,27 @@ public void keyTyped(KeyEvent e) {
                 if (escapeMode) {
                     switch (ch) {
                     case 'b':
+                    case 'B':
                         // Boolean set
                         newCh = "\uD835\uDD39";
                         break;
                     case 'l':
+                    case 'L':
                         // lambda
                         newCh = "\u03BB";
                         break;
                     case 'p':
+                    case 'P':
                         // pi
                         newCh = "\u03C0";
                         break;
                     case 'r':
+                    case 'R':
                         // real number set
                         newCh = "\u211D";
                         break;
                     case 'z':
+                    case 'Z':
                         // integer number set
                         newCh = "\u2124";
                         break;
@@ -266,6 +271,8 @@ private void execute() {
                 output += result.get().toHumanReadableString();
             }
         } catch (Exception e) {
+            // e.printStackTrace();
+
             // Show error in text area.
             String msg = e.getLocalizedMessage();
             if (msg != null) {

src/org/aavso/tools/vstar/vela/JavaMethodExecutor.java

@@ -17,7 +17,6 @@
  */
 package org.aavso.tools.vstar.vela;
 
-import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
 import java.util.ArrayList;
@@ -76,7 +75,8 @@ private Optional<Operand> invokeJavaMethod(Method method, List<Operand> operands
                 // For non-static methods, if instance is null, assume the first
                 // operand is an object instance.
                 if (instance == null) {
-                    obj = operands.get(0).toObject(method.getClass());
+                    Operand op = operands.get(0);
+                    obj = operands.get(0).toObject(Type.vela2Java(op.getType()));
                     operands.remove(0);
                 } else {
                     // ...otherwise, use what's been passed in.