Update of /cvsroot/mathlib/mathlib/Source/MathLib/Interpreter
In directory sc8-pr-cvs7.sourceforge.net:/tmp/cvs-serv3046/Source/MathLib/Interpreter
Modified Files:
Interpreter.java VariableList.java
Log Message:
moved loading and saving of variable into to external functions. Variables are not loaded/saved automotically at the start of JMathLib any more.
Index: Interpreter.java
===================================================================
RCS file: /cvsroot/mathlib/mathlib/Source/MathLib/Interpreter/Interpreter.java,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -d -r1.64 -r1.65
*** Interpreter.java 2 Jan 2007 16:21:07 -0000 1.64
--- Interpreter.java 5 Jan 2007 17:18:19 -0000 1.65
***************
*** 53,58 ****
if(runningStandalone)
{
! getVariables().loadVariables("." + File.separator + "variables.mlf");
!
String classPath=System.getProperty("java.class.path");
boolean end = false;
--- 53,57 ----
if(runningStandalone)
{
!
String classPath=System.getProperty("java.class.path");
boolean end = false;
***************
*** 145,151 ****
executeExpression("finish");
- ErrorLogger.debugLine("Interpreter: saving variables");
- getVariables().saveVariables("." + File.separator + "variables.mlf");
-
// store current properties to file
prefs.storeLocalPropertiesToFile();
--- 144,147 ----
Index: VariableList.java
===================================================================
RCS file: /cvsroot/mathlib/mathlib/Source/MathLib/Interpreter/VariableList.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -d -r1.18 -r1.19
*** VariableList.java 3 Aug 2006 20:25:51 -0000 1.18
--- VariableList.java 5 Jan 2007 17:18:19 -0000 1.19
***************
*** 137,141 ****
catch(java.io.IOException except)
{
! ErrorLogger.debugLine("IO exception");
ErrorLogger.debugLine(except.getMessage());
//except.printStackTrace();
--- 137,141 ----
catch(java.io.IOException except)
{
! Errors.throwMathLibException("VariableList: IO exception");
ErrorLogger.debugLine(except.getMessage());
//except.printStackTrace();
***************
*** 159,163 ****
catch(java.lang.ClassNotFoundException except)
{
! ErrorLogger.debugLine("Class not found exception");
//close input objects
--- 159,163 ----
catch(java.lang.ClassNotFoundException except)
{
! Errors.throwMathLibException("VariableList: Class not found exception");
//close input objects
***************
*** 167,171 ****
catch(java.lang.ClassCastException except)
{
! ErrorLogger.debugLine("Class cast exception");
//close input objects
--- 167,171 ----
catch(java.lang.ClassCastException except)
{
! Errors.throwMathLibException("VariableList: Class cast exception");
//close input objects
***************
*** 180,184 ****
catch(java.io.IOException except)
{
! ErrorLogger.debugLine("IO exception");
ErrorLogger.debugLine(except.getMessage());
}
--- 180,184 ----
catch(java.io.IOException except)
{
! Errors.throwMathLibException("VariableList: IO exception");
ErrorLogger.debugLine(except.getMessage());
}
|