[Yanel-commits] rev 25735 - 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-03 16:26:18 +0200 (Tue, 03 Jul 2007)
New Revision: 25735

Modified:
   public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/utils/UpdateInfo.java
Log:
revision added

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-03 13:43:51 UTC (rev 25734)
+++ public/yanel/trunk/src/realms/welcome-admin/yanel/resources/update-webapp/src/java/org/wyona/yanel/impl/resources/updatefinder/utils/UpdateInfo.java	2007-07-03 14:26:18 UTC (rev 25735)
@@ -177,8 +177,10 @@
      * @return ArrayList with version which are matching the value of the key, and fits in the version requirement
      * @param String key
      * @param String value 
+     * @param String installInfoVersion 
+     * @param String installInfoRevision 
      */
-    public ArrayList getUpdateVersionsOf(String key, String value, String installInfoVersion) {
+    public ArrayList getUpdateVersionsOf(String key, String value, String installInfoVersion, String InstallInfoRevision) {
         ArrayList selectedUpdateVersions = getUpdateVersionsOf(key, value);
         VersionComparator versionComparator = new VersionComparator();  
         for (int i = 0; i < selectedUpdateVersions.size(); i++) {
@@ -189,6 +191,12 @@
             if (versionComparator.compare((String) versionDetail.get("targetApllicationMaxVersion"), installInfoVersion) < 0 ) {
                 selectedUpdateVersions.remove(i);
             }
+            if (versionComparator.compare((String) versionDetail.get("targetApllicationMinRevision"), InstallInfoRevision) > 0 ) {
+                selectedUpdateVersions.remove(i);
+            }
+            if (versionComparator.compare((String) versionDetail.get("targetApllicationMaxRevision"), InstallInfoRevision) < 0 ) {
+                selectedUpdateVersions.remove(i);
+            }
         }
         Collections.sort(selectedUpdateVersions, new UpdateInfoVersionComparator());
         return selectedUpdateVersions;