Merge pull request #540 from AAVSO/457-operandtoobject-should-call-operandconvert-for-list-elements

457 operandtoobject should call operandconvert for list elements

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,10 +271,14 @@ private void execute() {
                 output += result.get().toHumanReadableString();
             }
         } catch (Exception e) {
+            // e.printStackTrace();
+
             // Show error in text area.
             String msg = e.getLocalizedMessage();
             if (msg != null) {
                 error = msg;
+            } else {
+                error = "Error";
             }
 
             if (msg != null && !msg.equals(errStream.toString())) {

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;
@@ -66,7 +65,7 @@ public Optional<Operand> apply(List<Operand> operands) throws VeLaEvalError {
     }
 
     private Optional<Operand> invokeJavaMethod(Method method, List<Operand> operands, Optional<Type> retType) {
-        Operand result = null;
+        Optional<Operand> retVal = null;
 
         try {
             // obj is null for static methods
@@ -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.
@@ -93,23 +93,21 @@ private Optional<Operand> invokeJavaMethod(Method method, List<Operand> operands
                 paramIndex++;
             }
 
-            result = Operand.object2Operand(retType.get(), method.invoke(obj, objParams));
+            Operand result = Operand.object2Operand(retType.get(), method.invoke(obj, objParams));
 
-            Optional<Operand> retVal = null;
+            retVal = null;
 
             if (result != null) {
                 retVal = Optional.of(result);
             } else {
                 retVal = Optional.of(Operand.NO_VALUE);
             }
 
-            return retVal;
-
-        } catch (InvocationTargetException e) {
-            throw new VeLaEvalError(e.getLocalizedMessage());
-        } catch (IllegalAccessException e) {
-            throw new VeLaEvalError(e.getLocalizedMessage());
+        } catch (Exception e) {
+            throwVeLaEvalError(e);
         }
+
+        return retVal;
     }
 
     @Override
@@ -122,7 +120,7 @@ protected String getParametersString() {
             StringBuffer paramsBuf = new StringBuffer();
 
             for (int i = 0; i < parameterTypes.size(); i++) {
-                // Note: when we can get real names from Javadoc, re-enable
+                // Note: when we can get real names from Javadoc, re-enable this
 //                paramsBuf.append(parameterNames.get(i - 1));
 //                paramsBuf.append(":");
                 paramsBuf.append(parameterTypes.get(i));
@@ -134,4 +132,17 @@ protected String getParametersString() {
 
         return paramsStr;
     }
+
+    // Helpers
+
+    private void throwVeLaEvalError(Exception e) throws VeLaEvalError {
+        String msg = e.getLocalizedMessage();
+        if (msg == null) {
+            msg = "Intrinsic function invocation error";
+            if (funcName.isPresent()) {
+                msg += ": " + funcName.get();
+            }
+        }
+        throw new VeLaEvalError(msg);
+    }
 }