[Mathlib-commitlog] SF.net SVN: mathlib:[781] JMathLib/trunk/src/jmathlib/ui/swing

[<st_...@us...>]

Revision: 781
          http://mathlib.svn.sourceforge.net/mathlib/?rev=781&view=rev
Author:   st_mueller
Date:     2009-01-25 22:23:40 +0000 (Sun, 25 Jan 2009)

Log Message:
-----------
changed signature of evaluate(Token[] operands)
to
evaluate(Token[] operands, GlobalValues globals)

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/ui/swing/AutoCompletion.java
    JMathLib/trunk/src/jmathlib/ui/swing/SearchPathSelection.java
    JMathLib/trunk/src/jmathlib/ui/swing/WorkingDirectoryPanel.java

Modified: JMathLib/trunk/src/jmathlib/ui/swing/AutoCompletion.java
===================================================================
--- JMathLib/trunk/src/jmathlib/ui/swing/AutoCompletion.java	2009-01-25 22:18:57 UTC (rev 780)
+++ JMathLib/trunk/src/jmathlib/ui/swing/AutoCompletion.java	2009-01-25 22:23:40 UTC (rev 781)
@@ -41,7 +41,7 @@
             i++;
         }
 
-        KeyHandler.runningReference.interpreter.getFunctionManager().clearCustomFunctionLoaders();
+        KeyHandler.runningReference.interpreter.globals.getFunctionManager().clearCustomFunctionLoaders();
         s = System.getProperty("AUTOCOMP_SEARCH_DIRS");
         st = new StringTokenizer(s," ");
         String[] fileDirectories = new String[st.countTokens()];
@@ -96,7 +96,7 @@
                 {
                     try
                     {
-                        KeyHandler.runningReference.interpreter.getFunctionManager().addFunctionLoader(new FileFunctionLoader(fa[i].getCanonicalFile(), false));
+                        KeyHandler.runningReference.interpreter.globals.getFunctionManager().addFunctionLoader(new FileFunctionLoader(fa[i].getCanonicalFile(), false));
                     }
                     catch (IOException ioe) { ; }
                 }

Modified: JMathLib/trunk/src/jmathlib/ui/swing/SearchPathSelection.java
===================================================================
--- JMathLib/trunk/src/jmathlib/ui/swing/SearchPathSelection.java	2009-01-25 22:18:57 UTC (rev 780)
+++ JMathLib/trunk/src/jmathlib/ui/swing/SearchPathSelection.java	2009-01-25 22:23:40 UTC (rev 781)
@@ -67,7 +67,7 @@
      */
     public static void showPathSelectionDialog(Component container) {
         SearchPathSelection p = new SearchPathSelection();
-        FunctionManager fm = KeyHandler.runningReference.interpreter.getFunctionManager();
+        FunctionManager fm = KeyHandler.runningReference.interpreter.globals.getFunctionManager();
         for (int i = 0; i < fm.getFunctionLoaderCount(); i++) {
             FunctionLoader fl = fm.getFunctionLoader(i);
             if (fl instanceof FileFunctionLoader) {

Modified: JMathLib/trunk/src/jmathlib/ui/swing/WorkingDirectoryPanel.java
===================================================================
--- JMathLib/trunk/src/jmathlib/ui/swing/WorkingDirectoryPanel.java	2009-01-25 22:18:57 UTC (rev 780)
+++ JMathLib/trunk/src/jmathlib/ui/swing/WorkingDirectoryPanel.java	2009-01-25 22:23:40 UTC (rev 781)
@@ -23,7 +23,7 @@
     public WorkingDirectoryPanel() {
         initialiseGUI();
         registerListeners();        
-        File cwd = KeyHandler.runningReference.interpreter.getFunctionManager().getWorkingDirectory();
+        File cwd = KeyHandler.runningReference.interpreter.globals.getFunctionManager().getWorkingDirectory();
         if (cwd != null) {
             setWorkingDirectory(cwd, false);
         }
@@ -195,7 +195,7 @@
         }
         
         //Set the working directory in Mathlib (to find function files)
-        KeyHandler.runningReference.interpreter.getFunctionManager().setWorkingDirectory(dir);
+        KeyHandler.runningReference.interpreter.globals.getFunctionManager().setWorkingDirectory(dir);
         
         //Update the list view (ie files in the current working directory)
         updateFileList(dir);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.