You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by pd...@apache.org on 2014/03/02 23:46:52 UTC
svn commit: r1573388 -
/felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceEventImpl.java
Author: pderop
Date: Sun Mar 2 22:46:52 2014
New Revision: 1573388
URL: http://svn.apache.org/r1573388
Log:
fixed compareTo
Modified:
felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceEventImpl.java
Modified: felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceEventImpl.java
URL: http://svn.apache.org/viewvc/felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceEventImpl.java?rev=1573388&r1=1573387&r2=1573388&view=diff
==============================================================================
--- felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceEventImpl.java (original)
+++ felix/sandbox/pderop/dependencymanager-prototype/dm/src/dm/impl/ServiceEventImpl.java Sun Mar 2 22:46:52 2014
@@ -23,8 +23,7 @@ public class ServiceEventImpl extends Ev
@Override
public boolean equals(Object obj) {
if (obj instanceof ServiceEventImpl) {
- ServiceEventImpl sdi = (ServiceEventImpl) obj;
- return sdi.getReference().equals(getReference());
+ return getReference().equals(((ServiceEventImpl) obj).getReference());
}
return false;
}
@@ -36,22 +35,10 @@ public class ServiceEventImpl extends Ev
@Override
public int compareTo(Object b) {
- ServiceReference ra = (ServiceReference) getReference(), rb = ((ServiceEventImpl) b).getReference();
- int ranka = getRank(ra);
- int rankb = getRank(rb);
- if (ranka < rankb) {
- return -1;
- } else if (ranka > rankb) {
- return 1;
- }
- return 0;
+ return getReference().compareTo(((ServiceEventImpl) b).getReference());
}
-
- private int getRank(ServiceReference ref) {
- Object ranking = ref.getProperty(Constants.SERVICE_RANKING);
- if (ranking != null && (ranking instanceof Integer)) {
- return ((Integer) ranking).intValue();
- }
- return 0;
+
+ public String toString() {
+ return m_service.toString();
}
}
\ No newline at end of file