ace-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject svn commit: r1539997 - /ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java
Date Fri, 08 Nov 2013 12:25:30 GMT
Author: marrs
Date: Fri Nov  8 12:25:29 2013
New Revision: 1539997

URL: http://svn.apache.org/r1539997
Log:
ACE-404 Removed the custom comparator. Implemented the suggestions as done in the issue.

Modified:
    ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java

Modified: ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java
URL: http://svn.apache.org/viewvc/ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java?rev=1539997&r1=1539996&r2=1539997&view=diff
==============================================================================
--- ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java
(original)
+++ ace/trunk/org.apache.ace.client.repository/src/org/apache/ace/client/repository/impl/ArtifactRepositoryImpl.java
Fri Nov  8 12:25:29 2013
@@ -26,6 +26,7 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
 import java.util.List;
@@ -213,8 +214,8 @@ public class ArtifactRepositoryImpl exte
             throw new IllegalArgumentException("There are no artifact recognizers available.");
         }
 
-        // If available, sort the references by service ranking.
-        Arrays.sort(refs, SERVICE_RANK_COMPARATOR);
+        // Sort the references by service ranking.
+        Arrays.sort(refs, Collections.reverseOrder());
 
         ArtifactResource resource = convertToArtifactResource(url);
 
@@ -503,33 +504,6 @@ public class ArtifactRepositoryImpl exte
     }
 
     /**
-     * Custom comparator which sorts service references by service rank, highest rank first.
-     */
-    // TODO ServiceReferences are comparable by default now
-    private static Comparator<ServiceReference> SERVICE_RANK_COMPARATOR = new Comparator<ServiceReference>()
{
-        public int compare(ServiceReference o1, ServiceReference o2) {
-            int rank1 = 0;
-            int rank2 = 0;
-            try {
-                Object rankObject1 = o1.getProperty(Constants.SERVICE_RANKING);
-                rank1 = (rankObject1 == null) ? 0 : ((Integer) rankObject1).intValue();
-            }
-            catch (ClassCastException cce) {
-                // No problem.
-            }
-            try {
-                Object rankObject2 = o2.getProperty(Constants.SERVICE_RANKING);
-                rank1 = (rankObject2 == null) ? 0 : ((Integer) rankObject2).intValue();
-            }
-            catch (ClassCastException cce) {
-                // No problem.
-            }
-
-            return rank1 - rank2;
-        }
-    };
-
-    /**
      * Converts a given URL to a {@link ArtifactResource} that abstracts the way we access
the contents of the URL away
      * from the URL itself. This way, we can avoid having to pass authentication credentials,
or a
      * {@link ConnectionFactory} to the artifact recognizers.



Mime
View raw message