Return-Path: X-Original-To: apmail-felix-commits-archive@www.apache.org Delivered-To: apmail-felix-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4A4FC102EB for ; Wed, 9 Sep 2015 07:48:12 +0000 (UTC) Received: (qmail 15786 invoked by uid 500); 9 Sep 2015 07:48:12 -0000 Delivered-To: apmail-felix-commits-archive@felix.apache.org Received: (qmail 15746 invoked by uid 500); 9 Sep 2015 07:48:12 -0000 Mailing-List: contact commits-help@felix.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@felix.apache.org Delivered-To: mailing list commits@felix.apache.org Received: (qmail 15737 invoked by uid 99); 9 Sep 2015 07:48:12 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 09 Sep 2015 07:48:12 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 13FC9AC0041 for ; Wed, 9 Sep 2015 07:48:12 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1701934 - /felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java Date: Wed, 09 Sep 2015 07:48:12 -0000 To: commits@felix.apache.org From: cziegeler@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150909074812.13FC9AC0041@hades.apache.org> Author: cziegeler Date: Wed Sep 9 07:48:11 2015 New Revision: 1701934 URL: http://svn.apache.org/r1701934 Log: FELIX-5001 : scr:list Gogo command should display component descriptions and configurations Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java Modified: felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java URL: http://svn.apache.org/viewvc/felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java?rev=1701934&r1=1701933&r2=1701934&view=diff ============================================================================== --- felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java (original) +++ felix/trunk/scr/src/main/java/org/apache/felix/scr/impl/ScrCommand.java Wed Sep 9 07:48:11 2015 @@ -296,22 +296,7 @@ public class ScrCommand implements ScrIn return; } - Collections.sort( new ArrayList(result.components), new Comparator() - { - - public int compare(final ComponentDescriptionDTO c1, final ComponentDescriptionDTO c2) - { - final long bundleId1 = c1.bundle.id; - final long bundleId2 = c2.bundle.id; - int result = Long.signum(bundleId1 - bundleId2); - if ( result == 0) - { - result = c1.name.compareTo(c2.name); - } - return result; - } - - }); + Collections.sort( new ArrayList(result.components), DESCRIPTION_COMP); long bundleId = -1;