Attachment #129977 for bug #215135

This Bugzilla instance is a read-only archive of historic NetBeans bug reports. To report a bug in NetBeans please follow the project's instructions for reporting issues.

View | Details | Raw Unified | Return to bug 215135
Collapse All | Expand All




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.api;

import java.util.Collection;
import javax.swing.event.ChangeListener;

/**
 * An item which is a folder for other jobs (or subfolders).
 * Could be any {@code ViewGroup} but probably from the CloudBees Folders plugin for Jenkins.
 * <p>The current interface defines no {@code getViews} method, showing only the primary view.
 * This is not such a loss, since heavy users of folders are not likely to need lots of views anyway.
 * The standard connector also assumes that there is an exported {@link primaryView} field,
 * defined in the Jenkins version of the interface.
 * <p>In the Hudson/Jenkins model, this would really in an inheritance hierarchy with {@link HudsonJob} and {@link HudsonInstance},
 * but due to the many methods in those interfaces which make no sense on folders, it seems better to separate them.
 * @since XXX
 */
public interface HudsonFolder {

    String getName();

    String getUrl();

    Collection<HudsonJob> getJobs();

    Collection<HudsonFolder> getFolders();

    HudsonInstance getInstance();

    void addChangeListener(ChangeListener listener);

    void removeChangeListener(ChangeListener listener);

}

Lines 99-104 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/api/HudsonInstance.java (+3 lines)
99	*/	99	*/
100	public Collection<HudsonJob> getJobs();	100	public Collection<HudsonJob> getJobs();
101		101
		102	/** @since XXX */
		103	Collection<HudsonFolder> getFolders();
		104
102	/**	105	/**
103	* Returns all Hudson views from registered instance	106	* Returns all Hudson views from registered instance
104	*	107	*




import java.util.regex.Pattern;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.modules.hudson.api.ConnectionBuilder;
import org.netbeans.modules.hudson.api.HudsonFolder;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJob.Color;
import org.netbeans.modules.hudson.api.HudsonJobBuild;

        Document docInstance = getDocument(instanceUrl + XML_API_URL + (canUseTree(authentication) ?
                "?tree=primaryView[name],views[name,url,jobs[name]]," +
                "jobs[name,url,color,displayName,buildable,inQueue," +
                "primaryView," + // #215135: marker for folders
                "lastBuild[number],lastFailedBuild[number],lastStableBuild[number],lastSuccessfulBuild[number],lastCompletedBuild[number]," +
                "modules[name,displayName,url,color]]," +
                "securedJobs[name,url]" : // HUDSON-3924

        if (null == docInstance) {
            return new InstanceData(
                    Collections.<JobData>emptyList(),
                    Collections.<ViewData>emptyList(),
                    Collections.<FolderData>emptyList());
        }
        // Clear cache
        cache.clear();
        // Parse jobs and return them
        Collection<ViewData> viewsData = getViewData(docInstance, instanceUrl);
        Collection<FolderData> foldersData = new ArrayList<FolderData>();
        Collection<JobData> jobsData = getJobsData(docInstance, instanceUrl, viewsData, foldersData);
        return new InstanceData(jobsData, viewsData, foldersData);
    }

    @Override public InstanceData getInstanceData(HudsonFolder parentFolder, boolean authentication) {
        Document docInstance = getDocument(parentFolder.getUrl() + XML_API_URL + "?tree=jobs[name,url,color,displayName,buildable,inQueue,primaryView," +
                "lastBuild[number],lastFailedBuild[number],lastStableBuild[number],lastSuccessfulBuild[number],lastCompletedBuild[number]," +
                "modules[name,displayName,url,color]]," +
                "securedJobs[name,url]", authentication); // NOI18N

        if (null == docInstance) {
            return new InstanceData(
                    Collections.<JobData>emptyList(),
                    Collections.<ViewData>emptyList(),
                    Collections.<FolderData>emptyList());
        }
        // Clear cache
        cache.clear();
        Collection<FolderData> foldersData = new ArrayList<FolderData>();
        Collection<JobData> jobsData = getJobsData(docInstance, parentFolder.getUrl(), Collections.<ViewData>emptySet(), foldersData);
        return new InstanceData(jobsData, Collections.<ViewData>emptySet(), foldersData);
    }

    @Override

        
    }
    
    private Collection<ViewData> getViewData(Document doc, String baseUrl) {
        String primaryViewName = null;
        Element primaryViewEl = XMLUtil.findElement(doc.getDocumentElement(), "primaryView", null); // NOI18N
        if (primaryViewEl != null) {

                    name = o.getFirstChild().getTextContent();
                    isPrimary = name.equals(primaryViewName);
                } else if (o.getNodeName().equals(XML_API_URL_ELEMENT)) {
                    url = normalizeUrl(baseUrl, o.getFirstChild().getTextContent(), isPrimary ? "" : "view/[^/]+/"); // NOI18N
                }
            }
            

        return views;
    }
    
    private Collection<JobData> getJobsData(Document doc, String baseUrl,
            Collection<ViewData> viewsData, Collection<FolderData> foldersData) {
        Collection<JobData> jobs = new ArrayList<JobData>();
        
        NodeList nodes = doc.getDocumentElement().getChildNodes();

            
            JobData jd = new JobData();
            jd.setSecured(secured);
            FolderData fd = new FolderData();
            boolean isFolder = false;
            
            NodeList jobDetails = n.getChildNodes();
            for (int k = 0; k < jobDetails.getLength(); k++) {

                String nodeName = d.getNodeName();
                if (nodeName.equals(XML_API_NAME_ELEMENT)) {
                    jd.setJobName(d.getFirstChild().getTextContent());
                    fd.setName(d.getFirstChild().getTextContent());
                } else if (nodeName.equals(XML_API_URL_ELEMENT)) {
                    String u = normalizeUrl(baseUrl, d.getFirstChild().getTextContent(), "job/[^/]+/"); // NOI18N
                    jd.setJobUrl(u);
                    fd.setUrl(u);
                } else if (nodeName.equals("primaryView")) { // NOI18N
                    isFolder = true;
                } else if (nodeName.equals(XML_API_COLOR_ELEMENT)) {
                    jd.setColor(Color.find(d.getFirstChild().getTextContent().trim()));
                } else if (nodeName.equals(XML_API_DISPLAY_NAME_ELEMENT)) {

                            } else if (nodeName2.equals("displayName")) { // NOI18N
                                displayName = text;
                            } else if (nodeName2.equals("url")) { // NOI18N
                                url = normalizeUrl(baseUrl, text, "job/[^/]+/[^/]+/"); // NOI18N
                            } else if (nodeName2.equals("color")) { // NOI18N
                                color = Color.find(text);
                            } else {

                    jd.addView(v.getName());
                }
            }
            if (isFolder) {
                foldersData.add(fd);
            } else {
                jobs.add(jd);
            }
        }
        return jobs;
    }

     * @return analogous URL constructed from instance root, e.g. {@code https://my.facade/hudson/job/My%20Job/}
     * @see "#165735"
     */
    private static String normalizeUrl(String instanceUrl, String suggested, String relativePattern) {
        Pattern tailPattern;
        synchronized (tailPatterns) {
            tailPattern = tailPatterns.get(relativePattern);

        }
        return items;
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.impl;

import java.util.Collection;
import javax.swing.event.ChangeListener;
import org.netbeans.modules.hudson.api.HudsonChangeListener;
import org.netbeans.modules.hudson.api.HudsonFolder;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.spi.BuilderConnector;
import org.netbeans.modules.hudson.ui.interfaces.OpenableInBrowser;
import org.openide.util.ChangeSupport;
import org.openide.util.WeakListeners;

public class HudsonFolderImpl implements HudsonFolder, OpenableInBrowser, HudsonChangeListener {

    private final ChangeSupport cs = new ChangeSupport(this);
    private final HudsonInstanceImpl instance;
    private final String name, url;
    private BuilderConnector.InstanceData children;
    private Collection<HudsonJob> jobs;
    private Collection<HudsonFolder> folders;

    HudsonFolderImpl(HudsonInstanceImpl instance, String name, String url) {
        this.instance = instance;
        this.name = name;
        this.url = url;
        instance.addHudsonChangeListener(WeakListeners.create(HudsonChangeListener.class, this, instance));
    }

    @Override public String getName() {
        return name;
    }

    @Override public String getUrl() {
        return url;
    }

    private synchronized void load() {
        if (children == null) {
            children = instance.getBuilderConnector().getInstanceData(this, true);
            jobs = instance.createJobs(children.getJobsData());
            folders = instance.createFolders(children.getFoldersData());
        }
    }

    @Override public Collection<HudsonJob> getJobs() {
        load();
        return jobs;
    }

    @Override public Collection<HudsonFolder> getFolders() {
        load();
        return folders;
    }

    @Override public HudsonInstance getInstance() {
        return instance;
    }

    @Override public String toString() {
        return url;
    }

    @Override public boolean equals(Object obj) {
        return obj instanceof HudsonFolderImpl && ((HudsonFolderImpl) obj).url.equals(url);
    }

    @Override public int hashCode() {
        return url.hashCode();
    }

    @Override public void addChangeListener(ChangeListener listener) {
        cs.addChangeListener(listener);
    }
    
    @Override public void removeChangeListener(ChangeListener listener) {
        cs.removeChangeListener(listener);
    }

    @Override public void stateChanged() {
        synchronized (this) {
            children = null;
        }
        cs.fireChange();
    }

    @Override public void contentChanged() {}

}




import org.netbeans.api.progress.ProgressHandleFactory;
import org.netbeans.modules.hudson.api.HudsonChangeAdapter;
import org.netbeans.modules.hudson.api.HudsonChangeListener;
import org.netbeans.modules.hudson.api.HudsonFolder;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJobBuild;

    private final Task synchronization;
    
    private Collection<HudsonJob> jobs = new ArrayList<HudsonJob>();
    private Collection<HudsonFolder> folders = new ArrayList<HudsonFolder>();
    private Collection<HudsonView> views = new ArrayList<HudsonView>();
    private HudsonView primaryView;
    private final Collection<HudsonChangeListener> listeners = new ArrayList<HudsonChangeListener>();

        forbidden = false;
        version = null;
        jobs.clear();
        folders.clear();
        views.clear();
        primaryView = null;
        

        assert !(connector instanceof HudsonConnector);
        this.builderConnector = connector;
        this.jobs.clear();
        folders.clear();
        this.views.clear();
        synchronize(false);
    }

        return jobs;
    }

    @Override public synchronized Collection<HudsonFolder> getFolders() {
        return folders;
    }

    boolean isSalient(HudsonJobImpl job) {
        HudsonInstanceProperties props = getProperties();
        if (HudsonInstanceProperties.split(props.get(INSTANCE_SUPPRESSED_JOBS)).contains(job.getName())) {

                        configureViews(instanceData.getViewsData());
                        Collection<HudsonJob> retrieved = createJobs(
                                instanceData.getJobsData());
                        Collection<HudsonFolder> retrievedFolders = createFolders(instanceData.getFoldersData());
                        
                        // Exit when instance is terminated
                        if (terminated) {

                        }

                        // When there are no changes return and do not fire changes
                        if (jobs.equals(retrieved) && folders.equals(retrievedFolders) && oldViews.equals(getViews())) {
                            return;
                        }
                        
                        // Update jobs
                        jobs = retrieved;
                        folders = retrievedFolders;

                        // Fire all changes
                        fireContentChanges();

        return jobList;
    }

    public Collection<HudsonFolder> createFolders(Collection<BuilderConnector.FolderData> foldersData) {
        Collection<HudsonFolder> result = new ArrayList<HudsonFolder>();
        for (BuilderConnector.FolderData datum : foldersData) {
            result.add(new HudsonFolderImpl(this, datum.getName(), datum.getUrl()));
        }
        return result;
    }

    private void configureViews(Collection<BuilderConnector.ViewData> viewsData) {

        Collection<HudsonView> viewList = new ArrayList<HudsonView>();




package org.netbeans.modules.hudson.spi;

import java.util.Collection;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicReference;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.modules.hudson.api.HudsonFolder;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJob.Color;
import org.netbeans.modules.hudson.api.HudsonJobBuild;

            boolean authentication);

    /**
     * Like {@link #getInstanceData(boolean)} but gets the contents of a folder rather than top level.
     * Consider abstract; the default implementation produces an empty result.
     * @since XXX
     */
    public /*abstract*/ @NonNull InstanceData getInstanceData(@NonNull HudsonFolder parentFolder, boolean authentication) {
        return new InstanceData(Collections.<JobData>emptyList(), Collections.<ViewData>emptyList(), Collections.<FolderData>emptyList());
    }

    /**
     * Get builds for the specified job.
     */
    public abstract @NonNull Collection<BuildData> getJobBuildsData(

        }
    }

    /** @since XXX */
    public static final class FolderData {

        private String name;
        private String url;

        public String getName() {
            return name;
        }

        public void setName(String name) {
            this.name = name;
        }

        public String getUrl() {
            return url;
        }

        public void setUrl(String url) {
            this.url = url;
        }

    }

    /**
     * Type for storing build module data
     */


        private Collection<JobData> jobsData;
        private Collection<ViewData> viewsData;
        private final Collection<FolderData> foldersData;

        @Deprecated
        public InstanceData(Collection<JobData> jobsData, Collection<ViewData> viewsData) {
            this(jobsData, viewsData, Collections.<FolderData>emptySet());
        }

        /** @since XXX */
        public InstanceData(Collection<JobData> jobsData, Collection<ViewData> viewsData, Collection<FolderData> foldersData) {
            this.jobsData = jobsData;
            this.viewsData = viewsData;
            this.foldersData = foldersData;
        }

        public Collection<JobData> getJobsData() {

        public Collection<ViewData> getViewsData() {
            return viewsData;
        }

        /** @since XXX */
        public Collection<FolderData> getFoldersData() {
            return foldersData;
        }

    }
}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 2013 Oracle and/or its affiliates. All rights reserved.
 *
 * Oracle and Java are registered trademarks of Oracle and/or its affiliates.
 * Other names may be trademarks of their respective owners.
 *
 * The contents of this file are subject to the terms of either the GNU
 * General Public License Version 2 only ("GPL") or the Common
 * Development and Distribution License("CDDL") (collectively, the
 * "License"). You may not use this file except in compliance with the
 * License. You can obtain a copy of the License at
 * http://www.netbeans.org/cddl-gplv2.html
 * or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
 * specific language governing permissions and limitations under the
 * License.  When distributing the software, include this License Header
 * Notice in each file and include the License file at
 * nbbuild/licenses/CDDL-GPL-2-CP.  Oracle designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Oracle in the GPL Version 2 section of the License file that
 * accompanied this code. If applicable, add the following below the
 * License Header, with the fields enclosed by brackets [] replaced by
 * your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * If you wish your version of this file to be governed by only the CDDL
 * or only the GPL Version 2, indicate your decision by adding
 * "[Contributor] elects to include this software in this distribution
 * under the [CDDL or GPL Version 2] license." If you do not indicate a
 * single choice of license, a recipient has the option to distribute
 * your version of this file under either the CDDL, the GPL Version 2 or
 * to extend the choice of license to its licensees as provided above.
 * However, if you add GPL Version 2 code and therefore, elected the GPL
 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 *
 * Contributor(s):
 *
 * Portions Copyrighted 2013 Sun Microsystems, Inc.
 */

package org.netbeans.modules.hudson.ui.nodes;

import java.awt.Image;
import java.util.ArrayList;
import java.util.List;
import javax.swing.Action;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.netbeans.modules.hudson.api.HudsonFolder;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.ui.actions.OpenUrlAction;
import org.netbeans.modules.hudson.ui.interfaces.OpenableInBrowser;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.DataFolder;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.ChildFactory;
import org.openide.nodes.Children;
import org.openide.nodes.Node;
import org.openide.util.Union2;
import org.openide.util.WeakListeners;
import org.openide.util.lookup.Lookups;

class HudsonFolderNode extends AbstractNode {

    private static final Node iconDelegate = DataFolder.findFolder(FileUtil.getConfigRoot()).getNodeDelegate();

    private final HudsonFolder folder;

    HudsonFolderNode(HudsonFolder folder) {
        super(Children.create(new HudsonFolderChildren(folder), true), Lookups.singleton(folder));
        this.folder = folder;
        setName(folder.getName());
    }

    public @Override Image getIcon(int type) {
        return iconDelegate.getIcon(type);
    }

    public @Override Image getOpenedIcon(int type) {
        return iconDelegate.getOpenedIcon(type);
    }

    @Override public Action[] getActions(boolean context) {
        List<Action> actions = new ArrayList<Action>();
        if (folder instanceof OpenableInBrowser) {
            actions.add(OpenUrlAction.forOpenable((OpenableInBrowser) folder));
        }
        return actions.toArray(new Action[actions.size()]);
    }

    private static final class HudsonFolderChildren extends ChildFactory.Detachable<Union2<HudsonJob,HudsonFolder>> implements ChangeListener {

        private final HudsonFolder folder;

        HudsonFolderChildren(HudsonFolder folder) {
            this.folder = folder;
        }

        @Override protected boolean createKeys(List<Union2<HudsonJob,HudsonFolder>> toPopulate) {
            for (HudsonFolder subfolder : folder.getFolders()) {
                toPopulate.add(Union2.<HudsonJob,HudsonFolder>createSecond(subfolder));
            }
            for (HudsonJob job : folder.getJobs()) {
                toPopulate.add(Union2.<HudsonJob,HudsonFolder>createFirst(job));
            }
            return true;
        }

        @Override protected Node createNodeForKey(Union2<HudsonJob,HudsonFolder> key) {
            return key.hasFirst() ? new HudsonJobNode(key.first()) : new HudsonFolderNode(key.second());
        }

        @Override protected void addNotify() {
            folder.addChangeListener(WeakListeners.change(this, folder));
        }

        @Override public void stateChanged(ChangeEvent e) {
            refresh(false);
        }

    }

}




import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedList;
import java.util.List;
import java.util.prefs.PreferenceChangeEvent;
import java.util.prefs.PreferenceChangeListener;
import javax.swing.Action;
import org.netbeans.modules.hudson.api.HudsonChangeListener;
import org.netbeans.modules.hudson.api.HudsonFolder;
import org.netbeans.modules.hudson.api.HudsonInstance;
import org.netbeans.modules.hudson.api.HudsonJob;
import org.netbeans.modules.hudson.api.HudsonJob.Color;

import org.openide.nodes.Children;
import org.openide.nodes.Node;
import org.openide.util.NbBundle.Messages;
import org.openide.util.Union2;
import org.openide.util.lookup.Lookups;

/**

     */
    public static final String SELECTED_VIEW = "view"; // NOI18N
    
    private static class InstanceNodeChildren extends Children.Keys<Union2<HudsonJob,HudsonFolder>> implements HudsonChangeListener {
        
        private final HudsonInstanceImpl instance;
        

            });
        }
        
        @Override protected Node[] createNodes(Union2<HudsonJob,HudsonFolder> item) {
            return new Node[] {item.hasFirst() ? new HudsonJobNode(item.first()) : new HudsonFolderNode(item.second())};
        }
        
        @Override
        protected void addNotify() {
            super.addNotify();
            if (!instance.isConnected()/* && seems undesirable: !instance.isForbidden()*/) {
                setKeys(Collections.<Union2<HudsonJob,HudsonFolder>>emptySet());
                instance.synchronize(true);
            } else {
                refreshKeys();

        
        @Override
        protected void removeNotify() {
            setKeys(Collections.<Union2<HudsonJob,HudsonFolder>>emptySet());
            super.removeNotify();
        }
        

                jobs.add(job);
            }
            Collections.sort(jobs);
            List<Union2<HudsonJob,HudsonFolder>> items = new LinkedList<Union2<HudsonJob,HudsonFolder>>();
            for (HudsonFolder folder : instance.getFolders()) {
                // XXX ideally should restrict by selected view, like jobs
                items.add(Union2.<HudsonJob,HudsonFolder>createSecond(folder));
            }
            for (HudsonJob job : jobs) {
                items.add(Union2.<HudsonJob,HudsonFolder>createFirst(job));
            }
            setKeys(items);
        }
        
        @Override public void stateChanged() {

Return to bug 215135

Lines 63-68 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/impl/HudsonConnector.java (-12 / +47 lines)
63	import java.util.regex.Pattern;	63	import java.util.regex.Pattern;
64	import org.netbeans.api.annotations.common.CheckForNull;	64	import org.netbeans.api.annotations.common.CheckForNull;
65	import org.netbeans.modules.hudson.api.ConnectionBuilder;	65	import org.netbeans.modules.hudson.api.ConnectionBuilder;
		66	import org.netbeans.modules.hudson.api.HudsonFolder;
66	import org.netbeans.modules.hudson.api.HudsonJob;	67	import org.netbeans.modules.hudson.api.HudsonJob;
67	import org.netbeans.modules.hudson.api.HudsonJob.Color;	68	import org.netbeans.modules.hudson.api.HudsonJob.Color;
68	import org.netbeans.modules.hudson.api.HudsonJobBuild;	69	import org.netbeans.modules.hudson.api.HudsonJobBuild;
Lines 119-124 Link Here
119	Document docInstance = getDocument(instanceUrl + XML_API_URL + (canUseTree(authentication) ?	120	Document docInstance = getDocument(instanceUrl + XML_API_URL + (canUseTree(authentication) ?
120	"?tree=primaryView[name],views[name,url,jobs[name]]," +	121	"?tree=primaryView[name],views[name,url,jobs[name]]," +
121	"jobs[name,url,color,displayName,buildable,inQueue," +	122	"jobs[name,url,color,displayName,buildable,inQueue," +
		123	"primaryView," + // #215135: marker for folders
122	"lastBuild[number],lastFailedBuild[number],lastStableBuild[number],lastSuccessfulBuild[number],lastCompletedBuild[number]," +	124	"lastBuild[number],lastFailedBuild[number],lastStableBuild[number],lastSuccessfulBuild[number],lastCompletedBuild[number]," +
123	"modules[name,displayName,url,color]]," +	125	"modules[name,displayName,url,color]]," +
124	"securedJobs[name,url]" : // HUDSON-3924	126	"securedJobs[name,url]" : // HUDSON-3924
Lines 131-144 Link Here
131	if (null == docInstance) {	133	if (null == docInstance) {
132	return new InstanceData(	134	return new InstanceData(
133	Collections.<JobData>emptyList(),	135	Collections.<JobData>emptyList(),
134	Collections.<ViewData>emptyList());	136	Collections.<ViewData>emptyList(),
		137	Collections.<FolderData>emptyList());
135	}	138	}
136	// Clear cache	139	// Clear cache
137	cache.clear();	140	cache.clear();
138	// Parse jobs and return them	141	// Parse jobs and return them
139	Collection<ViewData> viewsData = getViewData(docInstance);	142	Collection<ViewData> viewsData = getViewData(docInstance, instanceUrl);
140	Collection<JobData> jobsData = getJobsData(docInstance, viewsData);	143	Collection<FolderData> foldersData = new ArrayList<FolderData>();
141	return new InstanceData(jobsData, viewsData);	144	Collection<JobData> jobsData = getJobsData(docInstance, instanceUrl, viewsData, foldersData);
		145	return new InstanceData(jobsData, viewsData, foldersData);
		146	}
		147
		148	@Override public InstanceData getInstanceData(HudsonFolder parentFolder, boolean authentication) {
		149	Document docInstance = getDocument(parentFolder.getUrl() + XML_API_URL + "?tree=jobs[name,url,color,displayName,buildable,inQueue,primaryView," +
		150	"lastBuild[number],lastFailedBuild[number],lastStableBuild[number],lastSuccessfulBuild[number],lastCompletedBuild[number]," +
		151	"modules[name,displayName,url,color]]," +
		152	"securedJobs[name,url]", authentication); // NOI18N
		153
		154	if (null == docInstance) {
		155	return new InstanceData(
		156	Collections.<JobData>emptyList(),
		157	Collections.<ViewData>emptyList(),
		158	Collections.<FolderData>emptyList());
		159	}
		160	// Clear cache
		161	cache.clear();
		162	Collection<FolderData> foldersData = new ArrayList<FolderData>();
		163	Collection<JobData> jobsData = getJobsData(docInstance, parentFolder.getUrl(), Collections.<ViewData>emptySet(), foldersData);
		164	return new InstanceData(jobsData, Collections.<ViewData>emptySet(), foldersData);
142	}	165	}
143		166
144	@Override	167	@Override
Lines 235-241 Link Here
235		258
236	}	259	}
237		260
238	private Collection<ViewData> getViewData(Document doc) {	261	private Collection<ViewData> getViewData(Document doc, String baseUrl) {
239	String primaryViewName = null;	262	String primaryViewName = null;
240	Element primaryViewEl = XMLUtil.findElement(doc.getDocumentElement(), "primaryView", null); // NOI18N	263	Element primaryViewEl = XMLUtil.findElement(doc.getDocumentElement(), "primaryView", null); // NOI18N
241	if (primaryViewEl != null) {	264	if (primaryViewEl != null) {
Lines 267-273 Link Here
267	name = o.getFirstChild().getTextContent();	290	name = o.getFirstChild().getTextContent();
268	isPrimary = name.equals(primaryViewName);	291	isPrimary = name.equals(primaryViewName);
269	} else if (o.getNodeName().equals(XML_API_URL_ELEMENT)) {	292	} else if (o.getNodeName().equals(XML_API_URL_ELEMENT)) {
270	url = normalizeUrl(o.getFirstChild().getTextContent(), isPrimary ? "" : "view/[^/]+/"); // NOI18N	293	url = normalizeUrl(baseUrl, o.getFirstChild().getTextContent(), isPrimary ? "" : "view/[^/]+/"); // NOI18N
271	}	294	}
272	}	295	}
273		296
Lines 300-307 Link Here
300	return views;	323	return views;
301	}	324	}
302		325
303	private Collection<JobData> getJobsData(Document doc,	326	private Collection<JobData> getJobsData(Document doc, String baseUrl,
304	Collection<ViewData> viewsData) {	327	Collection<ViewData> viewsData, Collection<FolderData> foldersData) {
305	Collection<JobData> jobs = new ArrayList<JobData>();	328	Collection<JobData> jobs = new ArrayList<JobData>();
306		329
307	NodeList nodes = doc.getDocumentElement().getChildNodes();	330	NodeList nodes = doc.getDocumentElement().getChildNodes();
Lines 314-319 Link Here
314		337
315	JobData jd = new JobData();	338	JobData jd = new JobData();
316	jd.setSecured(secured);	339	jd.setSecured(secured);
		340	FolderData fd = new FolderData();
		341	boolean isFolder = false;
317		342
318	NodeList jobDetails = n.getChildNodes();	343	NodeList jobDetails = n.getChildNodes();
319	for (int k = 0; k < jobDetails.getLength(); k++) {	344	for (int k = 0; k < jobDetails.getLength(); k++) {
Lines 324-331 Link Here
324	String nodeName = d.getNodeName();	349	String nodeName = d.getNodeName();
325	if (nodeName.equals(XML_API_NAME_ELEMENT)) {	350	if (nodeName.equals(XML_API_NAME_ELEMENT)) {
326	jd.setJobName(d.getFirstChild().getTextContent());	351	jd.setJobName(d.getFirstChild().getTextContent());
		352	fd.setName(d.getFirstChild().getTextContent());
327	} else if (nodeName.equals(XML_API_URL_ELEMENT)) {	353	} else if (nodeName.equals(XML_API_URL_ELEMENT)) {
328	jd.setJobUrl(normalizeUrl(d.getFirstChild().getTextContent(), "job/[^/]+/")); // NOI18N	354	String u = normalizeUrl(baseUrl, d.getFirstChild().getTextContent(), "job/[^/]+/"); // NOI18N
		355	jd.setJobUrl(u);
		356	fd.setUrl(u);
		357	} else if (nodeName.equals("primaryView")) { // NOI18N
		358	isFolder = true;
329	} else if (nodeName.equals(XML_API_COLOR_ELEMENT)) {	359	} else if (nodeName.equals(XML_API_COLOR_ELEMENT)) {
330	jd.setColor(Color.find(d.getFirstChild().getTextContent().trim()));	360	jd.setColor(Color.find(d.getFirstChild().getTextContent().trim()));
331	} else if (nodeName.equals(XML_API_DISPLAY_NAME_ELEMENT)) {	361	} else if (nodeName.equals(XML_API_DISPLAY_NAME_ELEMENT)) {
Lines 362-368 Link Here
362	} else if (nodeName2.equals("displayName")) { // NOI18N	392	} else if (nodeName2.equals("displayName")) { // NOI18N
363	displayName = text;	393	displayName = text;
364	} else if (nodeName2.equals("url")) { // NOI18N	394	} else if (nodeName2.equals("url")) { // NOI18N
365	url = normalizeUrl(text, "job/[^/]+/[^/]+/"); // NOI18N	395	url = normalizeUrl(baseUrl, text, "job/[^/]+/[^/]+/"); // NOI18N
366	} else if (nodeName2.equals("color")) { // NOI18N	396	} else if (nodeName2.equals("color")) { // NOI18N
367	color = Color.find(text);	397	color = Color.find(text);
368	} else {	398	} else {
Lines 391-397 Link Here
391	jd.addView(v.getName());	421	jd.addView(v.getName());
392	}	422	}
393	}	423	}
394	jobs.add(jd);	424	if (isFolder) {
		425	foldersData.add(fd);
		426	} else {
		427	jobs.add(jd);
		428	}
395	}	429	}
396	return jobs;	430	return jobs;
397	}	431	}
Lines 403-409 Link Here
403	* @return analogous URL constructed from instance root, e.g. {@code https://my.facade/hudson/job/My%20Job/}	437	* @return analogous URL constructed from instance root, e.g. {@code https://my.facade/hudson/job/My%20Job/}
404	* @see "#165735"	438	* @see "#165735"
405	*/	439	*/
406	private String normalizeUrl(String suggested, String relativePattern) {	440	private static String normalizeUrl(String instanceUrl, String suggested, String relativePattern) {
407	Pattern tailPattern;	441	Pattern tailPattern;
408	synchronized (tailPatterns) {	442	synchronized (tailPatterns) {
409	tailPattern = tailPatterns.get(relativePattern);	443	tailPattern = tailPatterns.get(relativePattern);
Lines 620-623 Link Here
620	}	654	}
621	return items;	655	return items;
622	}	656	}
		657
623	}	658	}

Lines 64-69 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/impl/HudsonInstanceImpl.java (-1 / +19 lines)
64	import org.netbeans.api.progress.ProgressHandleFactory;	64	import org.netbeans.api.progress.ProgressHandleFactory;
65	import org.netbeans.modules.hudson.api.HudsonChangeAdapter;	65	import org.netbeans.modules.hudson.api.HudsonChangeAdapter;
66	import org.netbeans.modules.hudson.api.HudsonChangeListener;	66	import org.netbeans.modules.hudson.api.HudsonChangeListener;
		67	import org.netbeans.modules.hudson.api.HudsonFolder;
67	import org.netbeans.modules.hudson.api.HudsonInstance;	68	import org.netbeans.modules.hudson.api.HudsonInstance;
68	import org.netbeans.modules.hudson.api.HudsonJob;	69	import org.netbeans.modules.hudson.api.HudsonJob;
69	import org.netbeans.modules.hudson.api.HudsonJobBuild;	70	import org.netbeans.modules.hudson.api.HudsonJobBuild;
Lines 107-112 Link Here
107	private final Task synchronization;	108	private final Task synchronization;
108		109
109	private Collection<HudsonJob> jobs = new ArrayList<HudsonJob>();	110	private Collection<HudsonJob> jobs = new ArrayList<HudsonJob>();
		111	private Collection<HudsonFolder> folders = new ArrayList<HudsonFolder>();
110	private Collection<HudsonView> views = new ArrayList<HudsonView>();	112	private Collection<HudsonView> views = new ArrayList<HudsonView>();
111	private HudsonView primaryView;	113	private HudsonView primaryView;
112	private final Collection<HudsonChangeListener> listeners = new ArrayList<HudsonChangeListener>();	114	private final Collection<HudsonChangeListener> listeners = new ArrayList<HudsonChangeListener>();
Lines 220-225 Link Here
220	forbidden = false;	222	forbidden = false;
221	version = null;	223	version = null;
222	jobs.clear();	224	jobs.clear();
		225	folders.clear();
223	views.clear();	226	views.clear();
224	primaryView = null;	227	primaryView = null;
225		228
Lines 239-244 Link Here
239	assert !(connector instanceof HudsonConnector);	242	assert !(connector instanceof HudsonConnector);
240	this.builderConnector = connector;	243	this.builderConnector = connector;
241	this.jobs.clear();	244	this.jobs.clear();
		245	folders.clear();
242	this.views.clear();	246	this.views.clear();
243	synchronize(false);	247	synchronize(false);
244	}	248	}
Lines 273-278 Link Here
273	return jobs;	277	return jobs;
274	}	278	}
275		279
		280	@Override public synchronized Collection<HudsonFolder> getFolders() {
		281	return folders;
		282	}
		283
276	boolean isSalient(HudsonJobImpl job) {	284	boolean isSalient(HudsonJobImpl job) {
277	HudsonInstanceProperties props = getProperties();	285	HudsonInstanceProperties props = getProperties();
278	if (HudsonInstanceProperties.split(props.get(INSTANCE_SUPPRESSED_JOBS)).contains(job.getName())) {	286	if (HudsonInstanceProperties.split(props.get(INSTANCE_SUPPRESSED_JOBS)).contains(job.getName())) {
Lines 377-382 Link Here
377	configureViews(instanceData.getViewsData());	385	configureViews(instanceData.getViewsData());
378	Collection<HudsonJob> retrieved = createJobs(	386	Collection<HudsonJob> retrieved = createJobs(
379	instanceData.getJobsData());	387	instanceData.getJobsData());
		388	Collection<HudsonFolder> retrievedFolders = createFolders(instanceData.getFoldersData());
380		389
381	// Exit when instance is terminated	390	// Exit when instance is terminated
382	if (terminated) {	391	if (terminated) {
Lines 405-416 Link Here
405	}	414	}
406		415
407	// When there are no changes return and do not fire changes	416	// When there are no changes return and do not fire changes
408	if (getJobs().equals(retrieved) && oldViews.equals(getViews())) {	417	if (jobs.equals(retrieved) && folders.equals(retrievedFolders) && oldViews.equals(getViews())) {
409	return;	418	return;
410	}	419	}
411		420
412	// Update jobs	421	// Update jobs
413	jobs = retrieved;	422	jobs = retrieved;
		423	folders = retrievedFolders;
414		424
415	// Fire all changes	425	// Fire all changes
416	fireContentChanges();	426	fireContentChanges();
Lines 551-556 Link Here
551	return jobList;	561	return jobList;
552	}	562	}
553		563
		564	public Collection<HudsonFolder> createFolders(Collection<BuilderConnector.FolderData> foldersData) {
		565	Collection<HudsonFolder> result = new ArrayList<HudsonFolder>();
		566	for (BuilderConnector.FolderData datum : foldersData) {
		567	result.add(new HudsonFolderImpl(this, datum.getName(), datum.getUrl()));
		568	}
		569	return result;
		570	}
		571
554	private void configureViews(Collection<BuilderConnector.ViewData> viewsData) {	572	private void configureViews(Collection<BuilderConnector.ViewData> viewsData) {
555		573
556	Collection<HudsonView> viewList = new ArrayList<HudsonView>();	574	Collection<HudsonView> viewList = new ArrayList<HudsonView>();

Lines 42-53 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/spi/BuilderConnector.java (+49 lines)
42	package org.netbeans.modules.hudson.spi;	42	package org.netbeans.modules.hudson.spi;
43		43
44	import java.util.Collection;	44	import java.util.Collection;
		45	import java.util.Collections;
45	import java.util.LinkedList;	46	import java.util.LinkedList;
46	import java.util.List;	47	import java.util.List;
47	import java.util.concurrent.atomic.AtomicBoolean;	48	import java.util.concurrent.atomic.AtomicBoolean;
48	import java.util.concurrent.atomic.AtomicReference;	49	import java.util.concurrent.atomic.AtomicReference;
49	import org.netbeans.api.annotations.common.CheckForNull;	50	import org.netbeans.api.annotations.common.CheckForNull;
50	import org.netbeans.api.annotations.common.NonNull;	51	import org.netbeans.api.annotations.common.NonNull;
		52	import org.netbeans.modules.hudson.api.HudsonFolder;
51	import org.netbeans.modules.hudson.api.HudsonJob;	53	import org.netbeans.modules.hudson.api.HudsonJob;
52	import org.netbeans.modules.hudson.api.HudsonJob.Color;	54	import org.netbeans.modules.hudson.api.HudsonJob.Color;
53	import org.netbeans.modules.hudson.api.HudsonJobBuild;	55	import org.netbeans.modules.hudson.api.HudsonJobBuild;
Lines 76-81 Link Here
76	boolean authentication);	78	boolean authentication);
77		79
78	/**	80	/**
		81	* Like {@link #getInstanceData(boolean)} but gets the contents of a folder rather than top level.
		82	* Consider abstract; the default implementation produces an empty result.
		83	* @since XXX
		84	*/
		85	public /abstract/ @NonNull InstanceData getInstanceData(@NonNull HudsonFolder parentFolder, boolean authentication) {
		86	return new InstanceData(Collections.<JobData>emptyList(), Collections.<ViewData>emptyList(), Collections.<FolderData>emptyList());
		87	}
		88
		89	/**
79	* Get builds for the specified job.	90	* Get builds for the specified job.
80	*/	91	*/
81	public abstract @NonNull Collection<BuildData> getJobBuildsData(	92	public abstract @NonNull Collection<BuildData> getJobBuildsData(
Lines 336-341 Link Here
336	}	347	}
337	}	348	}
338		349
		350	/** @since XXX */
		351	public static final class FolderData {
		352
		353	private String name;
		354	private String url;
		355
		356	public String getName() {
		357	return name;
		358	}
		359
		360	public void setName(String name) {
		361	this.name = name;
		362	}
		363
		364	public String getUrl() {
		365	return url;
		366	}
		367
		368	public void setUrl(String url) {
		369	this.url = url;
		370	}
		371
		372	}
		373
339	/**	374	/**
340	* Type for storing build module data	375	* Type for storing build module data
341	*/	376	*/
Lines 428-437 Link Here
428		463
429	private Collection<JobData> jobsData;	464	private Collection<JobData> jobsData;
430	private Collection<ViewData> viewsData;	465	private Collection<ViewData> viewsData;
		466	private final Collection<FolderData> foldersData;
431		467
		468	@Deprecated
432	public InstanceData(Collection<JobData> jobsData, Collection<ViewData> viewsData) {	469	public InstanceData(Collection<JobData> jobsData, Collection<ViewData> viewsData) {
		470	this(jobsData, viewsData, Collections.<FolderData>emptySet());
		471	}
		472
		473	/** @since XXX */
		474	public InstanceData(Collection<JobData> jobsData, Collection<ViewData> viewsData, Collection<FolderData> foldersData) {
433	this.jobsData = jobsData;	475	this.jobsData = jobsData;
434	this.viewsData = viewsData;	476	this.viewsData = viewsData;
		477	this.foldersData = foldersData;
435	}	478	}
436		479
437	public Collection<JobData> getJobsData() {	480	public Collection<JobData> getJobsData() {
Lines 441-445 Link Here
441	public Collection<ViewData> getViewsData() {	484	public Collection<ViewData> getViewsData() {
442	return viewsData;	485	return viewsData;
443	}	486	}
		487
		488	/** @since XXX */
		489	public Collection<FolderData> getFoldersData() {
		490	return foldersData;
		491	}
		492
444	}	493	}
445	}	494	}

Lines 47-57 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/ui/nodes/HudsonInstanceNode.java (-6 / +17 lines)
47	import java.io.IOException;	47	import java.io.IOException;
48	import java.util.ArrayList;	48	import java.util.ArrayList;
49	import java.util.Collections;	49	import java.util.Collections;
		50	import java.util.LinkedList;
50	import java.util.List;	51	import java.util.List;
51	import java.util.prefs.PreferenceChangeEvent;	52	import java.util.prefs.PreferenceChangeEvent;
52	import java.util.prefs.PreferenceChangeListener;	53	import java.util.prefs.PreferenceChangeListener;
53	import javax.swing.Action;	54	import javax.swing.Action;
54	import org.netbeans.modules.hudson.api.HudsonChangeListener;	55	import org.netbeans.modules.hudson.api.HudsonChangeListener;
		56	import org.netbeans.modules.hudson.api.HudsonFolder;
55	import org.netbeans.modules.hudson.api.HudsonInstance;	57	import org.netbeans.modules.hudson.api.HudsonInstance;
56	import org.netbeans.modules.hudson.api.HudsonJob;	58	import org.netbeans.modules.hudson.api.HudsonJob;
57	import org.netbeans.modules.hudson.api.HudsonJob.Color;	59	import org.netbeans.modules.hudson.api.HudsonJob.Color;
Lines 65-70 Link Here
65	import org.openide.nodes.Children;	67	import org.openide.nodes.Children;
66	import org.openide.nodes.Node;	68	import org.openide.nodes.Node;
67	import org.openide.util.NbBundle.Messages;	69	import org.openide.util.NbBundle.Messages;
		70	import org.openide.util.Union2;
68	import org.openide.util.lookup.Lookups;	71	import org.openide.util.lookup.Lookups;
69		72
70	/**	73	/**
Lines 195-201 Link Here
195	*/	198	*/
196	public static final String SELECTED_VIEW = "view"; // NOI18N	199	public static final String SELECTED_VIEW = "view"; // NOI18N
197		200
198	private static class InstanceNodeChildren extends Children.Keys<HudsonJob> implements HudsonChangeListener {	201	private static class InstanceNodeChildren extends Children.Keys<Union2<HudsonJob,HudsonFolder>> implements HudsonChangeListener {
199		202
200	private final HudsonInstanceImpl instance;	203	private final HudsonInstanceImpl instance;
201		204
Lines 209-223 Link Here
209	});	212	});
210	}	213	}
211		214
212	@Override protected Node[] createNodes(HudsonJob job) {	215	@Override protected Node[] createNodes(Union2<HudsonJob,HudsonFolder> item) {
213	return new Node[] {new HudsonJobNode(job)};	216	return new Node[] {item.hasFirst() ? new HudsonJobNode(item.first()) : new HudsonFolderNode(item.second())};
214	}	217	}
215		218
216	@Override	219	@Override
217	protected void addNotify() {	220	protected void addNotify() {
218	super.addNotify();	221	super.addNotify();
219	if (!instance.isConnected()/* && seems undesirable: !instance.isForbidden()*/) {	222	if (!instance.isConnected()/* && seems undesirable: !instance.isForbidden()*/) {
220	setKeys(Collections.<HudsonJob>emptySet());	223	setKeys(Collections.<Union2<HudsonJob,HudsonFolder>>emptySet());
221	instance.synchronize(true);	224	instance.synchronize(true);
222	} else {	225	} else {
223	refreshKeys();	226	refreshKeys();
Lines 226-232 Link Here
226		229
227	@Override	230	@Override
228	protected void removeNotify() {	231	protected void removeNotify() {
229	setKeys(Collections.<HudsonJob>emptySet());	232	setKeys(Collections.<Union2<HudsonJob,HudsonFolder>>emptySet());
230	super.removeNotify();	233	super.removeNotify();
231	}	234	}
232		235
Lines 249-255 Link Here
249	jobs.add(job);	252	jobs.add(job);
250	}	253	}
251	Collections.sort(jobs);	254	Collections.sort(jobs);
252	setKeys(jobs);	255	List<Union2<HudsonJob,HudsonFolder>> items = new LinkedList<Union2<HudsonJob,HudsonFolder>>();
		256	for (HudsonFolder folder : instance.getFolders()) {
		257	// XXX ideally should restrict by selected view, like jobs
		258	items.add(Union2.<HudsonJob,HudsonFolder>createSecond(folder));
		259	}
		260	for (HudsonJob job : jobs) {
		261	items.add(Union2.<HudsonJob,HudsonFolder>createFirst(job));
		262	}
		263	setKeys(items);
253	}	264	}
254		265
255	@Override public void stateChanged() {	266	@Override public void stateChanged() {

Line 0 Link Here

(-)a/hudson/src/org/netbeans/modules/hudson/api/HudsonFolder.java (+75 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2013 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2013 Sun Microsystems, Inc.
		41	*/
		42
		43	package org.netbeans.modules.hudson.api;
		44
		45	import java.util.Collection;
		46	import javax.swing.event.ChangeListener;
		47
		48	/**
		49	* An item which is a folder for other jobs (or subfolders).
		50	* Could be any {@code ViewGroup} but probably from the CloudBees Folders plugin for Jenkins.
		51	* <p>The current interface defines no {@code getViews} method, showing only the primary view.
		52	* This is not such a loss, since heavy users of folders are not likely to need lots of views anyway.
		53	* The standard connector also assumes that there is an exported {@link primaryView} field,
		54	* defined in the Jenkins version of the interface.
		55	* <p>In the Hudson/Jenkins model, this would really in an inheritance hierarchy with {@link HudsonJob} and {@link HudsonInstance},
		56	* but due to the many methods in those interfaces which make no sense on folders, it seems better to separate them.
		57	* @since XXX
		58	*/
		59	public interface HudsonFolder {
		60
		61	String getName();
		62
		63	String getUrl();
		64
65	Collection<HudsonJob> getJobs();
66
67	Collection<HudsonFolder> getFolders();
68
69	HudsonInstance getInstance();
70
71	void addChangeListener(ChangeListener listener);
72
73	void removeChangeListener(ChangeListener listener);
74
75	}