Home / Browse / JMathLib - Octave, Matlab clone in java / Mail / Archive

JMathLib - Octave, Matlab clone in java

Email Archive: mathlib-commitlog (read-only)

2006:	_Jan	_Feb	_Mar	_Apr	_May	_Jun (2)	_Jul (4)	_Aug (150)	_Sep	_Oct	_Nov	_Dec (2)
2007:	_Jan (233)	_Feb (86)	_Mar (32)	_Apr (26)	_May (73)	_Jun (45)	_Jul (23)	_Aug (23)	_Sep (5)	_Oct (80)	_Nov (11)	_Dec (11)
2008:	_Jan	_Feb	_Mar (13)	_Apr (3)	_May (7)	_Jun (30)	_Jul (12)	_Aug (12)	_Sep	_Oct	_Nov (78)	_Dec (78)
2009:	_Jan (214)	_Feb (79)	_Mar (20)	_Apr	_May	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec


S	M	T	W	T	F	S
				1	2	3
				(3)	(4)
4	5	6	7	8	9	10
(5)	(19)	(14)	(8)	(9)	(3)	(13)
11	12	13	14	15	16	17
(8)			(4)			(3)
18	19	20	21	22	23	24
	(4)	(12)	(9)		(19)	(32)
25	26	27	28	29	30	31
(15)	(8)			(3)	(11)	(8)

[Mathlib-commitlog] SF.net SVN: mathlib:[803] JMathLib/trunk/installer/JMathLibInstall.nsi

From: <st_mueller@us...> - 2009-01-30 21:06

Revision: 803
          http://mathlib.svn.sourceforge.net/mathlib/?rev=803&view=rev
Author:   st_mueller
Date:     2009-01-30 21:06:47 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
removed JMathLib.local.properties from builder

Modified Paths:
--------------
    JMathLib/trunk/installer/JMathLibInstall.nsi

Modified: JMathLib/trunk/installer/JMathLibInstall.nsi
===================================================================
--- JMathLib/trunk/installer/JMathLibInstall.nsi	2009-01-30 21:06:00 UTC (rev 802)
+++ JMathLib/trunk/installer/JMathLibInstall.nsi	2009-01-30 21:06:47 UTC (rev 803)
@@ -145,7 +145,7 @@
   File "..\upload\jmathlib\JMathLib.exe"
   File "..\upload\jmathlib\JMathLibSwing.exe"
   File "..\upload\jmathlib\JMathLib.properties"
-  File "..\upload\jmathlib\JMathLib.local.properties"
+  ;File "..\upload\jmathlib\JMathLib.local.properties"
   File "..\upload\jmathlib\ChangeLog.txt"
   File "..\upload\jmathlib\JMathLib.html"
   File "..\upload\jmathlib\license.txt"
@@ -218,7 +218,7 @@
   RMDir /r "$INSTDIR\handbook"
   Delete "$INSTDIR\license.txt"
   Delete "$INSTDIR\JMathLib.properties"
-  Delete "$INSTDIR\JMathLib.local.properties"
+  ;Delete "$INSTDIR\JMathLib.local.properties"
   Delete "$INSTDIR\JMathLib.log"
   Delete "$INSTDIR\license.txt"
   Delete "$INSTDIR\ChangeLog.txt"


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

[Mathlib-commitlog] SF.net SVN: mathlib:[792] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ system/createfunctionslist.java

From: <st_mueller@us...> - 2009-01-29 20:26

Revision: 792
          http://mathlib.svn.sourceforge.net/mathlib/?rev=792&view=rev
Author:   st_mueller
Date:     2009-01-29 20:26:00 +0000 (Thu, 29 Jan 2009)

Log Message:
-----------
changed name to lower

Added Paths:
-----------
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java

Added: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java	                        (rev 0)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java	2009-01-29 20:26:00 UTC (rev 792)
@@ -0,0 +1,151 @@
+package jmathlib.toolbox.jmathlib.system;
+
+/* This file is part or JMathLib 
+
+
+   Author: Stefan Mueller 2002/03/31
+*/
+
+//ToDo: do not include empty directories in the list
+//       relative path names
+
+import jmathlib.core.tokens.*;
+import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
+import jmathlib.core.interpreter.*;
+import jmathlib.core.functions.FunctionLoader;
+import jmathlib.core.functions.FileFunctionLoader;
+import jmathlib.core.functions.ExternalFunction;
+import java.util.Vector;
+import java.io.*;
+
+/**An external function for creating a filelist used by the class
+   loader for java applets      */
+public class createfunctionslist extends ExternalFunction
+{
+
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
+	{
+
+        Vector pathVector = new Vector();
+        
+        // get all search paths from all file loaders
+        for (int i=0;i<globals.getFunctionManager().getFunctionLoaderCount();i++) 
+        {
+
+            FunctionLoader loader = globals.getFunctionManager().getFunctionLoader(i);
+            
+            if (loader instanceof FileFunctionLoader) 
+            {
+                FileFunctionLoader ffl = (FileFunctionLoader)loader;
+                
+                for (int pathIdx=0;pathIdx<ffl.getPathCount();pathIdx++) 
+                {
+                    File path = ffl.getPath(pathIdx).getAbsoluteFile();
+                        
+                    pathVector.add(path.toString());                    
+                }                                        
+            }
+        }        
+        
+        
+        int    size       = pathVector.size();
+        String path       = "";
+        String line       = "";
+
+        ErrorLogger.debugLine("working directory: "+globals.getWorkingDirectory().getAbsolutePath());
+
+        try 
+        {
+            
+            // create file to store all class-, m-files and images
+            File funcFile = new File(globals.getWorkingDirectory().getAbsoluteFile() +
+			                         File.separator + "bin" +
+                                     File.separator + "jmathlib" +
+                                     File.separator + "webFunctionsList.dat");
+			BufferedWriter outWriter = new BufferedWriter( new FileWriter(funcFile));
+            ErrorLogger.debugLine("funcFile ="+funcFile.toString());
+
+
+            /* The first line of the file is a comment */
+            line = "# created with createFunctionsList.java";
+            outWriter.write(line, 0, line.length());
+			outWriter.newLine();
+            line = "# This is a generated file. DO NOT EDIT!";
+            outWriter.write(line, 0, line.length());
+			outWriter.newLine();
+            
+	        // search through all serach directories
+	        for(int n = 0; n < size; n++)
+	        {
+	            path = (String)pathVector.elementAt(n);
+	            ErrorLogger.debugLine("path func manager = "+path);
+	            
+	           	File dir       = new File(path);
+				String[] files = dir.list();
+
+                // do not use empty directories
+                if (files != null)
+                {
+                    for(int fileNo = 0; (fileNo < files.length); fileNo++)
+                    {
+                        line = path + "/" + files[fileNo];
+                    
+                        // use unix-style file separator as default
+                        line = line.replace('\\', '/'); 
+
+                        // do not put CVS directories and files into functions list
+                        if (!line.endsWith("/CVS")            &&
+                            !line.endsWith("/CVS/Entries")    &&
+                            !line.endsWith("/CVS/Root")       &&
+                            !line.endsWith("/CVS/Repository") &&
+                            !line.contains(".svn")              )
+                        {
+                            // remove preceding absolute path
+                            line = line.substring((globals.getWorkingDirectory().getAbsolutePath()+"/bin/").length());
+
+                            ErrorLogger.debugLine("path = "+ line);
+
+                            // also remove unwanted directories
+                            if (!line.startsWith("jmathlibtests") && 
+                                !line.startsWith("jmathlib/tools")   )
+                            {
+                                // write relative path and filename to dat-file
+                                outWriter.write(line, 0, line.length());
+                                outWriter.newLine();
+                            }
+                        }
+
+                    }
+                }
+                else
+                    ErrorLogger.debugLine("directory is empty");
+	        }
+			outWriter.close();
+
+        }
+        catch (Exception e)
+        {
+            ErrorLogger.debugLine("createFunctionsList");
+            e.printStackTrace();
+        }
+        return DoubleNumberToken.one;		
+
+	} // end evaluate
+}
+
+/*
+@GROUP
+system
+@SYNTAX
+createfunctionslist()
+@DOC
+Creates a file called webFunctionList.dat containing the name 
+of all external functions.
+This functions is used when running JMathLib as an applet.
+@NOTES
+@EXAMPLES
+createfunctionslist()
+@SEE
+path, setpath, rmpath
+*/
+


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

[Mathlib-commitlog] SF.net SVN: mathlib:[794] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ system/createfunctionslist.java

From: <st_mueller@us...> - 2009-01-30 18:22

Revision: 794
          http://mathlib.svn.sourceforge.net/mathlib/?rev=794&view=rev
Author:   st_mueller
Date:     2009-01-30 18:22:45 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------


Added Paths:
-----------
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java

Added: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java	                        (rev 0)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java	2009-01-30 18:22:45 UTC (rev 794)
@@ -0,0 +1,151 @@
+package jmathlib.toolbox.jmathlib.system;
+
+/* This file is part or JMathLib 
+
+
+   Author: Stefan Mueller 2002/03/31
+*/
+
+//ToDo: do not include empty directories in the list
+//       relative path names
+
+import jmathlib.core.tokens.*;
+import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
+import jmathlib.core.interpreter.*;
+import jmathlib.core.functions.FunctionLoader;
+import jmathlib.core.functions.FileFunctionLoader;
+import jmathlib.core.functions.ExternalFunction;
+import java.util.Vector;
+import java.io.*;
+
+/**An external function for creating a filelist used by the class
+   loader for java applets      */
+public class createfunctionslist extends ExternalFunction
+{
+
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
+	{
+
+        Vector pathVector = new Vector();
+        
+        // get all search paths from all file loaders
+        for (int i=0;i<globals.getFunctionManager().getFunctionLoaderCount();i++) 
+        {
+
+            FunctionLoader loader = globals.getFunctionManager().getFunctionLoader(i);
+            
+            if (loader instanceof FileFunctionLoader) 
+            {
+                FileFunctionLoader ffl = (FileFunctionLoader)loader;
+                
+                for (int pathIdx=0;pathIdx<ffl.getPathCount();pathIdx++) 
+                {
+                    File path = ffl.getPath(pathIdx).getAbsoluteFile();
+                        
+                    pathVector.add(path.toString());                    
+                }                                        
+            }
+        }        
+        
+        
+        int    size       = pathVector.size();
+        String path       = "";
+        String line       = "";
+
+        ErrorLogger.debugLine("working directory: "+globals.getWorkingDirectory().getAbsolutePath());
+
+        try 
+        {
+            
+            // create file to store all class-, m-files and images
+            File funcFile = new File(globals.getWorkingDirectory().getAbsoluteFile() +
+			                         File.separator + "bin" +
+                                     File.separator + "jmathlib" +
+                                     File.separator + "webFunctionsList.dat");
+			BufferedWriter outWriter = new BufferedWriter( new FileWriter(funcFile));
+            ErrorLogger.debugLine("funcFile ="+funcFile.toString());
+
+
+            /* The first line of the file is a comment */
+            line = "# created with createFunctionsList.java";
+            outWriter.write(line, 0, line.length());
+			outWriter.newLine();
+            line = "# This is a generated file. DO NOT EDIT!";
+            outWriter.write(line, 0, line.length());
+			outWriter.newLine();
+            
+	        // search through all serach directories
+	        for(int n = 0; n < size; n++)
+	        {
+	            path = (String)pathVector.elementAt(n);
+	            ErrorLogger.debugLine("path func manager = "+path);
+	            
+	           	File dir       = new File(path);
+				String[] files = dir.list();
+
+                // do not use empty directories
+                if (files != null)
+                {
+                    for(int fileNo = 0; (fileNo < files.length); fileNo++)
+                    {
+                        line = path + "/" + files[fileNo];
+                    
+                        // use unix-style file separator as default
+                        line = line.replace('\\', '/'); 
+
+                        // do not put CVS directories and files into functions list
+                        if (!line.endsWith("/CVS")            &&
+                            !line.endsWith("/CVS/Entries")    &&
+                            !line.endsWith("/CVS/Root")       &&
+                            !line.endsWith("/CVS/Repository") &&
+                            !line.contains(".svn")              )
+                        {
+                            // remove preceding absolute path
+                            line = line.substring((globals.getWorkingDirectory().getAbsolutePath()+"/bin/").length());
+
+                            ErrorLogger.debugLine("path = "+ line);
+
+                            // also remove unwanted directories
+                            if (!line.startsWith("jmathlibtests") && 
+                                !line.startsWith("jmathlib/tools")   )
+                            {
+                                // write relative path and filename to dat-file
+                                outWriter.write(line, 0, line.length());
+                                outWriter.newLine();
+                            }
+                        }
+
+                    }
+                }
+                else
+                    ErrorLogger.debugLine("directory is empty");
+	        }
+			outWriter.close();
+
+        }
+        catch (Exception e)
+        {
+            ErrorLogger.debugLine("createFunctionsList");
+            e.printStackTrace();
+        }
+        return DoubleNumberToken.one;		
+
+	} // end evaluate
+}
+
+/*
+@GROUP
+system
+@SYNTAX
+createfunctionslist()
+@DOC
+Creates a file called webFunctionList.dat containing the name 
+of all external functions.
+This functions is used when running JMathLib as an applet.
+@NOTES
+@EXAMPLES
+createfunctionslist()
+@SEE
+path, setpath, rmpath
+*/
+


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

[Mathlib-commitlog] SF.net SVN: mathlib:[802] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ system/createfunctionslist.java

From: <st_mueller@us...> - 2009-01-30 21:06

Revision: 802
          http://mathlib.svn.sourceforge.net/mathlib/?rev=802&view=rev
Author:   st_mueller
Date:     2009-01-30 21:06:00 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
correction on working directory

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java	2009-01-30 21:05:33 UTC (rev 801)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java	2009-01-30 21:06:00 UTC (rev 802)
@@ -67,7 +67,7 @@
 
 
             /* The first line of the file is a comment */
-            line = "# created with createFunctionsList.java";
+            line = "# created with createfunctionslist()";
             outWriter.write(line, 0, line.length());
 			outWriter.newLine();
             line = "# This is a generated file. DO NOT EDIT!";
@@ -101,7 +101,10 @@
                             !line.contains(".svn")              )
                         {
                             // remove preceding absolute path
-                            line = line.substring((globals.getWorkingDirectory().getAbsolutePath()+"/bin/").length());
+                            File f = new File(globals.getWorkingDirectory(),"bin/");
+                            
+                            //ErrorLogger.debugLine(f.getCanonicalPath().toString());
+                            line = line.substring(f.getCanonicalPath().toString().length()+1);
 
                             ErrorLogger.debugLine("path = "+ line);
 


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

[Mathlib-commitlog] SF.net SVN: mathlib:[801] JMathLib/trunk/src/jmathlib/core/functions/ FunctionManager.java

From: <st_mueller@us...> - 2009-01-30 21:05

Revision: 801
          http://mathlib.svn.sourceforge.net/mathlib/?rev=801&view=rev
Author:   st_mueller
Date:     2009-01-30 21:05:33 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
correction on working directory

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/core/functions/FunctionManager.java

Modified: JMathLib/trunk/src/jmathlib/core/functions/FunctionManager.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/functions/FunctionManager.java	2009-01-30 19:09:04 UTC (rev 800)
+++ JMathLib/trunk/src/jmathlib/core/functions/FunctionManager.java	2009-01-30 21:05:33 UTC (rev 801)
@@ -43,7 +43,7 @@
         
         if (runningStandalone) {
             //Add the predefined (system) function loader for the current directory.
-            functionLoaders.add(new SystemFileFunctionLoader(new File(""),false)); //"." + File.separator), false));
+            functionLoaders.add(new SystemFileFunctionLoader(new File("."),false)); //"." + File.separator), false));
             //webLoader   = null;
 
             String classPath = System.getProperty("java.class.path");


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

[Mathlib-commitlog] SF.net SVN: mathlib:[800] JMathLib/trunk/doc/src/tokens.svg

From: <st_mueller@us...> - 2009-01-30 19:09

Revision: 800
          http://mathlib.svn.sourceforge.net/mathlib/?rev=800&view=rev
Author:   st_mueller
Date:     2009-01-30 19:09:04 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------


Added Paths:
-----------
    JMathLib/trunk/doc/src/tokens.svg

Added: JMathLib/trunk/doc/src/tokens.svg
===================================================================
--- JMathLib/trunk/doc/src/tokens.svg	                        (rev 0)
+++ JMathLib/trunk/doc/src/tokens.svg	2009-01-30 19:09:04 UTC (rev 800)
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.0"
+   width="1052.3622"
+   height="744.09448"
+   id="svg2">
+  <defs
+     id="defs4" />
+  <g
+     id="layer1">
+    <g
+       transform="translate(332.85714,-24.285714)"
+       id="g7892">
+      <g
+         transform="translate(7.1428572,-24.285714)"
+         id="g7969">
+        <rect
+           width="182.93251"
+           height="41.939518"
+           ry="0"
+           x="89.954224"
+           y="82.231926"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.39870894;stroke-opacity:1"
+           id="rect2160" />
+        <flowRoot
+           transform="translate(11.428572,-7.1428576)"
+           style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+           id="flowRoot7860"
+           xml:space="preserve"><flowRegion
+             id="flowRegion7862"><rect
+               width="257.14285"
+               height="77.142853"
+               x="110"
+               y="103.79076"
+               style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+               id="rect7864" /></flowRegion><flowPara
+             id="flowPara7866">RootObject</flowPara></flowRoot>      </g>
+      <g
+         transform="translate(8.5714286,34.285715)"
+         id="g7976">
+        <g
+           id="g7988">
+          <rect
+             width="182.93251"
+             height="41.939518"
+             ry="0"
+             x="89.954224"
+             y="82.231926"
+             style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.39870894;stroke-opacity:1"
+             id="rect7978" />
+          <flowRoot
+             transform="translate(37.142858,-8.571429)"
+             style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+             id="flowRoot7980"
+             xml:space="preserve"><flowRegion
+               id="flowRegion7982"><rect
+                 width="257.14285"
+                 height="77.142853"
+                 x="110"
+                 y="103.79076"
+                 style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+                 id="rect7984" /></flowRegion><flowPara
+               id="flowPara7986">Token</flowPara></flowRoot>        </g>
+      </g>
+    </g>
+    <g
+       transform="translate(19.999997,58.571429)"
+       id="g7899">
+      <g
+         transform="translate(97.142857,5.7142853)"
+         id="g7917">
+        <rect
+           width="182.93251"
+           height="41.939518"
+           ry="0"
+           x="89.954224"
+           y="82.231926"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.39870894;stroke-opacity:1"
+           id="rect7901" />
+        <flowRoot
+           transform="translate(-4.2857118,-7.1428579)"
+           style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+           id="flowRoot7903"
+           xml:space="preserve"><flowRegion
+             id="flowRegion7905"><rect
+               width="257.14285"
+               height="77.142853"
+               x="110"
+               y="103.79076"
+               style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+               id="rect7907" /></flowRegion><flowPara
+             id="flowPara7911">OperandToken</flowPara></flowRoot>        <rect
+           width="182.93251"
+           height="41.939518"
+           ry="0"
+           x="89.954224"
+           y="82.231926"
+           style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.39870894;stroke-opacity:1"
+           id="rect7915" />
+      </g>
+      <g
+         transform="translate(418.57142,9.9999993)"
+         id="g7925">
+        <g
+           transform="translate(150,-1.4285714)"
+           id="g7939">
+          <rect
+             width="182.93251"
+             height="41.939518"
+             ry="0"
+             x="89.954224"
+             y="82.231926"
+             style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.39870894;stroke-opacity:1"
+             id="rect7927" />
+          <flowRoot
+             transform="translate(-4.2857118,-7.1428579)"
+             style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+             id="flowRoot7929"
+             xml:space="preserve"><flowRegion
+               id="flowRegion7931"><rect
+                 width="257.14285"
+                 height="77.142853"
+                 x="110"
+                 y="103.79076"
+                 style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+                 id="rect7933" /></flowRegion><flowPara
+               id="flowPara7935">OperatorToken</flowPara></flowRoot>          <rect
+             width="182.93251"
+             height="41.939518"
+             ry="0"
+             x="89.954224"
+             y="82.231926"
+             style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.39870894;stroke-opacity:1"
+             id="rect7937" />
+        </g>
+      </g>
+      <g
+         transform="translate(97.142857,80)"
+         id="g7947">
+        <g
+           id="g7961">
+          <rect
+             width="182.93251"
+             height="41.939518"
+             ry="0"
+             x="89.954224"
+             y="82.231926"
+             style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.39870894;stroke-opacity:1"
+             id="rect7949" />
+          <flowRoot
+             transform="translate(7.7142882,-7.1428579)"
+             style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+             id="flowRoot7951"
+             xml:space="preserve"><flowRegion
+               id="flowRegion7953"><rect
+                 width="257.14285"
+                 height="77.142853"
+                 x="110"
+                 y="103.79076"
+                 style="font-size:20px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"
+                 id="rect7955" /></flowRegion><flowPara
+               id="flowPara7957">DataToken</flowPara></flowRoot>          <rect
+             width="182.93251"
+             height="41.939518"
+             ry="0"
+             x="89.954224"
+             y="82.231926"
+             style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.39870894;stroke-opacity:1"
+             id="rect7959" />
+        </g>
+      </g>
+    </g>
+  </g>
+</svg>


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

[Mathlib-commitlog] SF.net SVN: mathlib:[799] JMathLib/trunk

From: <st_mueller@us...> - 2009-01-30 19:08

Revision: 799
          http://mathlib.svn.sourceforge.net/mathlib/?rev=799&view=rev
Author:   st_mueller
Date:     2009-01-30 19:08:26 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
changed handling of preferences/properties

Modified Paths:
--------------
    JMathLib/trunk/ChangeLog.txt
    JMathLib/trunk/build.properties

Removed Paths:
-------------
    JMathLib/trunk/JMathLib.local.properties

Modified: JMathLib/trunk/ChangeLog.txt
===================================================================
--- JMathLib/trunk/ChangeLog.txt	2009-01-30 19:04:24 UTC (rev 798)
+++ JMathLib/trunk/ChangeLog.txt	2009-01-30 19:08:26 UTC (rev 799)
@@ -9,6 +9,13 @@
 ---- HISTORY ------------------------------------------------------------------
 2009/01/xx stefan:
 
+2009/01/30 stefan: changed handling of properties
+                   removed getLocalProperty, setLocalProperty
+                   renamed getGlobalProperty into getProperty
+                   renamed setGlobalProperty into setProperty
+                   JMathLib.local.properties is obsolete
+                   JMathLib.propertis is the master now
+
 2009/01/26 stefan: changed MathLibException into JMathLibException
 
 2009/01/25 stefan: JMathLib has not been thread save for more than one

Deleted: JMathLib/trunk/JMathLib.local.properties
===================================================================
--- JMathLib/trunk/JMathLib.local.properties	2009-01-30 19:04:24 UTC (rev 798)
+++ JMathLib/trunk/JMathLib.local.properties	2009-01-30 19:08:26 UTC (rev 799)
@@ -1,10 +0,0 @@
-#JMathLib local property file
-#Sat Nov 30 20:00:00 CEST 2008
-update.auto=yes
-jmathlib.release.date=2009/01/29
-update.errors=0
-update.site.primary=http://www.jmathlib.de/checkForUpdates/
-update.site.backup=http://mathlib.sourceforge.net/checkForUpdates/
-update.date.next=00.00.00
-update.intervall=1
-update.date.last=2009/01/29

Modified: JMathLib/trunk/build.properties
===================================================================
--- JMathLib/trunk/build.properties	2009-01-30 19:04:24 UTC (rev 798)
+++ JMathLib/trunk/build.properties	2009-01-30 19:08:26 UTC (rev 799)
@@ -6,10 +6,10 @@
 project=JMathLib
 
 # Project version
-version=0.9.3
+version=0.9.4
 
 # Release date
-release_date=2009/01/11
+release_date=2009/01/30
 
 # final project name
 final.name=${project}_${version}


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

[Mathlib-commitlog] SF.net SVN: mathlib:[780] JMathLib/trunk/src/jmathlib/core/interpreter

From: <st_mueller@us...> - 2009-01-25 22:19

Revision: 780
          http://mathlib.svn.sourceforge.net/mathlib/?rev=780&view=rev
Author:   st_mueller
Date:     2009-01-25 22:18:57 +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/core/interpreter/Interpreter.java
    JMathLib/trunk/src/jmathlib/core/interpreter/Variable.java

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java	2009-01-25 21:03:22 UTC (rev 779)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java	2009-01-25 22:18:57 UTC (rev 780)
@@ -54,6 +54,8 @@
     	//  all expressions for access to function manager, variable lists, contexts,...
     	globals = new GlobalValues(this, runningStandalone, _applet);;
 
+    	// set output panel to NULL
+    	// ?? needed? outputPanel is initialized with NULl anyway (see above)
     	outputPanel = null;
 
 	    // read preferences from a file on the disc or on the web
@@ -111,9 +113,7 @@
 
         // if required rehash m-files
         if(runningStandalone)
-        {
             globals.getFunctionManager().checkAndRehashTimeStamps();
-        }        
 
         try
         {
@@ -167,6 +167,7 @@
             var.assign(new CharToken(answer));	
         }
 
+        ErrorLogger.debugLine("Interpreter: done");
 	    
         return answer;
     }

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Variable.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Variable.java	2009-01-25 21:03:22 UTC (rev 779)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Variable.java	2009-01-25 22:18:57 UTC (rev 780)
@@ -5,16 +5,16 @@
 /**class for binding a variable name to some data*/
 public class Variable extends RootObject
 {
-    /**The variable name*/
+    /**variable name*/
     private String name;
 
-    /**Variable data*/
+    /**variable data*/
     private OperandToken data;
 
-    // local or global context
+    /** local or global context */
     private boolean globalB = false;
     
-    /**Default constructor*/
+    /**default constructor*/
     public Variable()
     {
         super();
@@ -22,7 +22,8 @@
         data = null;
     }
 
-    /**constructor containing a variable name*/
+    /**constructor containing a variable name
+     * @param _name*/
     public Variable(String _name)
     {
         super();
@@ -30,7 +31,9 @@
         data = null;
     }
 
-    /**constructor containing the variables name and data*/
+    /**constructor containing the variables name and data
+     * @param _name
+     * @param _data*/
     public Variable(String _name, OperandToken  _data)
     {
         super();
@@ -51,8 +54,10 @@
         //}
     }
 
-    /**Assign a new value to the variable*/
-    //public OperandToken assign(Token _data)
+    /**Assign a new value to the variable
+     * @param _data
+     * @return
+     */
     public OperandToken assign(OperandToken _data)
     {
         if (_data!=null)
@@ -86,9 +91,12 @@
         return equal;
     }
 
-    /**Converts the variable to a string.*/
+    /**Converts the variable to a string.
+     * @return
+     */
     public String toString()
     {
+        //Errors.throwMathLibException("Variable");
         if(data == null)
             return null;
         else
@@ -107,7 +115,9 @@
     	return name;
     }
     
-    /**Returns the variables data*/
+    /**Returns the variables data
+     * @return
+     */
     public OperandToken getData()
     {
     	return data;


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

[Mathlib-commitlog] SF.net SVN: mathlib:[783] JMathLib/trunk/src/jmathlib/core/interpreter

From: <st_mueller@us...> - 2009-01-26 19:49

Revision: 783
          http://mathlib.svn.sourceforge.net/mathlib/?rev=783&view=rev
Author:   st_mueller
Date:     2009-01-26 19:49:18 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
added more comments

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/core/interpreter/Context.java
    JMathLib/trunk/src/jmathlib/core/interpreter/ContextList.java

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Context.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Context.java	2009-01-26 19:47:27 UTC (rev 782)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Context.java	2009-01-26 19:49:18 UTC (rev 783)
@@ -1,6 +1,14 @@
+/* 
+ * This file is part or JMathLib 
+ * 
+ * Check it out at http://www.jmathlib.de
+ *
+ * Author:   
+ * (c) 2002-2009   
+ */
+
 package jmathlib.core.interpreter;
 
-//import MathLib.Tokens.*;
 
 /**A context object contains the variables and code for the executing function*/
 public class Context implements java.io.Serializable 
@@ -11,8 +19,6 @@
      /**Reference to the contexts calling context*/
      private Context parent;
     
-     /**The name of the function that defined this context, used for diagnostics*/
-     //private String functionName;
 
      /**Create a Context with an empty variable list, used to construct the global context*/        
      public Context()
@@ -22,8 +28,9 @@
      }
 
      /**Create a Context with the supplied values
-        @param _variables = the variable list of the new context
-        @param _parent    = the calling context*/
+      * @param _variables = the variable list of the new context
+      * @param _parent    = the calling context
+      */
      public Context(VariableList _variables, Context _parent)
      {
          variables    = _variables;

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/ContextList.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/ContextList.java	2009-01-26 19:47:27 UTC (rev 782)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/ContextList.java	2009-01-26 19:49:18 UTC (rev 783)
@@ -1,3 +1,12 @@
+/* 
+ * This file is part or JMathLib 
+ * 
+ * Check it out at http://www.jmathlib.de
+ *
+ * Author:   
+ * (c) 2002-2009   
+ */
+
 package jmathlib.core.interpreter;
 
 import jmathlib.core.tokens.OperandToken;


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

[Mathlib-commitlog] SF.net SVN: mathlib:[784] JMathLib/trunk/src/jmathlib/core/interpreter

From: <st_mueller@us...> - 2009-01-26 19:52

Revision: 784
          http://mathlib.svn.sourceforge.net/mathlib/?rev=784&view=rev
Author:   st_mueller
Date:     2009-01-26 19:52:01 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
renamed MathLibException into JMathLibException

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/core/interpreter/Errors.java
    JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java
    JMathLib/trunk/src/jmathlib/core/interpreter/LexicalAnalyser.java

Added Paths:
-----------
    JMathLib/trunk/src/jmathlib/core/interpreter/JMathLibException.java

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Errors.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Errors.java	2009-01-26 19:49:18 UTC (rev 783)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Errors.java	2009-01-26 19:52:01 UTC (rev 784)
@@ -26,7 +26,7 @@
     public static void throwMathLibException(int errorCode)
     {
     	String text = getErrorText(errorCode);
-        throw (new MathLibException(text));
+        throw (new JMathLibException(text));
     	
     }
 
@@ -36,7 +36,7 @@
        @param errorCode = the error message*/
     public static void throwMathLibException(String errorMessage)
     {
-        throw (new MathLibException("ERROR: "+errorMessage));
+        throw (new JMathLibException("ERROR: "+errorMessage));
     }
 
     /**
@@ -46,7 +46,7 @@
      */
     public static void throwParserException(String errorMessage)
     {
-        throw (new MathLibException("PARSER: "+errorMessage));
+        throw (new JMathLibException("PARSER: "+errorMessage));
     }
 
     
@@ -57,7 +57,7 @@
      */
     public static void throwUsageException(String errorMessage)
     {
-        throw (new MathLibException("USAGE: "+errorMessage));
+        throw (new JMathLibException("USAGE: "+errorMessage));
     }
 
     /**returns the localised error string for a specific code, 
@@ -68,7 +68,7 @@
     public static String getErrorText(int errorCode, Object[] params)
     {
         String text = "";
-        ResourceBundle bundle = ResourceBundle.getBundle("MathLib.ResourceBundles.ErrorBundle");
+        ResourceBundle bundle = ResourceBundle.getBundle("jmathlib.resourcebundles.ErrorBundle");
         text = MessageFormat.format(bundle.getString(Integer.toString(errorCode)), params);
 
         return text;
@@ -81,7 +81,7 @@
     public static void throwMathLibException(int errorCode, Object[] params)
     {
     	String text = getErrorText(errorCode, params);
-        throw (new MathLibException(text));
+        throw (new JMathLibException(text));
     	
     }
 }

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java	2009-01-26 19:49:18 UTC (rev 783)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java	2009-01-26 19:52:01 UTC (rev 784)
@@ -132,7 +132,7 @@
 			
             //getVariables().listVariables();
         }
-        catch(MathLibException e)
+        catch(JMathLibException e)
         {
             answer = e.getMessage();
             

Copied: JMathLib/trunk/src/jmathlib/core/interpreter/JMathLibException.java (from rev 413, JMathLib/trunk/src/jmathlib/core/interpreter/MathLibException.java)
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/JMathLibException.java	                        (rev 0)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/JMathLibException.java	2009-01-26 19:52:01 UTC (rev 784)
@@ -0,0 +1,31 @@
+/* 
+ * This file is part or JMathLib 
+ * 
+ * Check it out at http://www.jmathlib.de
+ *
+ * Author:   
+ * (c) 2002-2009   
+ */
+
+
+package jmathlib.core.interpreter;
+
+/**MathLib specific exception */
+public class JMathLibException extends ArithmeticException
+{
+    /**Create a new exception object*/
+    public JMathLibException()
+    {
+    
+    }
+    
+    /**Set the message text
+     * @param text = the text to display
+     */
+    public JMathLibException(String text)
+    {
+    	super(text);
+    }
+
+	
+}

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/LexicalAnalyser.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/LexicalAnalyser.java	2009-01-26 19:49:18 UTC (rev 783)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/LexicalAnalyser.java	2009-01-26 19:52:01 UTC (rev 784)
@@ -220,7 +220,7 @@
 	For each character it calls a series of functions until it
 	finds one that can handle the character
 	@return the next token contained within the expression string */
-    private boolean scanNextToken() throws MathLibException
+    private boolean scanNextToken() throws JMathLibException
     {
         negative = false;  // reset sign indicator
 


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

[Mathlib-commitlog] SF.net SVN: mathlib:[798] JMathLib/trunk/src/jmathlib/core/interpreter

From: <st_mueller@us...> - 2009-01-30 19:04

Revision: 798
          http://mathlib.svn.sourceforge.net/mathlib/?rev=798&view=rev
Author:   st_mueller
Date:     2009-01-30 19:04:24 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
changed handling of preferences/properties

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java
    JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java

Removed Paths:
-------------
    JMathLib/trunk/src/jmathlib/core/interpreter/Preferences.java

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java	2009-01-30 19:03:54 UTC (rev 797)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java	2009-01-30 19:04:24 UTC (rev 798)
@@ -11,6 +11,7 @@
 
 import java.io.*;
 import java.util.Locale;
+import java.util.Properties;
 import java.applet.Applet;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
@@ -47,6 +48,9 @@
     /**stores the number format for displaying the number*/
     public NumberFormat numFormat = new DecimalFormat("0.0000", new DecimalFormatSymbols(Locale.ENGLISH));
 
+    /** global properties */
+    private static Properties props = new Properties();  
+    
     /**Initialises the global values
      * @param _interpreter = the Interpreter object
      * @param _runningStandalone = true if this was run from an application
@@ -204,4 +208,71 @@
         numFormat = _numFormat;
     }
 
+    /**
+     * 
+     *
+     */
+    public void loadPropertiesFromFile()
+    {
+         
+        // load global properties from disc 
+        try 
+        {
+             props.load(new FileInputStream(new File("JMathLib.properties")));
+        }
+        catch (Exception e)
+        {
+            System.out.println("Properties global error");    
+        }
+        //System.out.println("Properties loaded");    
+
+        // display properties
+        //Enumeration propnames = props.propertyNames();
+        //while (globalPropnames.hasMoreElements())
+        //{
+        //    String propname = (String)globalPropnames.nextElement();
+        //    System.out.println("Property: "+propname+" = "+globalProps.getProperty(propname));
+        //}
+         
+
+    }
+
+    /**
+     * 
+     */
+    public void storePropertiesToFile()
+    {
+        
+        // store properties back to file
+        try
+        {
+            props.store(new FileOutputStream(new File("JMathLib.properties")), 
+                             "JMathLib property file" );
+        }
+        catch (Exception e)
+        {
+            System.out.println("Property: Error");
+        }
+    }
+    
+    /**
+     * 
+     * @param property
+     * @return
+     */
+    public String getProperty(String property)
+    {
+        return props.getProperty(property);
+    }
+
+    /**
+     * 
+     * @param property
+     * @param value
+     */
+    public void setProperty(String property, String value)
+    {
+        props.setProperty(property, value);
+    }
+
 }

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java	2009-01-30 19:03:54 UTC (rev 797)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Interpreter.java	2009-01-30 19:04:24 UTC (rev 798)
@@ -30,9 +30,6 @@
     /**for testing purposes additional throwing of errors can be enables */
     public boolean throwErrorsB = false;
 
-    /** list of preferences */
-    public Preferences prefs = new Preferences();
-    
     /**Constructs the interpreter and sets the constants
 	 * @param _runningStandalone = true if this is being used from an application 
 	 */
@@ -59,7 +56,7 @@
     	outputPanel = null;
 
 	    // read preferences from a file on the disc or on the web
-	    prefs.loadPropertiesFromFile();
+	    globals.loadPropertiesFromFile();
         
     }
     
@@ -98,7 +95,7 @@
 	        executeExpression("finish");
 	    
 	        // store current properties to file
-            prefs.storeLocalPropertiesToFile();
+            globals.storePropertiesToFile();
         }
     }
 	

Deleted: JMathLib/trunk/src/jmathlib/core/interpreter/Preferences.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Preferences.java	2009-01-30 19:03:54 UTC (rev 797)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Preferences.java	2009-01-30 19:04:24 UTC (rev 798)
@@ -1,123 +0,0 @@
-package jmathlib.core.interpreter;
-
-//import MathLib.Tokens.*;
-import java.util.*;
-import java.io.*;
-
-/**
- * 
- */
-public class Preferences 
-{
-
-    Properties globalProps = new Properties();  // global properties
-    Properties localProps  = new Properties();  // local properties
-    
-    //SwingUI KEYS
-    public static final String MFUNCTION_FILE_HISTORY = "MathLib.UI.Swing.MFunctionFileHistory";
-   /**
-    * 
-    */
-   public Preferences()
-   {
-   }
-
-   /**
-    * 
-    *
-    */
-   public void loadPropertiesFromFile()
-   {
-        
-       // load globa properties from disc 
-       try 
-       {
-            globalProps.load(new FileInputStream(new File("JMathLib.properties")));
-       }
-       catch (Exception e)
-       {
-           System.out.println("Properties error");    
-       }
-       //System.out.println("Properties loaded");    
-
-       // display properties
-       Enumeration globalPropnames = globalProps.propertyNames();
-       //while (globalPropnames.hasMoreElements())
-       //{
-       //    String propname = (String)globalPropnames.nextElement();
-       //    System.out.println("Property: "+propname+" = "+globalProps.getProperty(propname));
-       //}
-        
-        
-       // load local properties from disc 
-       try 
-       {
-    	   localProps.load(new FileInputStream(new File("JMathLib.local.properties")));
-       }
-       catch (Exception e)
-       {
-           System.out.println("Properties local error");    
-       }
-
-       // display properties
-       Enumeration localPropnames = localProps.propertyNames();
-       //while (localPropnames.hasMoreElements())
-       //{
-       //    String propname = (String)localPropnames.nextElement();
-       //    System.out.println("Property (local): "+propname+" = "+localProps.getProperty(propname));
-       //}
-        
-       // check if all global properties are also set in local properties
-       //  -> in case global property not available in local property, copy global to local property
-       globalPropnames = globalProps.propertyNames();
-       while (globalPropnames.hasMoreElements())
-       {
-           String propname = (String)globalPropnames.nextElement();
-           if (localProps.getProperty(propname)== null)
-           {
-               System.out.println("global Property: "+propname+" not local yet");
-               localProps.setProperty(propname, (String)globalProps.getProperty(propname));
-           }
-       }
-
-   }
-
-   /**
-    * 
-    */
-   public void storeLocalPropertiesToFile()
-   {
-       
-       // only store local properties back to file
-	   try
-       {
-    	   localProps.store(new FileOutputStream(new File("JMathLib.local.properties")), 
-                            "JMathLib local property file" );
-       }
-       catch (Exception e)
-       {
-           System.out.println("Property: Error");
-       }
-   }
-   
-   public String getGlobalProperty(String property)
-   {
-       return globalProps.getProperty(property);
-   }
-
-   public void setGlobalProperty(String property, String value)
-   {
-	   globalProps.setProperty(property, value);
-   }
-
-   public String getLocalProperty(String property)
-   {
-       return localProps.getProperty(property);
-   }
-
-   public void setLocalProperty(String property, String value)
-   {
-	   localProps.setProperty(property, value);
-   }
-
-}
\ No newline at end of file


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

[Mathlib-commitlog] SF.net SVN: mathlib:[797] JMathLib/trunk/src/jmathlib/ui/awt/GUI.java

From: <st_mueller@us...> - 2009-01-30 19:04

Revision: 797
          http://mathlib.svn.sourceforge.net/mathlib/?rev=797&view=rev
Author:   st_mueller
Date:     2009-01-30 19:03:54 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
changed handling of preferences/properties

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/ui/awt/GUI.java

Modified: JMathLib/trunk/src/jmathlib/ui/awt/GUI.java
===================================================================
--- JMathLib/trunk/src/jmathlib/ui/awt/GUI.java	2009-01-30 19:02:16 UTC (rev 796)
+++ JMathLib/trunk/src/jmathlib/ui/awt/GUI.java	2009-01-30 19:03:54 UTC (rev 797)
@@ -238,11 +238,11 @@
             this.setTitle(TITLE + " - Console Window");
 
             // in case an update is available inform the user
-            String u = interpreter.prefs.getLocalProperty("update.newversionavailable");
+            String u = interpreter.globals.getProperty("update.newversionavailable");
             if ((u!=null) && u.equals("yes"))
             {
                 this.setTitle(TITLE + " - (NEW version available: type update at prompt)");
-                String s = interpreter.prefs.getLocalProperty("update.newversionavailable.message01");
+                String s = interpreter.globals.getProperty("update.newversionavailable.message01");
                 if (s==null)
                     answer.displayText("A NEW version of JMathLib is available\n     type update   or  visit http://www.jmathlib.de");
                 else


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

[Mathlib-commitlog] SF.net SVN: mathlib:[793] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ system

From: <st_mueller@us...> - 2009-01-30 18:21

Revision: 793
          http://mathlib.svn.sourceforge.net/mathlib/?rev=793&view=rev
Author:   st_mueller
Date:     2009-01-30 18:21:19 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------


Removed Paths:
-------------
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createFunctionsList.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java

Deleted: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createFunctionsList.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createFunctionsList.java	2009-01-29 20:26:00 UTC (rev 792)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createFunctionsList.java	2009-01-30 18:21:19 UTC (rev 793)
@@ -1,151 +0,0 @@
-package jmathlib.toolbox.jmathlib.system;
-
-/* This file is part or JMathLib 
-
-
-   Author: Stefan Mueller 2002/03/31
-*/
-
-//ToDo: do not include empty directories in the list
-//       relative path names
-
-import jmathlib.core.tokens.*;
-import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
-import jmathlib.core.interpreter.*;
-import jmathlib.core.functions.FunctionLoader;
-import jmathlib.core.functions.FileFunctionLoader;
-import jmathlib.core.functions.ExternalFunction;
-import java.util.Vector;
-import java.io.*;
-
-/**An external function for creating a filelist used by the class
-   loader for java applets      */
-public class createFunctionsList extends ExternalFunction
-{
-
-	public OperandToken evaluate(Token[] operands, GlobalValues globals)
-	{
-
-        Vector pathVector = new Vector();
-        
-        // get all search paths from all file loaders
-        for (int i=0;i<globals.getFunctionManager().getFunctionLoaderCount();i++) 
-        {
-
-            FunctionLoader loader = globals.getFunctionManager().getFunctionLoader(i);
-            
-            if (loader instanceof FileFunctionLoader) 
-            {
-                FileFunctionLoader ffl = (FileFunctionLoader)loader;
-                
-                for (int pathIdx=0;pathIdx<ffl.getPathCount();pathIdx++) 
-                {
-                    File path = ffl.getPath(pathIdx).getAbsoluteFile();
-                        
-                    pathVector.add(path.toString());                    
-                }                                        
-            }
-        }        
-        
-        
-        int    size       = pathVector.size();
-        String path       = "";
-        String line       = "";
-
-        ErrorLogger.debugLine("working directory: "+globals.getWorkingDirectory().getAbsolutePath());
-
-        try 
-        {
-            
-            // create file to store all class-, m-files and images
-            File funcFile = new File(globals.getWorkingDirectory().getAbsoluteFile() +
-			                         File.separator + "bin" +
-                                     File.separator + "jmathlib" +
-                                     File.separator + "webFunctionsList.dat");
-			BufferedWriter outWriter = new BufferedWriter( new FileWriter(funcFile));
-            ErrorLogger.debugLine("funcFile ="+funcFile.toString());
-
-
-            /* The first line of the file is a comment */
-            line = "# created with createFunctionsList.java";
-            outWriter.write(line, 0, line.length());
-			outWriter.newLine();
-            line = "# This is a generated file. DO NOT EDIT!";
-            outWriter.write(line, 0, line.length());
-			outWriter.newLine();
-            
-	        // search through all serach directories
-	        for(int n = 0; n < size; n++)
-	        {
-	            path = (String)pathVector.elementAt(n);
-	            ErrorLogger.debugLine("path func manager = "+path);
-	            
-	           	File dir       = new File(path);
-				String[] files = dir.list();
-
-                // do not use empty directories
-                if (files != null)
-                {
-                    for(int fileNo = 0; (fileNo < files.length); fileNo++)
-                    {
-                        line = path + "/" + files[fileNo];
-                    
-                        // use unix-style file separator as default
-                        line = line.replace('\\', '/'); 
-
-                        // do not put CVS directories and files into functions list
-                        if (!line.endsWith("/CVS")            &&
-                            !line.endsWith("/CVS/Entries")    &&
-                            !line.endsWith("/CVS/Root")       &&
-                            !line.endsWith("/CVS/Repository") &&
-                            !line.contains(".svn")              )
-                        {
-                            // remove preceding absolute path
-                            line = line.substring((globals.getWorkingDirectory().getAbsolutePath()+"/bin/").length());
-
-                            ErrorLogger.debugLine("path = "+ line);
-
-                            // also remove unwanted directories
-                            if (!line.startsWith("jmathlibtests") && 
-                                !line.startsWith("jmathlib/tools")   )
-                            {
-                                // write relative path and filename to dat-file
-                                outWriter.write(line, 0, line.length());
-                                outWriter.newLine();
-                            }
-                        }
-
-                    }
-                }
-                else
-                    ErrorLogger.debugLine("directory is empty");
-	        }
-			outWriter.close();
-
-        }
-        catch (Exception e)
-        {
-            ErrorLogger.debugLine("createFunctionsList");
-            e.printStackTrace();
-        }
-        return DoubleNumberToken.one;		
-
-	} // end evaluate
-}
-
-/*
-@...
-system
-@...
-createfunctionslist()
-@...
-Creates a file called webFunctionList.dat containing the name 
-of all external functions.
-This functions is used when running JMathLib as an applet.
-@...
-@...
-createfunctionslist()
-@...
-path, setpath, rmpath
-*/
-

Deleted: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java	2009-01-29 20:26:00 UTC (rev 792)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/createfunctionslist.java	2009-01-30 18:21:19 UTC (rev 793)
@@ -1,151 +0,0 @@
-package jmathlib.toolbox.jmathlib.system;
-
-/* This file is part or JMathLib 
-
-
-   Author: Stefan Mueller 2002/03/31
-*/
-
-//ToDo: do not include empty directories in the list
-//       relative path names
-
-import jmathlib.core.tokens.*;
-import jmathlib.core.tokens.numbertokens.DoubleNumberToken;
-import jmathlib.core.interpreter.*;
-import jmathlib.core.functions.FunctionLoader;
-import jmathlib.core.functions.FileFunctionLoader;
-import jmathlib.core.functions.ExternalFunction;
-import java.util.Vector;
-import java.io.*;
-
-/**An external function for creating a filelist used by the class
-   loader for java applets      */
-public class createfunctionslist extends ExternalFunction
-{
-
-	public OperandToken evaluate(Token[] operands, GlobalValues globals)
-	{
-
-        Vector pathVector = new Vector();
-        
-        // get all search paths from all file loaders
-        for (int i=0;i<globals.getFunctionManager().getFunctionLoaderCount();i++) 
-        {
-
-            FunctionLoader loader = globals.getFunctionManager().getFunctionLoader(i);
-            
-            if (loader instanceof FileFunctionLoader) 
-            {
-                FileFunctionLoader ffl = (FileFunctionLoader)loader;
-                
-                for (int pathIdx=0;pathIdx<ffl.getPathCount();pathIdx++) 
-                {
-                    File path = ffl.getPath(pathIdx).getAbsoluteFile();
-                        
-                    pathVector.add(path.toString());                    
-                }                                        
-            }
-        }        
-        
-        
-        int    size       = pathVector.size();
-        String path       = "";
-        String line       = "";
-
-        ErrorLogger.debugLine("working directory: "+globals.getWorkingDirectory().getAbsolutePath());
-
-        try 
-        {
-            
-            // create file to store all class-, m-files and images
-            File funcFile = new File(globals.getWorkingDirectory().getAbsoluteFile() +
-			                         File.separator + "bin" +
-                                     File.separator + "jmathlib" +
-                                     File.separator + "webFunctionsList.dat");
-			BufferedWriter outWriter = new BufferedWriter( new FileWriter(funcFile));
-            ErrorLogger.debugLine("funcFile ="+funcFile.toString());
-
-
-            /* The first line of the file is a comment */
-            line = "# created with createFunctionsList.java";
-            outWriter.write(line, 0, line.length());
-			outWriter.newLine();
-            line = "# This is a generated file. DO NOT EDIT!";
-            outWriter.write(line, 0, line.length());
-			outWriter.newLine();
-            
-	        // search through all serach directories
-	        for(int n = 0; n < size; n++)
-	        {
-	            path = (String)pathVector.elementAt(n);
-	            ErrorLogger.debugLine("path func manager = "+path);
-	            
-	           	File dir       = new File(path);
-				String[] files = dir.list();
-
-                // do not use empty directories
-                if (files != null)
-                {
-                    for(int fileNo = 0; (fileNo < files.length); fileNo++)
-                    {
-                        line = path + "/" + files[fileNo];
-                    
-                        // use unix-style file separator as default
-                        line = line.replace('\\', '/'); 
-
-                        // do not put CVS directories and files into functions list
-                        if (!line.endsWith("/CVS")            &&
-                            !line.endsWith("/CVS/Entries")    &&
-                            !line.endsWith("/CVS/Root")       &&
-                            !line.endsWith("/CVS/Repository") &&
-                            !line.contains(".svn")              )
-                        {
-                            // remove preceding absolute path
-                            line = line.substring((globals.getWorkingDirectory().getAbsolutePath()+"/bin/").length());
-
-                            ErrorLogger.debugLine("path = "+ line);
-
-                            // also remove unwanted directories
-                            if (!line.startsWith("jmathlibtests") && 
-                                !line.startsWith("jmathlib/tools")   )
-                            {
-                                // write relative path and filename to dat-file
-                                outWriter.write(line, 0, line.length());
-                                outWriter.newLine();
-                            }
-                        }
-
-                    }
-                }
-                else
-                    ErrorLogger.debugLine("directory is empty");
-	        }
-			outWriter.close();
-
-        }
-        catch (Exception e)
-        {
-            ErrorLogger.debugLine("createFunctionsList");
-            e.printStackTrace();
-        }
-        return DoubleNumberToken.one;		
-
-	} // end evaluate
-}
-
-/*
-@...
-system
-@...
-createfunctionslist()
-@...
-Creates a file called webFunctionList.dat containing the name 
-of all external functions.
-This functions is used when running JMathLib as an applet.
-@...
-@...
-createfunctionslist()
-@...
-path, setpath, rmpath
-*/
-


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

[Mathlib-commitlog] SF.net SVN: mathlib:[796] JMathLib/trunk/src/jmathlib/toolbox/jmathlib/ system

From: <st_mueller@us...> - 2009-01-30 19:02

Revision: 796
          http://mathlib.svn.sourceforge.net/mathlib/?rev=796&view=rev
Author:   st_mueller
Date:     2009-01-30 19:02:16 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------
changed handling of preferences/properties

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/checkforupdates.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/update.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/ver.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/version.java

Added Paths:
-----------
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getjmathlibproperty.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setjmathlibproperty.java

Removed Paths:
-------------
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getglobalproperty.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getlocalproperty.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setglobalproperty.java
    JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setlocalproperty.java

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/checkforupdates.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/checkforupdates.java	2009-01-30 18:59:26 UTC (rev 795)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/checkforupdates.java	2009-01-30 19:02:16 UTC (rev 796)
@@ -25,7 +25,7 @@
         String updateSiteS = "http://www.jmathlib.de/checkForUpdates/";
  		boolean silentB    = false;
         
-        s = globals.getInterpreter().prefs.getLocalProperty("update.site.primary");
+        s = globals.getProperty("update.site.primary");
         if (s != null)
             updateSiteS = s;
         
@@ -52,13 +52,13 @@
             globals.getInterpreter().displayText("Checking for Updates at "+updateSiteS);
         
         
-        String[] lastUpdateS = globals.getInterpreter().prefs.getLocalProperty("update.date.last").split("/");
+        String[] lastUpdateS = globals.getProperty("update.date.last").split("/");
         int year  = Integer.parseInt(lastUpdateS[0]);
         int month = Integer.parseInt(lastUpdateS[1])-1;
         int day   = Integer.parseInt(lastUpdateS[2]);
         //getInterpreter().displayText("check:"+year+"/"+month+"/"+day);
                 
-        int intervall = Integer.parseInt(globals.getInterpreter().prefs.getLocalProperty("update.intervall"));
+        int intervall = Integer.parseInt(globals.getProperty("update.intervall"));
 
         GregorianCalendar calFile = new GregorianCalendar(year,month,day);
         GregorianCalendar calCur  = new GregorianCalendar();
@@ -142,7 +142,7 @@
                 System.out.println("checkForUpdates: Properties error");    
             }
 
-            String[] localVersionS  = globals.getInterpreter().prefs.getLocalProperty("jmathlib.version").replace("/",".").split("\\.");
+            String[] localVersionS  = globals.getProperty("jmathlib.version").replace("/",".").split("\\.");
             String[] webVersionS    = props.getProperty("jmathlib.version").replace("/",".").split("\\.");
 
             // build version number of local version
@@ -172,12 +172,12 @@
             {
 
                 // set marker for next startup
-                globals.getInterpreter().prefs.setLocalProperty("update.newversionavailable","yes");
+                globals.setProperty("update.newversionavailable","yes");
                 
                 s = props.getProperty("update.newversionavailable.message01");
                 if (s!=null)
                 {
-                    globals.getInterpreter().prefs.setLocalProperty("update.newversionavailable.message01", s);
+                    globals.setProperty("update.newversionavailable.message01", s);
                     globals.getInterpreter().displayText(s);
                 }
                 else
@@ -187,7 +187,7 @@
                 s = props.getProperty("update.newversionavailable.message02");
                 if (s!=null)
                 {
-                    globals.getInterpreter().prefs.setLocalProperty("update.newversionavailable.message02", s);
+                    globals.setProperty("update.newversionavailable.message02", s);
                     globals.getInterpreter().displayText(s);
                 }
             }
@@ -219,23 +219,23 @@
             String checkedDate  = Integer.toString(cal.get(Calendar.YEAR))     + "/"
                                 + Integer.toString(cal.get(Calendar.MONTH)+1)  + "/"
                                 + Integer.toString(cal.get(Calendar.DAY_OF_MONTH));
-            globals.getInterpreter().prefs.setLocalProperty("update.date.last", checkedDate);
+            globals.setProperty("update.date.last", checkedDate);
 
         
             // update link to primary update-site
             s= props.getProperty("update.site.primary");
             if (s!=null)
-                globals.getInterpreter().prefs.setLocalProperty("update.site.primary",s);
+                globals.setProperty("update.site.primary",s);
 
             // update link to backup update-site
             s= props.getProperty("update.site.backup");
             if (s!=null)
-                globals.getInterpreter().prefs.setLocalProperty("update.site.backup",s);
+                globals.setProperty("update.site.backup",s);
 
             // update message of the day
             s= props.getProperty("message.of.the.day");
             if (s!=null)
-                globals.getInterpreter().prefs.setLocalProperty("message.of.the.day",s);
+                globals.setProperty("message.of.the.day",s);
 
         }
         

Deleted: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getglobalproperty.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getglobalproperty.java	2009-01-30 18:59:26 UTC (rev 795)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getglobalproperty.java	2009-01-30 19:02:16 UTC (rev 796)
@@ -1,52 +0,0 @@
-package jmathlib.toolbox.jmathlib.system;
-
-import jmathlib.core.functions.ExternalFunction;
-import jmathlib.core.interpreter.GlobalValues;
-import jmathlib.core.tokens.Token;
-import jmathlib.core.tokens.CharToken;
-import jmathlib.core.tokens.OperandToken;
-
-/**External function to get a enviroment variable*/
-public class getglobalproperty extends ExternalFunction
-{
-	/**Returns an enviroment variable
-	@param operand[0] = the name of the variable
-	@param operand[1] = a default value (optional)
-	@return the enviroment value*/
-	public OperandToken evaluate(Token[] operands, GlobalValues globals)
-	{
-		OperandToken result = null;
-		
-        if (getNArgIn(operands)!=1)
-            throwMathLibException("getglobalproperty: number of arguments != 1");
-        
-
-        if (!(operands[0] instanceof CharToken))
-            throwMathLibException("getglobalproperty: number of arguments != 1");
-
-			String name = operands[0].toString();
-			String defaultVal = "";
-			
-		
-			String property = globals.getInterpreter().prefs.getGlobalProperty(name);
-			
-			result = new CharToken(property);
-			
-		return result;
-	}
-}
-
-/*
-@...
-system
-@...
-GETENV(variablename)
-@...
-Returns the value of the enviromental variable variablename.
-@...
-@...
-getlocal("HOME")= "/home/user"
-@...
-getenv, getglobalproperty, setlocalproperty, setglobalproperty
-*/
-

Added: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getjmathlibproperty.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getjmathlibproperty.java	                        (rev 0)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getjmathlibproperty.java	2009-01-30 19:02:16 UTC (rev 796)
@@ -0,0 +1,52 @@
+package jmathlib.toolbox.jmathlib.system;
+
+import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
+import jmathlib.core.tokens.Token;
+import jmathlib.core.tokens.CharToken;
+import jmathlib.core.tokens.OperandToken;
+
+/**External function to get a enviroment variable*/
+public class getjmathlibproperty extends ExternalFunction
+{
+	/**Returns an enviroment variable
+	@param operand[0] = the name of the variable
+	@param operand[1] = a default value (optional)
+	@return the enviroment value*/
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
+	{
+		OperandToken result = null;
+		
+        if (getNArgIn(operands)!=1)
+            throwMathLibException("getjmathlibproperty: number of arguments != 1");
+        
+
+        if (!(operands[0] instanceof CharToken))
+            throwMathLibException("getjmathlibproperty: number of arguments != 1");
+
+			String name = operands[0].toString();
+			String defaultVal = "";
+			
+		
+			String property = globals.getProperty(name);
+			
+			result = new CharToken(property);
+			
+		return result;
+	}
+}
+
+/*
+@GROUP
+system
+@SYNTAX
+getjmathlibproperty(variablename)
+@DOC
+Returns the value of the enviromental variable variablename.
+@NOTES
+@EXAMPLES
+getlocal("HOME")= "/home/user"
+@SEE
+getenv, setjmathlibproperty
+*/
+

Deleted: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getlocalproperty.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getlocalproperty.java	2009-01-30 18:59:26 UTC (rev 795)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/getlocalproperty.java	2009-01-30 19:02:16 UTC (rev 796)
@@ -1,52 +0,0 @@
-package jmathlib.toolbox.jmathlib.system;
-
-import jmathlib.core.functions.ExternalFunction;
-import jmathlib.core.interpreter.GlobalValues;
-import jmathlib.core.tokens.Token;
-import jmathlib.core.tokens.CharToken;
-import jmathlib.core.tokens.OperandToken;
-
-/**External function to get a enviroment variable*/
-public class getlocalproperty extends ExternalFunction
-{
-	/**Returns an enviroment variable
-	@param operand[0] = the name of the variable
-	@param operand[1] = a default value (optional)
-	@return the enviroment value*/
-	public OperandToken evaluate(Token[] operands, GlobalValues globals)
-	{
-		OperandToken result = null;
-		
-        if (getNArgIn(operands)!=1)
-            throwMathLibException("getlocalproperty: number of arguments != 1");
-        
-
-        if (!(operands[0] instanceof CharToken))
-            throwMathLibException("getlocalproperty: number of arguments != 1");
-
-			String name = operands[0].toString();
-			String defaultVal = "";
-			
-		
-			String property = globals.getInterpreter().prefs.getLocalProperty(name);
-			
-			result = new CharToken(property);
-			
-		return result;
-	}
-}
-
-/*
-@...
-system
-@...
-GETENV(variablename)
-@...
-Returns the value of the enviromental variable variablename.
-@...
-@...
-getlocal("HOME")= "/home/user"
-@...
-getenv, getglobalproperty, setlocalproperty, setglobalproperty
-*/
-

Deleted: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setglobalproperty.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setglobalproperty.java	2009-01-30 18:59:26 UTC (rev 795)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setglobalproperty.java	2009-01-30 19:02:16 UTC (rev 796)
@@ -1,51 +0,0 @@
-package jmathlib.toolbox.jmathlib.system;
-
-import jmathlib.core.functions.ExternalFunction;
-import jmathlib.core.interpreter.GlobalValues;
-import jmathlib.core.tokens.Token;
-import jmathlib.core.tokens.CharToken;
-import jmathlib.core.tokens.OperandToken;
-
-/**External function to get a enviroment variable*/
-public class setglobalproperty extends ExternalFunction
-{
-	/**Returns an enviroment variable
-	@param operand[0] = the name of the variable
-	@param operand[1] = a default value (optional)
-	@return the enviroment value*/
-	public OperandToken evaluate(Token[] operands, GlobalValues globals)
-	{
-		OperandToken result = null;
-		
-        if (getNArgIn(operands)!=2)
-            throwMathLibException("setglobalproperty: number of arguments != 2");
-        
-
-        if ( (!(operands[0] instanceof CharToken)) &&
-             (!(operands[1] instanceof CharToken))    )
-            throwMathLibException("setglobalproperty: arguments must be strings");
-
-			String name = operands[0].toString();
-            String prop = operands[1].toString();
-		
-            globals.getInterpreter().prefs.setGlobalProperty(name, prop);
-			
-			
-		return result;
-	}
-}
-
-/*
-@...
-system
-@...
-setglobalproperty(property name, value)
-@...
-Returns the value of the enviromental variable variablename.
-@...
-@...
-GETENV("HOME")= "/home/user"
-@...
-setlocalproperty, getlocalproperty, getglobalproperty
-*/
-

Copied: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setjmathlibproperty.java (from rev 713, JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setglobalproperty.java)
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setjmathlibproperty.java	                        (rev 0)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setjmathlibproperty.java	2009-01-30 19:02:16 UTC (rev 796)
@@ -0,0 +1,51 @@
+package jmathlib.toolbox.jmathlib.system;
+
+import jmathlib.core.functions.ExternalFunction;
+import jmathlib.core.interpreter.GlobalValues;
+import jmathlib.core.tokens.Token;
+import jmathlib.core.tokens.CharToken;
+import jmathlib.core.tokens.OperandToken;
+
+/**External function to get a enviroment variable*/
+public class setjmathlibproperty extends ExternalFunction
+{
+	/**Returns an enviroment variable
+	@param operand[0] = the name of the variable
+	@param operand[1] = a default value (optional)
+	@return the enviroment value*/
+	public OperandToken evaluate(Token[] operands, GlobalValues globals)
+	{
+		OperandToken result = null;
+		
+        if (getNArgIn(operands)!=2)
+            throwMathLibException("setjmathlibproperty: number of arguments != 2");
+        
+
+        if ( (!(operands[0] instanceof CharToken)) &&
+             (!(operands[1] instanceof CharToken))    )
+            throwMathLibException("setjmathlibproperty: arguments must be strings");
+
+			String name = operands[0].toString();
+            String prop = operands[1].toString();
+		
+            globals.setProperty(name, prop);
+			
+			
+		return result;
+	}
+}
+
+/*
+@GROUP
+system
+@SYNTAX
+setjmathlibproperty(property name, value)
+@DOC
+Returns the value of the enviromental variable variablename.
+@NOTES
+@EXAMPLES
+GETENV("HOME")= "/home/user"
+@SEE
+getjmathlibproperty, getenv
+*/
+

Deleted: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setlocalproperty.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setlocalproperty.java	2009-01-30 18:59:26 UTC (rev 795)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/setlocalproperty.java	2009-01-30 19:02:16 UTC (rev 796)
@@ -1,51 +0,0 @@
-package jmathlib.toolbox.jmathlib.system;
-
-import jmathlib.core.functions.ExternalFunction;
-import jmathlib.core.interpreter.GlobalValues;
-import jmathlib.core.tokens.Token;
-import jmathlib.core.tokens.CharToken;
-import jmathlib.core.tokens.OperandToken;
-
-/**External function to get a enviroment variable*/
-public class setlocalproperty extends ExternalFunction
-{
-	/**Returns an enviroment variable
-	@param operand[0] = the name of the variable
-	@param operand[1] = a default value (optional)
-	@return the enviroment value*/
-	public OperandToken evaluate(Token[] operands, GlobalValues globals)
-	{
-		OperandToken result = null;
-		
-        if (getNArgIn(operands)!=2)
-            throwMathLibException("setlocalproperty: number of arguments != 2");
-        
-
-        if ( (!(operands[0] instanceof CharToken)) &&
-             (!(operands[1] instanceof CharToken))    )
-            throwMathLibException("setlocalproperty: arguments must be strings");
-
-			String name = operands[0].toString();
-            String prop = operands[1].toString();
-		
-            globals.getInterpreter().prefs.setLocalProperty(name, prop);
-			
-			
-		return result;
-	}
-}
-
-/*
-@...
-system
-@...
-setlocalproperty(property name, value)
-@...
-Returns the value of the enviromental variable variablename.
-@...
-@...
-GETENV("HOME")= "/home/user"
-@...
-setglobalproperty
-*/
-

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/update.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/update.java	2009-01-30 18:59:26 UTC (rev 795)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/update.java	2009-01-30 19:02:16 UTC (rev 796)
@@ -20,11 +20,11 @@
  		globals.getInterpreter().displayText("UPDATING JMathLib\n");
 
         // get update site of jmathlib
-        String updateSiteS   = globals.getInterpreter().prefs.getLocalProperty("update.site.primary");
+        String updateSiteS   = globals.getProperty("update.site.primary");
         globals.getInterpreter().displayText("update site: "+updateSiteS);
 
         // get local version of jmathlib
-        String localVersionS = globals.getInterpreter().prefs.getLocalProperty("jmathlib.version");
+        String localVersionS = globals.getProperty("jmathlib.version");
         localVersionS = localVersionS.replaceAll("/", ".");
         globals.getInterpreter().displayText("current version: "+localVersionS);
 
@@ -175,7 +175,7 @@
                     String propS = s.substring(5).trim();
                     globals.getInterpreter().displayText("new property: >"+propS+"<");
                     String[]   p = propS.split("=");
-                    globals.getInterpreter().prefs.setLocalProperty(p[0],p[1]);
+                    globals.setProperty(p[0],p[1]);
                 }
                 else
                 {

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/ver.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/ver.java	2009-01-30 18:59:26 UTC (rev 795)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/ver.java	2009-01-30 19:02:16 UTC (rev 796)
@@ -14,19 +14,19 @@
  		    
 		globals.getInterpreter().displayText("Version information for JMathLib");
 
-        s = globals.getInterpreter().prefs.getLocalProperty("jmathlib.version");
+        s = globals.getProperty("jmathlib.version");
         globals.getInterpreter().displayText("version: "+s);
 
-        s = globals.getInterpreter().prefs.getLocalProperty("jmathlib.release.date");
+        s = globals.getProperty("jmathlib.release.date");
         globals.getInterpreter().displayText("release date: "+s);
 
-        s = globals.getInterpreter().prefs.getLocalProperty("jmathlib.release.name");
+        s = globals.getProperty("jmathlib.release.name");
         globals.getInterpreter().displayText("release name: "+s);
 
-        s = globals.getInterpreter().prefs.getLocalProperty("jmathlib.release.description");
+        s = globals.getProperty("jmathlib.release.description");
         globals.getInterpreter().displayText("release description: "+s);
 
-        s = globals.getInterpreter().prefs.getLocalProperty("jmathlib.copyright");
+        s = globals.getProperty("jmathlib.copyright");
         globals.getInterpreter().displayText(s);
 
 		return null;		

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/version.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/version.java	2009-01-30 18:59:26 UTC (rev 795)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/version.java	2009-01-30 19:02:16 UTC (rev 796)
@@ -14,19 +14,19 @@
  		    
 		globals.getInterpreter().displayText("Version information for JMathLib");
 
-        s = globals.getInterpreter().prefs.getLocalProperty("jmathlib.version");
+        s = globals.getProperty("jmathlib.version");
         globals.getInterpreter().displayText("version: "+s);
 
-        s = globals.getInterpreter().prefs.getLocalProperty("jmathlib.release.date");
+        s = globals.getProperty("jmathlib.release.date");
         globals.getInterpreter().displayText("release date: "+s);
 
-        s = globals.getInterpreter().prefs.getLocalProperty("jmathlib.release.name");
+        s = globals.getProperty("jmathlib.release.name");
         globals.getInterpreter().displayText("release name: "+s);
 
-        s = globals.getInterpreter().prefs.getLocalProperty("jmathlib.release.description");
+        s = globals.getProperty("jmathlib.release.description");
         globals.getInterpreter().displayText("release description: "+s);
 
-        s = globals.getInterpreter().prefs.getLocalProperty("jmathlib.copyright");
+        s = globals.getProperty("jmathlib.copyright");
         globals.getInterpreter().displayText(s);
 
 		return null;		


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

[Mathlib-commitlog] SF.net SVN: mathlib:[795] JMathLib/trunk/JMathLib.properties

From: <st_mueller@us...> - 2009-01-30 18:59

Revision: 795
          http://mathlib.svn.sourceforge.net/mathlib/?rev=795&view=rev
Author:   st_mueller
Date:     2009-01-30 18:59:26 +0000 (Fri, 30 Jan 2009)

Log Message:
-----------


Modified Paths:
--------------
    JMathLib/trunk/JMathLib.properties

Modified: JMathLib/trunk/JMathLib.properties
===================================================================
--- JMathLib/trunk/JMathLib.properties	2009-01-30 18:22:45 UTC (rev 794)
+++ JMathLib/trunk/JMathLib.properties	2009-01-30 18:59:26 UTC (rev 795)
@@ -3,13 +3,12 @@
 #
 # (c) stefan@...
 
-
 # current version of JMathLib
-jmathlib.version=0.9.3
-jmathlib.release.date=2009/01/11
-jmathlib.release.name=release V0.9.3
+jmathlib.version=0.9.4
+jmathlib.release.date=2009/01/30
+jmathlib.release.name=release V0.9.4
 jmathlib.release.description=mayer release
-jmathlib.copyright=(c) 2007,2008, 2009 Stefan Mueller and others
+jmathlib.copyright=(c) 2007, 2008, 2009 Stefan Mueller and others
 
 # website
 jmathlib.website.primary=http://www.jmathlib.de
@@ -25,6 +24,7 @@
 update.errors=0
 update.message="welcome to the new version of JMathLib"
 
+
 # Messages to the user
 jmathlib.messages.urgent=""
 jmathlib.messages.immediately=""


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

[Mathlib-commitlog] SF.net SVN: mathlib:[791] JMathLib/trunk/doc/src/doc.xml

From: <st_mueller@us...> - 2009-01-29 20:02

Revision: 791
          http://mathlib.svn.sourceforge.net/mathlib/?rev=791&view=rev
Author:   st_mueller
Date:     2009-01-29 20:01:58 +0000 (Thu, 29 Jan 2009)

Log Message:
-----------
release of JMathLib 0.9.4

Modified Paths:
--------------
    JMathLib/trunk/doc/src/doc.xml

Modified: JMathLib/trunk/doc/src/doc.xml
===================================================================
--- JMathLib/trunk/doc/src/doc.xml	2009-01-29 20:00:49 UTC (rev 790)
+++ JMathLib/trunk/doc/src/doc.xml	2009-01-29 20:01:58 UTC (rev 791)
@@ -74,11 +74,11 @@
 </para>
 </abstract>
 
-<pubdate>January 11, 2009</pubdate>
+<pubdate>January 29, 2009</pubdate>
 
 
 <releaseinfo><para><emphasis>
-This release is connected to JMathLib in Version 0.9.3 and following versions
+This release is connected to JMathLib in Version 0.9.4 and following versions
 </emphasis></para></releaseinfo>
 
 </bookinfo>


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

[Mathlib-commitlog] SF.net SVN: mathlib:[790] JMathLib/trunk/JMathLib.local.properties

From: <st_mueller@us...> - 2009-01-29 20:00

Revision: 790
          http://mathlib.svn.sourceforge.net/mathlib/?rev=790&view=rev
Author:   st_mueller
Date:     2009-01-29 20:00:49 +0000 (Thu, 29 Jan 2009)

Log Message:
-----------


Modified Paths:
--------------
    JMathLib/trunk/JMathLib.local.properties

Modified: JMathLib/trunk/JMathLib.local.properties
===================================================================
--- JMathLib/trunk/JMathLib.local.properties	2009-01-26 20:11:48 UTC (rev 789)
+++ JMathLib/trunk/JMathLib.local.properties	2009-01-29 20:00:49 UTC (rev 790)
@@ -1,10 +1,10 @@
 #JMathLib local property file
 #Sat Nov 30 20:00:00 CEST 2008
 update.auto=yes
-jmathlib.release.date=2009/01/11
+jmathlib.release.date=2009/01/29
 update.errors=0
 update.site.primary=http://www.jmathlib.de/checkForUpdates/
 update.site.backup=http://mathlib.sourceforge.net/checkForUpdates/
 update.date.next=00.00.00
 update.intervall=1
-update.date.last=2009/01/11
+update.date.last=2009/01/29


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

[Mathlib-commitlog] SF.net SVN: mathlib:[789] JMathLib/trunk/src/jmathlib/core/interpreter/ Variable.java

From: <st_mueller@us...> - 2009-01-26 20:11

Revision: 789
          http://mathlib.svn.sourceforge.net/mathlib/?rev=789&view=rev
Author:   st_mueller
Date:     2009-01-26 20:11:48 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
added more comments

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/core/interpreter/Variable.java

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Variable.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Variable.java	2009-01-26 20:04:13 UTC (rev 788)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Variable.java	2009-01-26 20:11:48 UTC (rev 789)
@@ -23,7 +23,8 @@
     }
 
     /**constructor containing a variable name
-     * @param _name*/
+     * @param _name
+     */
     public Variable(String _name)
     {
         super();
@@ -33,25 +34,13 @@
 
     /**constructor containing the variables name and data
      * @param _name
-     * @param _data*/
+     * @param _data
+     */
     public Variable(String _name, OperandToken  _data)
     {
         super();
         name = _name;
 		data = _data;
-
-        //if(_data != null)
-        //{
-        //    OperandToken subTree = null;
-        //    //if the item is an Expression node then just set the data value
-        //    //without creating a new node
-        //    if(_data instanceof Expression)
-        //        subTree = ((Expression)_data);
-        //    else if(_data instanceof OperandToken)
-        //    	subTree = ((OperandToken)_data);
-        //
-        //    data = subTree;
-        //}
     }
 
     /**Assign a new value to the variable
@@ -84,19 +73,18 @@
         //    equal = super.equals(_data);
 
         if(_data instanceof Variable)
-            equal = this.name.equalsIgnoreCase(((Variable)_data).getName());
+            equal = this.name.equals(((Variable)_data).getName());
         else
             equal = super.equals(_data);
 
         return equal;
     }
 
-    /**Converts the variable to a string.
+    /**Converts the variable into a string.
      * @return
      */
     public String toString()
     {
-        //Errors.throwMathLibException("Variable");
         if(data == null)
             return null;
         else
@@ -109,7 +97,9 @@
     	return toString();
     }
 
-    /**Returns the variables name*/
+    /**Returns the variables name
+     * @return
+     */
     public String getName()
     {
     	return name;


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

[Mathlib-commitlog] SF.net SVN: mathlib:[788] JMathLib/trunk/src/jmathlib/core/interpreter/ GlobalValues.java

From: <st_mueller@us...> - 2009-01-26 20:04

Revision: 788
          http://mathlib.svn.sourceforge.net/mathlib/?rev=788&view=rev
Author:   st_mueller
Date:     2009-01-26 20:04:13 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
added more comments

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java	2009-01-26 20:00:09 UTC (rev 787)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/GlobalValues.java	2009-01-26 20:04:13 UTC (rev 788)
@@ -1,3 +1,12 @@
+/* 
+ * This file is part or JMathLib 
+ * 
+ * Check it out at http://www.jmathlib.de
+ *
+ * Author:   
+ * (c) 2002-2009   
+ */
+
 package jmathlib.core.interpreter;
 
 import java.io.*;
@@ -26,9 +35,6 @@
     /**Object to control function usage*/
     private jmathlib.core.functions.FunctionManager functionManager;
 
-    /**Class Loader for loading classes for handling casting*/
-    //static transient private MathLib.Casts.CastClassLoader castClassLoader; 
-
     /**A pointer to the interpreter itself*/
     private Interpreter interpreter;
     
@@ -38,28 +44,24 @@
     /**Object to control plugins */
     private jmathlib.plugins.PluginsManager pluginsManager;     
 
-    /**sets whether to write debug lines to console and log files*/
-    //private boolean debug = true;
-    
     /**stores the number format for displaying the number*/
-    public /*static transient*/ NumberFormat numFormat = new DecimalFormat("0.0000", new DecimalFormatSymbols(Locale.ENGLISH));
+    public NumberFormat numFormat = new DecimalFormat("0.0000", new DecimalFormatSymbols(Locale.ENGLISH));
 
     /**Initialises the global values
-       @param _interpreter = the Interpreter object
-       @param _runningStandalone = true if this was run from an application*/
+     * @param _interpreter = the Interpreter object
+     * @param _runningStandalone = true if this was run from an application
+     */
     public GlobalValues(Interpreter _interpreter, boolean _runningStandalone, Applet applet)
     {
+        // the list of contexts
         contextList     = new ContextList();
 
+        // the function manager for loading m-files class-files
         functionManager = new jmathlib.core.functions.FunctionManager(_runningStandalone, applet);
         
+        // the graphics manager for plotting functions
         graphicsManager = new jmathlib.core.graphics.GraphicsManager();
 
-        //if(_runningStandalone)
-        //    castClassLoader = new MathLib.Casts.CastClassLoader("." + File.separator, flags);
-        //else
-        //    castClassLoader = null;
-            
         //set up a pointer to the interpreter object
         interpreter = _interpreter;
 
@@ -136,8 +138,8 @@
         return contextList;
     }
 
-    /**@return the interpreter object
-     * @return
+    /**returns the interpreter object
+     * @return pointer to Interpreter
      */
     public Interpreter getInterpreter()
     {


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

[Mathlib-commitlog] SF.net SVN: mathlib:[787] JMathLib/trunk/ChangeLog.txt

From: <st_mueller@us...> - 2009-01-26 20:00

Revision: 787
          http://mathlib.svn.sourceforge.net/mathlib/?rev=787&view=rev
Author:   st_mueller
Date:     2009-01-26 20:00:09 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------


Modified Paths:
--------------
    JMathLib/trunk/ChangeLog.txt

Modified: JMathLib/trunk/ChangeLog.txt
===================================================================
--- JMathLib/trunk/ChangeLog.txt	2009-01-26 19:52:50 UTC (rev 786)
+++ JMathLib/trunk/ChangeLog.txt	2009-01-26 20:00:09 UTC (rev 787)
@@ -1,11 +1,5 @@
---  Mnemonics
---
---  + Added (or created) file or directory
---  - Removed file or directory
---  * Modified file
---  ! Bug found
---  # Bug fixed
 
+                ChangeLog of JMathLib
 
 ---- Functional Changes:  version 0.9.2 -> 0.x.x ------------------------------
 New functions:
@@ -13,59 +7,64 @@
 Updated functions:
 
 ---- HISTORY ------------------------------------------------------------------
-2009/01/xx
-stefan *
+2009/01/xx stefan:
 
-2009/01/09
-stefan * changed the parser, now parsing of     cd somedirectory     is possible. 
-         Also cd("somedirectory") still works.
+2009/01/26 stefan: changed MathLibException into JMathLibException
+
+2009/01/25 stefan: JMathLib has not been thread save for more than one
+                   instance of Interpreter.class. I removed the static
+                   variables in GlobalValues and added a GlobalVaues-pointer
+                   to all evaluate(....) methods.
+
+2009/01/09 stefan: Changed the parser, now parsing of     cd somedirectory     
+                   is possible. Also cd("somedirectory") still works.
          
-2009/01/04
-stefan + added the euler number to VariableToken.java as predefined variable
-stefan + pi.int documentation for pi
-stefan + e.int documentation for euler number
+2009/01/04 stefan: added the euler number to VariableToken.java as predefined 
+                   variable
+2009/01/04 stefan: pi.int documentation for pi
+2009/01/04 stefan: e.int documentation for euler number
 
-2008/12/31
-stefan + toolbox/jmathlib/system/quit.java
-stefan + toolbox/jmathlib/system/exit.m
-stefan + toolbox/jmathlib/io/pwd.java
+2008/12/31 stefan: added toolbox/jmathlib/system/quit.java
+2008/12/31 stefan: added toolbox/jmathlib/system/exit.m
+2008/12/31 stefan: added toolbox/jmathlib/io/pwd.java
 
-2008/12/30
-stefan + jmathlib/ui/text/TextUI.java first version of textual user interface.
+2008/12/30 stefan: added jmathlib/ui/text/TextUI.java first version of textual 
+                   user interface.
 
-2008/12/28
-stefan * jmathlib/ui/applet/JMathLibGUI.java code cleanup and bugfixing
+2008/12/28 stefan: jmathlib/ui/applet/JMathLibGUI.java code cleanup and bugfixing
 
-2008/12/27
-stefan + moved code from MFileWebLoader.java to WebFunctionLoader.java
-stefan - removed MFileWebLoader.java
-stefan + plusplus.int describing the ++ command
-stefan + minusminus.int describing the -- command
-stefan # DoubleNumberToken.java support for [1,0,3].^0 = [1,1,1] 
-         and 0.^[1,0,2] = [0,1,0]
+2008/12/27 stefan: moved code from MFileWebLoader.java to WebFunctionLoader.java
+2008/12/27 stefan: removed MFileWebLoader.java
+2008/12/27 stefan: added plusplus.int describing the ++ command
+2008/12/27 stefan: added minusminus.int describing the -- command
+2008/12/27 stefan: bugfix for DoubleNumberToken.java support for 
+                  [1,0,3].^0 = [1,1,1] and 0.^[1,0,2] = [0,1,0]
 
-2008/12/26
-stefan + toolbox/jmathlib/system/format.java for formatting numbers
-stefan * GlobalValues.java RootObject.java for formatting numbers
+2008/12/26 stefan: added toolbox/jmathlib/system/format.java for formatting numbers
+2008/12/26 stefan: changed GlobalValues.java RootObject.java for formatting numbers
 
-2008/12/15
-stefan + jmathlib.sh
+2008/12/15 stefan: added jmathlib.sh for starting JMathLib on unix
 
-2008/12/xx
-stefan * tearDown() added this method to all test cases in order to save
-         resources and memory during test case evaluation
+2008/12/xx stefan: tearDown() added this method to all test cases in order 
+                   to save resources and memory during test case evaluation
 
-2008/12/06
-stefan + jmathlib/system/setlocalproperty.java for setting local properties
-stefan + jmathlib/system/getlocalproperty.java for getting local properties
-stefan + jmathlib/system/setglobalproperty.java for setting global properties
-stefan + jmathlib/system/getglobalproperty.java for getting global properties
+2008/12/06 stefan: added jmathlib/system/setlocalproperty.java for setting local properties
+2008/12/06 stefan: added jmathlib/system/getlocalproperty.java for getting local properties
+2008/12/06 stefan: added jmathlib/system/setglobalproperty.java for setting global properties
+2008/12/06 stefan: added jmathlib/system/getglobalproperty.java for getting global properties
 
-2008/11/30
-stefan # update.java wrong comment
+2008/11/30 stefan: bugfix update.java wrong comment
 
 ---- Functional Changes:  version 0.9.0 -> 0.9.2 ------------------------------
 
+--  Mnemonics
+--
+--  + Added (or created) file or directory
+--  - Removed file or directory
+--  * Modified file
+--  ! Bug found
+--  # Bug fixed
+
 2008/11/30
 stefan * generation of release version 0.9.2
 


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

[Mathlib-commitlog] SF.net SVN: mathlib:[786] JMathLib/trunk/src/jmathlib/core/interpreter/ MathLibException.java

From: <st_mueller@us...> - 2009-01-26 19:52

Revision: 786
          http://mathlib.svn.sourceforge.net/mathlib/?rev=786&view=rev
Author:   st_mueller
Date:     2009-01-26 19:52:50 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
renamed MathLibException into JMathLibException

Removed Paths:
-------------
    JMathLib/trunk/src/jmathlib/core/interpreter/MathLibException.java

Deleted: JMathLib/trunk/src/jmathlib/core/interpreter/MathLibException.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/MathLibException.java	2009-01-26 19:52:31 UTC (rev 785)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/MathLibException.java	2009-01-26 19:52:50 UTC (rev 786)
@@ -1,20 +0,0 @@
-package jmathlib.core.interpreter;
-
-/**MathLib specific exception */
-public class MathLibException extends ArithmeticException
-{
-    /**Create a new exception object*/
-    public MathLibException()
-    {
-    
-    }
-    
-    /**Set the message text
-     @param text = the text to display*/
-    public MathLibException(String text)
-    {
-    	super(text);
-    }
-
-	
-}


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

[Mathlib-commitlog] SF.net SVN: mathlib:[785] JMathLib/trunk/src/jmathlibtests/toolbox/general/ testGlobal.java

From: <st_mueller@us...> - 2009-01-26 19:52

Revision: 785
          http://mathlib.svn.sourceforge.net/mathlib/?rev=785&view=rev
Author:   st_mueller
Date:     2009-01-26 19:52:31 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
renamed MathLibException into JMathLibException

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlibtests/toolbox/general/testGlobal.java

Modified: JMathLib/trunk/src/jmathlibtests/toolbox/general/testGlobal.java
===================================================================
--- JMathLib/trunk/src/jmathlibtests/toolbox/general/testGlobal.java	2009-01-26 19:52:01 UTC (rev 784)
+++ JMathLib/trunk/src/jmathlibtests/toolbox/general/testGlobal.java	2009-01-26 19:52:31 UTC (rev 785)
@@ -72,7 +72,7 @@
                 doit = funcParser.parseFunction(b.toString());
                 doit.evaluate(null, ml.globals);
             } 
-            catch (MathLibException ex) {
+            catch (JMathLibException ex) {
                 exCaught = true;
             }
             assertTrue(exCaught);


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

[Mathlib-commitlog] SF.net SVN: mathlib:[782] JMathLib/trunk/src/jmathlib/core/interpreter/ Parser.java

From: <st_mueller@us...> - 2009-01-26 19:47

Revision: 782
          http://mathlib.svn.sourceforge.net/mathlib/?rev=782&view=rev
Author:   st_mueller
Date:     2009-01-26 19:47:27 +0000 (Mon, 26 Jan 2009)

Log Message:
-----------
removed debug output

Modified Paths:
--------------
    JMathLib/trunk/src/jmathlib/core/interpreter/Parser.java

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/Parser.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/Parser.java	2009-01-25 22:23:40 UTC (rev 781)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/Parser.java	2009-01-26 19:47:27 UTC (rev 782)
@@ -1506,15 +1506,14 @@
         boolean numberIndicatorB = false;         //
         boolean singleIndicatorB = false;         //
         boolean imagIndicatorB   = false;         //
-        System.out.println("*+*");
+
         // remove spaces between "[" and first element (e.g. [  2,3] -> [2,3]
         while (isExpectedDelimiter(peekNextToken(MATRIX), ' '))
         		getNextToken();
-        System.out.println("*++*");
+
         // parse code of matrices (e.g. [1,2,3;4,5,6] or [1 sin(2) 3; 4 5+1 a]
         while(!endMatrix) 
         {
-            System.out.println("**");
             // get next parameter (whitespaces are treated as delimiter, too)
             OperandToken nextParameter = parseArithExpression(MATRIX);    
 


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

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

From: <st_mueller@us...> - 2009-01-25 22:23

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.

[Mathlib-commitlog] SF.net SVN: mathlib:[779] JMathLib/trunk/src/jmathlib/core/interpreter/ ContextList.java

From: <st_mueller@us...> - 2009-01-25 21:03

Revision: 779
          http://mathlib.svn.sourceforge.net/mathlib/?rev=779&view=rev
Author:   st_mueller
Date:     2009-01-25 21:03:22 +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/core/interpreter/ContextList.java

Modified: JMathLib/trunk/src/jmathlib/core/interpreter/ContextList.java
===================================================================
--- JMathLib/trunk/src/jmathlib/core/interpreter/ContextList.java	2009-01-25 21:02:24 UTC (rev 778)
+++ JMathLib/trunk/src/jmathlib/core/interpreter/ContextList.java	2009-01-25 21:03:22 UTC (rev 779)
@@ -99,7 +99,7 @@
         {
             // variable is local only
             // return data from current context
-            return localContext.getVariables().getVariable(name);
+            return var;
         }
     }
     


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

Next Messages