You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2017/08/11 10:51:08 UTC
svn commit: r1804773 -
/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/PackageInfo.java
Author: cziegeler
Date: Fri Aug 11 10:51:08 2017
New Revision: 1804773
URL: http://svn.apache.org/viewvc?rev=1804773&view=rev
Log:
Mak PackageInfo comparable
Modified:
sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/PackageInfo.java
Modified: sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/PackageInfo.java
URL: http://svn.apache.org/viewvc/sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/PackageInfo.java?rev=1804773&r1=1804772&r2=1804773&view=diff
==============================================================================
--- sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/PackageInfo.java (original)
+++ sling/whiteboard/cziegeler/feature-support/src/main/java/org/apache/sling/feature/support/util/PackageInfo.java Fri Aug 11 10:51:08 2017
@@ -19,7 +19,7 @@ package org.apache.sling.feature.support
import org.osgi.framework.Version;
import org.osgi.framework.VersionRange;
-public class PackageInfo {
+public class PackageInfo implements Comparable<PackageInfo> {
private final boolean optional;
private final String name;
@@ -53,7 +53,18 @@ public class PackageInfo {
@Override
public String toString() {
- return "Package " + name + ";version=" + version;
+ return "Package " + name
+ + ";version=" + version
+ + (this.optional ? " (optional)" : "");
+ }
+
+ @Override
+ public int compareTo(final PackageInfo o) {
+ int result = this.name.compareTo(o.name);
+ if ( result == 0 ) {
+ result = this.version.compareTo(o.version);
+ }
+ return result;
}
@Override