/*
 * Licensed to the Apache Software Foundation (ASF) under one or more
 * contributor license agreements.  See the NOTICE file distributed with
 * this work for additional information regarding copyright ownership.
 * The ASF licenses this file to You under the Apache License, Version 2.0
 * (the "License"); you may not use this file except in compliance with
 * the License.  You may obtain a copy of the License at
 *
 *      http://www.apache.org/licenses/LICENSE-2.0
 *
 * Unless required by applicable law or agreed to in writing, software
 * distributed under the License is distributed on an "AS IS" BASIS,
 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
package org.apache.karaf.scr.command.action;

import org.apache.felix.scr.Component;
import org.apache.felix.scr.ScrService;
import org.apache.karaf.scr.command.ScrCommandConstants;
import org.apache.karaf.scr.command.ScrUtils;
import org.apache.karaf.scr.command.support.IdComparator;
import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.apache.karaf.shell.support.table.ShellTable;

import java.util.Arrays;

/**
 * List all the components currently installed.
 */
@Command(scope = ScrCommandConstants.SCR_COMMAND, name = ScrCommandConstants.LIST_FUNCTION, description = "Display available components")
@Service
public class ListAction extends ScrActionSupport {

    private final IdComparator idComparator = new IdComparator();

    @Override
    protected Object doScrAction(ScrService scrService) throws Exception {
        ShellTable table = new ShellTable();
        table.column("ID");
        table.column("State");
        table.column("Component Name");

        Component[] components = scrService.getComponents();
        Arrays.sort(components, idComparator);
        for (Component component : ScrUtils.emptyIfNull(Component.class, components)) {
            if (showHidden) {
                // we display all because we are overridden
                table.addRow().addContent(component.getId(), ScrUtils.getState(component.getState()), component.getName());
            } else {
                if (ScrActionSupport.isHiddenComponent(component)) {
                    // do nothing
                } else {
                    // we aren't hidden so print it
                    table.addRow().addContent(component.getId(), ScrUtils.getState(component.getState()), component.getName());
                }
            }
        }
        table.print(System.out);

        return null;
    }

}

@@ -2043,415 +2043,156 @@
     
-if (showHidden) %7B%0A                // we display all because we are overridden%0A                table.addRow().addContent(component.getId(), ScrUtils.getState(component.getState()), component.getName());%0A            %7D else %7B%0A                if (ScrActionSupport.isHiddenComponent(component)) %7B%0A                    // do nothing%0A                %7D else %7B%0A                    // we aren't hidden so print it%0A    
+// Display only non hidden components, or all if showHidden is true%0A            if (showHidden %7C%7C !ScrActionSupport.isHiddenComponent(component)) %7B%0A
     
@@ -2315,26 +2315,8 @@
 ));%0A
-                %7D%0A
     

Simplify code a bit