[Yanel-commits] rev 25739 - public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder

[simon at wyona.com]

Author: simon
Date: 2007-07-03 16:34:49 +0200 (Tue, 03 Jul 2007)
New Revision: 25739

Modified:
   public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/UpdateFinder.java
Log:
minor issues fixed

Modified: public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/UpdateFinder.java
===================================================================
--- public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/UpdateFinder.java	2007-07-03 14:33:47 UTC (rev 25738)
+++ public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/UpdateFinder.java	2007-07-03 14:34:49 UTC (rev 25739)
@@ -59,7 +59,6 @@
 import org.xml.sax.XMLReader;
 import org.xml.sax.helpers.XMLReaderFactory;
 
-import src.java.org.wyona.yanel.impl.resources.updatefinder.utils.VersionComparator;
 
 import com.hp.hpl.jena.rdf.model.*;
 
@@ -362,7 +361,7 @@
             String destDir = request.getSession().getServletContext().getRealPath(".") + File.separator + "..";
             Map bestUpdater = getBestUpdater(sb);
             
-            warFetcher = new WarFetcher(request, bestUpdater.get("updateLink"), destDir);
+            warFetcher = new WarFetcher(request, (String) bestUpdater.get("updateLink"), destDir);
             warFetcher.fetch();
 
             TomcatContextHandler tomcatContextHandler = new TomcatContextHandler(request);
@@ -414,7 +413,7 @@
         String updateVersion = (String) updateVersionDetails.get("version");
         String updateRevision = (String) updateVersionDetails.get("revision");
         
-        ArrayList updaters = getUpdateVersionsOf("type", "updater", installInfo.getVersion(), installInfo.getRevision());
+        ArrayList updaters = updateInfo.getUpdateVersionsOf("type", "updater", installInfo.getVersion(), installInfo.getRevision());
         VersionComparator versionComparator = new VersionComparator();  
         for (int i = 0; i < updaters.size(); i++) {
             HashMap versionDetail = (HashMap) updaters.get(i);
@@ -431,7 +430,8 @@
                 updaters.remove(i);
             }
         }
-        Map bestUpdater = (HashMap) updaters.get(updaters.size() - 1);
+        HashMap bestUpdater = (HashMap) updaters.get(updaters.size() - 1);
+        return bestUpdater;
     }
 
     /**