Massive Argeo APIs refactoring

[gpl/argeo-suite.git] / org.argeo.suite.core / src / org / argeo / suite / RankedObject.java

diff --git a/org.argeo.suite.core/src/org/argeo/suite/RankedObject.java b/org.argeo.suite.core/src/org/argeo/suite/RankedObject.java
index a4d28330481fa7d23583d31adc11556a0b9f8d6b..b3ba37dd5bc5b7dace916d4bc0d59ae8800a83d5 100644 (file)
--- a/org.argeo.suite.core/src/org/argeo/suite/RankedObject.java
+++ b/org.argeo.suite.core/src/org/argeo/suite/RankedObject.java
@@ -2,15 +2,14 @@ package org.argeo.suite;
 
 import java.util.Map;
 
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
+import org.argeo.api.cms.CmsLog;
 
 /**
  * A container for an object whose relevance can be ranked. Typically used in an
  * OSGi context with the service.ranking property.
  */
 public class RankedObject<T> {
-       private final static Log log = LogFactory.getLog(RankedObject.class);
+       private final static CmsLog log = CmsLog.getLog(RankedObject.class);
 
        private final static String SERVICE_RANKING = "service.ranking";
 //     private final static String SERVICE_ID = "service.id";
@@ -34,7 +33,7 @@ public class RankedObject<T> {
                if (properties == null)
                        return 0l;
                if (properties.containsKey(SERVICE_RANKING))
-                       return ((Integer) properties.get(SERVICE_RANKING)).longValue();
+                       return Long.valueOf(properties.get(SERVICE_RANKING).toString());
 //             else if (properties.containsKey(SERVICE_ID))
 //                     return (Long) properties.get(SERVICE_ID);
                else
@@ -76,16 +75,16 @@ public class RankedObject<T> {
                RankedObject<T> rankedObject = new RankedObject<>(object, properties);
                if (!map.containsKey(key)) {
                        map.put(key, rankedObject);
-                       if (log.isDebugEnabled())
-                               log.debug(
+                       if (log.isTraceEnabled())
+                               log.trace(
                                                "Added " + key + " as " + object.getClass().getName() + " with rank " + rankedObject.getRank());
                        return rankedObject;
                } else {
                        RankedObject<T> current = map.get(key);
                        if (current.getRank() <= rankedObject.getRank()) {
                                map.put(key, rankedObject);
-                               if (log.isDebugEnabled())
-                                       log.debug("Replaced " + key + " by " + object.getClass().getName() + " with rank "
+                               if (log.isTraceEnabled())
+                                       log.trace("Replaced " + key + " by " + object.getClass().getName() + " with rank "
                                                        + rankedObject.getRank());
                                return rankedObject;
                        } else {