WebSVN - OpenConcerto - Diff - Rev 144 and 156 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/SQLJavaEditor.java

             final Reader bR = new StringReader(bW.getBuffer().toString());
             Object interpreterResult = interpreter.interpret(bR, "memory");
             bR.close();
             try {
-                // this.status.setText(interpreter.getVariableNames().toString());
+                final Object variableValue = interpreter.getVariable(varCallName);
+                if (variableValue != null && Number.class.isAssignableFrom(variableValue.getClass())) {
-                this.status.setText("Code correct, valeur de retour = " + interpreter.getVariable(varCallName).toString());
+                    this.status.setText("Code correct, valeur de retour = " + variableValue);
-                this.setCodeValid(true);
+                    this.setCodeValid(true);
-                return interpreter.getVariable(varCallName);
+                    return interpreter.getVariable(varCallName);
+                } else {
+                    this.status.setText("Code correct, valeur de retour incorrecte = " + variableValue);
+                    setCodeValid(false);
+                    return null;
+                }
             } catch (IllegalStateException iSE) {
                 if (interpreterResult != null) {
-                    // this.status.setText(interpreter.getVariableNames().toString());
+                    if (interpreterResult != null && Number.class.isAssignableFrom(interpreterResult.getClass())) {
-                    this.status.setText("Code correct, valeur de retour = " + interpreterResult.toString());
+                        this.status.setText("Code correct, valeur de retour = " + interpreterResult.toString());
-                    this.setCodeValid(true);
+                        this.setCodeValid(true);
-                    bR.close();
-                    return interpreterResult;
+                        return interpreterResult;
-                } else {
+                    } else {
-                    // this.status.setText(interpreter.getVariableNames().toString());
+                        this.status.setText("Code correct, valeur de retour incorrecte = " + interpreterResult);
+                        setCodeValid(false);
+                        return null;
+                    }
+                } else {
                     this.status.setText("Aucune valeur de retour");
                     this.setCodeValid(false);
                     return null;
+                }
+            }

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/SQLJavaEditor.java - Rev 144 → 156