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

[simon at wyona.com]

Author: simon
Date: 2007-07-06 21:12:28 +0200 (Fri, 06 Jul 2007)
New Revision: 25831

Modified:
   public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/utils/UpdateInfo.java
Log:
version removed from compare. just use revision to compare.

Modified: public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/utils/UpdateInfo.java
===================================================================
--- public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/utils/UpdateInfo.java	2007-07-06 19:08:10 UTC (rev 25830)
+++ public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/utils/UpdateInfo.java	2007-07-06 19:12:28 UTC (rev 25831)
@@ -174,23 +174,16 @@
     }
 
     /**
-     * @return ArrayList with version which are matching the value of the key, and fits in the version requirement
+     * @return ArrayList with version which are matching the value of the key, and fits in the revision requirement
      * @param String key
      * @param String value 
-     * @param String installInfoVersion 
      * @param String installInfoRevision 
      */
-    public ArrayList getUpdateVersionsOf(String key, String value, String installInfoVersion, String InstallInfoRevision) {
+    public ArrayList getUpdateVersionsOf(String key, String value, String InstallInfoRevision) {
         ArrayList selectedUpdateVersions = getUpdateVersionsOf(key, value);
         VersionComparator versionComparator = new VersionComparator();  
         for (int i = 0; i < selectedUpdateVersions.size(); i++) {
             HashMap versionDetail = (HashMap) selectedUpdateVersions.get(i);
-            if (versionComparator.compare((String) versionDetail.get("targetApllicationMinVersion"), installInfoVersion) > 0 ) {
-                selectedUpdateVersions.remove(i);
-            }
-            if (versionComparator.compare((String) versionDetail.get("targetApllicationMaxVersion"), installInfoVersion) < 0 ) {
-                selectedUpdateVersions.remove(i);
-            }
             if (versionComparator.compare((String) versionDetail.get("targetApllicationMinRevision"), InstallInfoRevision) > 0 ) {
                 selectedUpdateVersions.remove(i);
             }
@@ -220,24 +213,24 @@
     }    
 
     /**
-     * @return HashMap with the newest version which are matching the value of the key
+     * @return HashMap with the newest version which are matching the value of the key, and fits in the revision requirement
      * @param String key
      * @param String value 
      */
-    public HashMap getNewestUpdateVersionsOf(String key, String value, String installInfoVersion) {
+    public HashMap getNewestUpdateVersionsOf(String key, String value, String installInfoRevision) {
         ArrayList selectedUpdateVersions = getUpdateVersionsOf(key, value);
         VersionComparator versionComparator = new VersionComparator();  
         for (int i = 0; i < selectedUpdateVersions.size(); i++) {
             HashMap versionDetail = (HashMap) selectedUpdateVersions.get(i);
-            if (versionComparator.compare((String) versionDetail.get("targetApllicationMinVersion"), installInfoVersion) > 0 ) {
+            if (versionComparator.compare((String) versionDetail.get("targetApllicationMinRevision"), installInfoRevision) > 0 ) {
                 selectedUpdateVersions.remove(i);
             }
-            if (versionComparator.compare((String) versionDetail.get("targetApllicationMaxVersion"), installInfoVersion) < 0 ) {
+            if (versionComparator.compare((String) versionDetail.get("targetApllicationMaxRevision"), installInfoRevision) < 0 ) {
                 selectedUpdateVersions.remove(i);
             }
         }
         Collections.sort(selectedUpdateVersions, new UpdateInfoVersionComparator());
-        return (HashMap) selectedUpdateVersions.get(0);
+        return (HashMap) selectedUpdateVersions.get(selectedUpdateVersions.size() -1);
     }