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

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

Revision: 499
          http://mathlib.svn.sourceforge.net/mathlib/?rev=499&view=rev
Author:   st_mueller
Date:     2008-11-29 16:29:33 +0000 (Sat, 29 Nov 2008)

Log Message:
-----------
bette update

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

Modified: JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/update.java
===================================================================
--- JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/update.java	2008-11-23 19:09:59 UTC (rev 498)
+++ JMathLib/trunk/src/jmathlib/toolbox/jmathlib/system/update.java	2008-11-29 16:29:33 UTC (rev 499)
@@ -2,6 +2,7 @@
 
 import java.io.*;
 import java.net.*;
+import java.util.Properties;
 
 import jmathlib.core.tokens.*;
 import jmathlib.core.functions.ExternalFunction;
@@ -13,54 +14,60 @@
 	{
 
         String lineFile = "";
-        URL url = null;
  		    
         getInterpreter().displayText("UPDATING JMathLib\n");
 
-        // get update site and local version of jmathlib
+        // get update site of jmathlib
         String updateSiteS   = getInterpreter().prefs.getLocalProperty("update.site.primary");
+        getInterpreter().displayText("update site: "+updateSiteS);
+
+        // get local version of jmathlib
         String localVersionS = getInterpreter().prefs.getLocalProperty("jmathlib.version");
         localVersionS = localVersionS.replaceAll("/", ".");
-        String updateVersionS = localVersionS;
-        getInterpreter().displayText("update site: "+updateSiteS);
         getInterpreter().displayText("current version: "+localVersionS);
 
         
         // first check to which version an update is possible
         getInterpreter().displayText("Checking to which version an update is possible");
-        try {
+        
+        
+        // url of the update site including the request for the version
+        //   to update to
+        URL  url = null;
+        try
+        {
             url = new URL(updateSiteS+"updates/?jmathlib_version="+localVersionS);
-            BufferedReader inR = new BufferedReader(new InputStreamReader(url.openStream()));
-            String s = "";
-            while ((s = inR.readLine()) != null  )
-            {
-                //getInterpreter().displayText("version"+s);
-                if (s.startsWith("update.toversion="))
-                {
-                    // read a file from the server and place it on the local disc
-                    updateVersionS = s.substring(17).trim();
-
-                    // maybe no update is available
-                    if (updateVersionS.equals("no_update_available"))
-                    {
-                        getInterpreter().displayText("No update available available");
-                        return null;
-                    }
-                    
-                    getInterpreter().displayText("updating to version >"+updateVersionS+"< \n");
-                }
-            }
         }
-        catch (Exception e) {
-            throwMathLibException("update: could not receive version for update");
+        catch (Exception e)
+        {
+            throwMathLibException("update: malformed url for getting update version");
         }          
-               
         
+        // load information from the update server
+        Properties props = new Properties();
+        try 
+        {
+             props.load(url.openStream() );
+        }
+        catch (Exception e)
+        {
+            System.out.println("updates: Properties error");    
+        }
+
         
+        // Check return properties for "update-to-version"
+        // Update site could send a lot of properties
+        String updateVersionS = props.getProperty("update.toversion");
+        if (updateVersionS.equals("no_update_available"))
+        {
+            getInterpreter().displayText("No update available available");
+            return null;
+        }
+        getInterpreter().displayText("updating to version >"+updateVersionS+"< \n");
+
+        
         // download new files from server 
         updateSiteS += "updates/jmathlib_" + updateVersionS + "/";
-        
-        //getInterpreter().displayText("updating path: "+updateSiteS);
         try
         {
             url = new URL(updateSiteS);
@@ -70,12 +77,14 @@
             throwMathLibException("update: malformed url");
         }          
        
-        BufferedReader inR=null;
+        BufferedReader inR = null;
         try
         {
             inR = new BufferedReader(new InputStreamReader(url.openStream()));
-            String s = inR.readLine();
-            while (s != null  )
+            String s = null; 
+            
+            // read next line from server
+            while ((s = inR.readLine()) != null  )
             {
                 //getInterpreter().displayText("update "+s);
                 
@@ -119,7 +128,7 @@
                     // delete a file/directory on the local disc
                     String delS = s.substring(4).trim();
                     getInterpreter().displayText("delete file/dir: >"+delS+"<");
-                    File file = new File(getWorkingDirectory(),delS);
+                    File   file = new File(getWorkingDirectory(),delS);
                     file.delete();
                 }
                 else if (s.startsWith("prop"))
@@ -127,7 +136,7 @@
                     // delete a file/directory on the local disc
                     String propS = s.substring(5).trim();
                     getInterpreter().displayText("new property: >"+propS+"<");
-                    String[] p = propS.split("=");
+                    String[]   p = propS.split("=");
                     getInterpreter().prefs.setLocalProperty(p[0],p[1]);
                 }
                 else
@@ -136,8 +145,6 @@
                 }
                 
                 
-                // read next line from server
-                s = inR.readLine();
             }
 
         }


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