svn commit: r1425290 - in /archiva/trunk/archiva-modules/archiva-web/archiva-rest: archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/ archiva-rest-services/src/main/java/org/apache/archiva/rest/services/

[olamy]

Author: olamy
Date: Sat Dec 22 14:50:45 2012
New Revision: 1425290

URL: http://svn.apache.org/viewvc?rev=1425290&view=rev
Log:
order caches rendering

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/CacheEntry.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/CacheEntry.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/CacheEntry.java?rev=1425290&r1=1425289&r2=1425290&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/CacheEntry.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-api/src/main/java/org/apache/archiva/rest/api/model/CacheEntry.java
 Sat Dec 22 14:50:45 2012
@@ -25,9 +25,9 @@ import java.io.Serializable;
  * @author Olivier Lamy
  * @since 1.4-M3
  */
-@XmlRootElement( name = "cacheEntry" )
+@XmlRootElement(name = "cacheEntry")
 public class CacheEntry
-    implements Serializable
+    implements Serializable, Comparable
 {
     private String key;
 
@@ -108,7 +108,6 @@ public class CacheEntry
     }
 
     /**
-     *
      * @return cache size in kb
      */
     public long getInMemorySize()
@@ -121,6 +120,39 @@ public class CacheEntry
         this.inMemorySize = inMemorySize;
     }
 
+    public int compareTo( Object o )
+    {
+        return this.key.compareTo( ( (CacheEntry) o ).key );
+    }
+
+    @Override
+    public boolean equals( Object o )
+    {
+        if ( this == o )
+        {
+            return true;
+        }
+        if ( o == null || getClass() != o.getClass() )
+        {
+            return false;
+        }
+
+        CacheEntry that = (CacheEntry) o;
+
+        if ( !key.equals( that.key ) )
+        {
+            return false;
+        }
+
+        return true;
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return key.hashCode();
+    }
+
     @Override
     public String toString()
     {

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java?rev=1425290&r1=1425289&r2=1425290&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultSystemStatusService.java
 Sat Dec 22 14:50:45 2012
@@ -134,6 +134,8 @@ public class DefaultSystemStatusService
                                               
cacheStatistics.getInMemorySize() ) );
         }
 
+        Collections.sort( cacheEntries );
+
         return cacheEntries;
     }