Attachment #55235 for bug #44035

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 44035
Collapse All | Expand All





    <!-- ACTUAL CHANGES BEGIN HERE: -->
    <changes>

    <change id="project-libraries">
        <api name="general"/>
        <summary>Support for project libraries</summary>
        <version major="1" minor="17"/>
        <date day="22" month="1" year="2008"/>
        <author login="jglick"/>
        <compatibility addition="yes" deprecation="yes">
            <p>
                <code>LibraryManager.addLibrary</code> will not work with areas,
                so it was deprecated in favor of the new <code>createLibrary</code>.
            </p>
            <p>
                Code which obtained a <code>Library</code> of arbitrary origin,
                and then assumed it could refer to that library henceforth by name only,
                will not work with project libraries.
                The simplest persistent identifier for a new-style library is pair of name
                and URL of manager (null for the default manager).
            </p>
        </compatibility>
        <description>
            <p>
                There is a new API and SPI for project libraries
                (or, more generally, libraries with specific storage locations).
                <code>LibraryChooser</code>, <code>ArealLibraryProvider</code>,
                and <code>LibraryStorageArea</code> are new, as are methods
                <code>Library.getManager</code>,
                <code>LibraryManager.getDisplayName</code>,
                <code>LibraryManager.getLocation</code>,
                <code>LibraryManager.createLibrary</code>,
                <code>LibraryManager.forLocation</code>, and
                <code>LibraryManager.getOpenManagers</code>.
                (<code>LibraryProvider</code> was also generified.)
            </p>
        </description>
        <class package="org.netbeans.api.project.libraries" name="LibraryManager"/>
        <class package="org.netbeans.api.project.libraries" name="Library"/>
        <class package="org.netbeans.api.project.libraries" name="LibraryChooser"/>
        <class package="org.netbeans.spi.project.libraries" name="LibraryProvider"/>
        <class package="org.netbeans.spi.project.libraries" name="ArealLibraryProvider"/>
        <class package="org.netbeans.spi.project.libraries" name="LibraryStorageArea"/>
        <issue number="44035"/>
    </change>
    
    <change id="Customizer-can-be-null">
            <api name="general"/>




            <code-name-base>org.netbeans.modules.project.libraries</code-name-base>
            <module-dependencies>
                <dependency>
                    <code-name-base>org.jdesktop.layout</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>
                    <run-dependency>
                        <release-version>1</release-version>
                        <specification-version>1.5</specification-version>
                    </run-dependency>
                </dependency>
                <dependency>
                    <code-name-base>org.netbeans.modules.projectapi</code-name-base>
                    <build-prerequisite/>
                    <compile-dependency/>

                    </test-dependency>
                    <test-dependency>
                        <code-name-base>org.openide.util</code-name-base>
                        <compile-dependency/>
                        <test/>
                    </test-dependency>
                </test-type>




# made subject to such option by the copyright holder.

TXT_LibrariesManager=Library Manager

LibraryChooserGUI.add.title=Add Library
LibraryChooserGUI.add.button=Add Library
LibraryChooserGUI.import.title=Import Library
LibraryChooserGUI.import.button=Import Library
LibraryChooserGUI.manage=&Manage Libraries...
LibraryChooserGUI.accessibleDescription=The library manager allows you to add predefined libraries to the project classpath or to edit library definitions.
LibraryChooserGUI.librariesLabel=Available &Libraries:
LibraryChooserGUI.createButton.text=Create...
LibraryChooserGUI.importButton.text=Import...
LibraryChooserGUI.manageLibrariesButton.text=Manage Libraries...
LibrariesCustomizer.createLibrary.title=Create New Library
LibrariesCustomizer.customizeLibrary.title=Customize Library




import org.openide.DialogDisplayer;
import org.openide.util.NbBundle;
import java.awt.Dialog;
import javax.swing.border.EmptyBorder;
import org.netbeans.modules.project.libraries.LibraryTypeRegistry;
import org.netbeans.modules.project.libraries.ui.LibrariesModel;
import org.netbeans.modules.project.libraries.ui.NewLibraryPanel;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryStorageArea;
import org.netbeans.spi.project.libraries.LibraryTypeProvider;

/** Provides method for opening Libraries customizer
 *

    }

    /**
     * Shows libraries customizer for given library manager.
     * @param activeLibrary if not null the activeLibrary is selected in the opened customizer
     * @return true if user pressed OK and libraries were sucessfully modified
     */
    public static boolean showCustomizer (Library activeLibrary, LibraryManager libraryManager) {
        org.netbeans.modules.project.libraries.ui.LibrariesCustomizer  customizer =
                new org.netbeans.modules.project.libraries.ui.LibrariesCustomizer (libraryManager.getArea());
        customizer.setBorder(new EmptyBorder(12, 12, 0, 12));
        if (activeLibrary != null)
            customizer.setSelectedLibrary (activeLibrary.getLibraryImplementation ());
        DialogDescriptor descriptor = new DialogDescriptor (customizer,NbBundle.getMessage(LibrariesCustomizer.class,
                "TXT_LibrariesManager"));
        Dialog dlg = DialogDisplayer.getDefault().createDialog(descriptor);
        try {
            dlg = DialogDisplayer.getDefault().createDialog (descriptor);
            dlg.setVisible(true);
            if (descriptor.getValue() == DialogDescriptor.OK_OPTION) {
                return customizer.apply();
            } else {
                return false;
            }
        } finally {
            dlg.dispose();
        }
    }

    /**
     * Shows libraries customizer for global libraries.
     * @param activeLibrary if not null the activeLibrary is selected in the opened customizer
     * @return true if user pressed OK and libraries were sucessfully modified
     */
    public static boolean showCustomizer (Library activeLibrary) {
        return showCustomizer(activeLibrary, LibraryManager.getDefault());
    }
    
    /**
     * Show customizer for creating new library in the given library manager.
     * @param manager manager
     * @return created persisted library or null if user cancelled operation
     * @since org.netbeans.modules.project.libraries/1 1.16
     */
    public static Library showCreateNewLibraryCustomizer(LibraryManager manager) {                                             
        if (manager == null) {
            manager = LibraryManager.getDefault();
        }
        LibraryStorageArea area = manager.getArea();
        if (area == null) {
            area = LibrariesModel.GLOBAL_AREA;
        }
        org.netbeans.modules.project.libraries.ui.LibrariesCustomizer  customizer =
                new org.netbeans.modules.project.libraries.ui.LibrariesCustomizer (area);
        NewLibraryPanel p = new NewLibraryPanel(customizer.getModel(), null, area);
        DialogDescriptor dd = new DialogDescriptor (p, 
                NbBundle.getMessage(LibrariesCustomizer.class,"LibrariesCustomizer.createLibrary.title"),
                true, DialogDescriptor.OK_CANCEL_OPTION, null, null);
        p.setDialogDescriptor(dd);
        Dialog dlg = DialogDisplayer.getDefault().createDialog (dd);
        dlg.setVisible(true);
        if (dd.getValue() == DialogDescriptor.OK_OPTION) {
            LibraryImplementation impl;
            if (area != LibrariesModel.GLOBAL_AREA) {
                impl = customizer.getModel().createArealLibrary(p.getLibraryType(), p.getLibraryName(), manager.getArea());
            } else {
                LibraryTypeProvider provider = LibraryTypeRegistry.getDefault().getLibraryTypeProvider(p.getLibraryType());
                if (provider == null) {
                    return null;
                }
                impl = provider.createLibrary();
                impl.setName(p.getLibraryName());
            }
            customizer.getModel().addLibrary(impl);
            customizer.forceTreeRecreation();
            if (customizeLibrary(customizer, impl)) {
                return manager.getLibrary(impl.getName());
            }
        }
        return null;
    }                                            

    /**
     * Show library customizer for the given library.
     * @param library library
     * @return true if library was modified or not
     * @since org.netbeans.modules.project.libraries/1 1.16
     */
    public static boolean showSingleLibraryCustomizer(Library library) {                                             
        org.netbeans.modules.project.libraries.ui.LibrariesCustomizer  customizer =
                new org.netbeans.modules.project.libraries.ui.LibrariesCustomizer (library.getManager().getArea());
        return customizeLibrary(customizer, library.getLibraryImplementation());
    }
    
    private static boolean customizeLibrary(org.netbeans.modules.project.libraries.ui.LibrariesCustomizer customizer, 
            LibraryImplementation activeLibrary) {
        customizer.hideLibrariesList();
        customizer.setBorder(new EmptyBorder(12, 8, 0, 10));
        customizer.setSelectedLibrary (activeLibrary);
        DialogDescriptor descriptor = new DialogDescriptor (customizer,NbBundle.getMessage(LibrariesCustomizer.class,
                "LibrariesCustomizer.customizeLibrary.title"));
        Dialog dlg = DialogDisplayer.getDefault().createDialog(descriptor);
        try {
            dlg.setVisible(true);
            if (descriptor.getValue() == DialogDescriptor.OK_OPTION) {
                customizer.apply();
                return true;
            } else {
                return false;
            }
        } finally {
            dlg.dispose();
                dlg.dispose();
        }
        return false;
    }
    
}





import java.beans.PropertyChangeEvent;
import java.net.URL;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
import java.util.MissingResourceException;
import java.util.ResourceBundle;


    private List<PropertyChangeListener> listeners;

    private final LibraryManager manager;

    Library(LibraryImplementation impl, LibraryManager manager) {
     */
    private Library (LibraryImplementation impl) {
        this.impl = impl;
        this.impl.addPropertyChangeListener (new PropertyChangeListener () {
            public void propertyChange(PropertyChangeEvent evt) {

                Library.this.fireChange (propName,evt.getOldValue(),evt.getNewValue());
            }
        });
        this.manager = manager;
    } // end create

    /**
     * Gets the associated library manager.
     * @return the manager (may be the "default" global manager, or a local manager)
     * @since org.netbeans.modules.project.libraries/1 1.15
     */
    public LibraryManager getManager() {
        return manager;
    }

    /**
     * Access typed but raw library data.
     * <p>
     * The contents are defined by SPI providers and identified

        return impl.hashCode();
    }
    
    @Override
    public String toString () {
        return this.getName();
    }

    /**
     * Adds PropertyChangeListener
     * @param listener

            return key;
        }
    }

    @Override
    public String toString() {
        return "Library[" + getName() + "]"; // NOI18N
    }
    
    static {
        LibraryAccessor.DEFAULT = new LibraryAccessor () {
            public Library createLibrary (LibraryImplementation impl) {
                return new Library(impl, LibraryManager.getDefault());
            }
        };
    }




/*
 * The contents of this file are subject to the terms of the Common Development
 * and Distribution License (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.html
 * or http://www.netbeans.org/cddl.txt.
 *
 * When distributing Covered Code, include this CDDL Header Notice in each file
 * and include the License file at http://www.netbeans.org/cddl.txt.
 * If applicable, add the following below the CDDL Header, with the fields
 * enclosed by brackets [] replaced by your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.api.project.libraries;

import java.awt.Component;
import java.beans.PropertyChangeListener;
import java.io.IOException;
import java.util.Set;

/**
 * Visual picker for libraries.
 * @since org.netbeans.modules.project.libraries/1 1.16
 */
public final class LibraryChooser {

    private LibraryChooser() {
    }
    
    /**
     * Create a chooser showing libraries from given library manager and let the
     * user to pick some.
     * @param manager manager; can be null in which case global libraries are listed
     * @param filter optional libraries filter; null for no filtering
     * @param handler handler to perform library importing; can be null in which case
     *  import will not be allowed in UI
     * @return a nonempty set of libraries that were selected, or null if the dialog was cancelled
     */
    public static Set<Library> showDialog(LibraryManager manager, Filter filter, LibraryImportHandler handler) {
        return LibraryChooserGUI.showChooser(manager, filter, handler, true);
    }

    /**
     * Create a picker as an embeddable panel.
     * Might be used in a wizard, for example.
     * @param manager library manager to use or null for global libraries
     * @param filter optional libraries filter; null for no filtering
     * @return a panel controller
     */
    public static Panel createPanel(LibraryManager manager, Filter filter) {
        return LibraryChooserGUI.createPanel(manager, filter);
    }

    /**
     * Filter for use by {@link LibraryChooser#createPanel()} or 
     * {@link LibraryChooser#showDialog()}.
     */
    public interface Filter {

        /**
         * Accepts or rejects a library.
         * @param library a library found in one of the managers
         * @return true to display, false to hide
         */
        boolean accept(Library library);

    }

    /**
     * Represents operations permitted by {@link #createPanel}.
     * Not to be implemented by foreign code (methods may be added in the future).
     */
    public interface Panel {

        /**
         * Produces the actual component you can display.
         * @return an embeddable GUI component
         */
        Component getVisualComponent();

        /**
         * Gets the set of libraries which are currently selected.
         * @return a (possibly empty) set of libraries
         */
        Set<Library> getSelectedLibraries();

        /**
         * Property fired when {@link #getSelectedLibraries} changes.
         * Do not expect the old and new values to be non-null.
         */
        String PROP_SELECTED_LIBRARIES = "selectedLibraries"; // NOI18N

        /**
         * Add a listener for {@link #PROP_SELECTED_LIBRARIES}.
         * @param listener the listener to add
         */
        void addPropertyChangeListener(PropertyChangeListener listener);

        /**
         * Remove a listener.
         * @param listener the listener to remove
         */
        void removePropertyChangeListener(PropertyChangeListener listener);

    }

    /**
     * Handler for library importing. The handler is used from library chooser
     * UI in order to import global library to sharable libraries location. A 
     * library is only imported if there is no library with the same library
     * name in destination library manager.
     */
    public interface LibraryImportHandler {
        
        /**
         * Implementation is expected to copy given global library to 
         * sharable libraries location, that is to library manager the library
         * chooser was created for.
         * 
         * @param library library to copy
         * @return newly created library
         * @throws java.io.IOException any IO failure
         * @throws IllegalArgumentException if there already exists library 
         *  with this name
         */
        Library importLibrary(Library library) throws IOException;
    }
    
}




<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <AccessibilityProperties>
    <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
      <ResourceString bundle="org/netbeans/api/project/libraries/Bundle.properties" key="LibraryChooserGUI.accessibleDescription" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
    </Property>
  </AccessibilityProperties>
  <AuxValues>
    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
  </AuxValues>

  <Layout>
    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
          <Component id="librariesLabel" min="-2" max="-2" attributes="0"/>
          <Group type="102" alignment="1" attributes="0">
              <Component id="tree" pref="257" max="32767" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="1" attributes="0">
                  <Component id="createButton" min="-2" max="-2" attributes="0"/>
                  <Component id="importButton" min="-2" max="-2" attributes="0"/>
              </Group>
          </Group>
          <Group type="102" alignment="0" attributes="0">
              <Component id="manageLibrariesButton" min="-2" max="-2" attributes="0"/>
              <EmptySpace max="-2" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>
    <DimensionLayout dim="1">
      <Group type="103" groupAlignment="0" attributes="0">
          <Group type="102" alignment="0" attributes="0">
              <Component id="librariesLabel" min="-2" max="-2" attributes="0"/>
              <EmptySpace min="-2" max="-2" attributes="0"/>
              <Group type="103" groupAlignment="0" attributes="0">
                  <Group type="102" attributes="0">
                      <Component id="createButton" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="importButton" min="-2" max="-2" attributes="0"/>
                  </Group>
                  <Component id="tree" pref="284" max="32767" attributes="0"/>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="manageLibrariesButton" min="-2" max="-2" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>
  </Layout>
  <SubComponents>
    <Component class="javax.swing.JLabel" name="librariesLabel">
      <Properties>
        <Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
          <ComponentRef name="tree"/>
        </Property>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/api/project/libraries/Bundle.properties" key="LibraryChooserGUI.librariesLabel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <AuxValues>
        <AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
      </AuxValues>
    </Component>
    <Component class="org.openide.explorer.view.BeanTreeView" name="tree">
      <Properties>
        <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
          <Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
            <EtchetBorder/>
          </Border>
        </Property>
        <Property name="popupAllowed" type="boolean" value="false"/>
        <Property name="rootVisible" type="boolean" value="false"/>
      </Properties>
    </Component>
    <Component class="javax.swing.JButton" name="createButton">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/api/project/libraries/Bundle.properties" key="LibraryChooserGUI.createButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="createButtonActionPerformed"/>
      </Events>
    </Component>
    <Component class="javax.swing.JButton" name="importButton">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/api/project/libraries/Bundle.properties" key="LibraryChooserGUI.importButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="importButtonActionPerformed"/>
      </Events>
    </Component>
    <Component class="javax.swing.JButton" name="manageLibrariesButton">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/api/project/libraries/Bundle.properties" key="LibraryChooserGUI.manageLibrariesButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;)"/>
        </Property>
      </Properties>
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="manageLibrariesButtonActionPerformed"/>
      </Events>
    </Component>
  </SubComponents>
</Form>




/*
 * The contents of this file are subject to the terms of the Common Development
 * and Distribution License (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.html
 * or http://www.netbeans.org/cddl.txt.
 *
 * When distributing Covered Code, include this CDDL Header Notice in each file
 * and include the License file at http://www.netbeans.org/cddl.txt.
 * If applicable, add the following below the CDDL Header, with the fields
 * enclosed by brackets [] replaced by your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.api.project.libraries;

import java.awt.BorderLayout;
import java.awt.Component;
import java.awt.Image;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyVetoException;
import java.io.IOException;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
import javax.swing.JButton;
import javax.swing.JPanel;
import javax.swing.border.EmptyBorder;
import org.openide.DialogDescriptor;
import org.openide.DialogDisplayer;
import org.openide.NotifyDescriptor;
import org.openide.explorer.ExplorerManager;
import org.openide.filesystems.Repository;
import org.openide.loaders.DataFolder;
import org.openide.nodes.AbstractNode;
import org.openide.nodes.Children;
import org.openide.nodes.Node;
import org.openide.nodes.NodeNotFoundException;
import org.openide.nodes.NodeOp;
import org.openide.util.Exceptions;
import org.openide.util.HelpCtx;
import org.openide.util.NbBundle;
import org.openide.util.lookup.Lookups;

class LibraryChooserGUI extends JPanel implements ExplorerManager.Provider, HelpCtx.Provider, LibraryChooser.Panel {

    private final LibraryManager manager;
    private final LibraryChooser.Filter filter;
    private final ExplorerManager explorer;
    private LibraryChooser.LibraryImportHandler importHandler;

    private LibraryChooserGUI(LibraryManager manager, LibraryChooser.Filter filter, 
            LibraryChooser.LibraryImportHandler importHandler) {
        if (manager == null) {
            manager = LibraryManager.getDefault();
        }
        this.manager = manager;
        this.filter = filter;
        this.importHandler = importHandler;
        explorer = new ExplorerManager();
        initComponents();
        tree.setDefaultActionAllowed(false);
    }
    
    public static LibraryChooser.Panel createPanel(LibraryManager manager, 
            LibraryChooser.Filter filter) {
        LibraryChooserGUI l = new LibraryChooserGUI(manager, filter, null);
        l.configureForEmbedded();
        return l;
    }

    public static Set<Library> showChooser(LibraryManager manager, LibraryChooser.Filter filter, 
            LibraryChooser.LibraryImportHandler handler, boolean addOperation) {
        LibraryChooserGUI l = new LibraryChooserGUI(manager, filter, handler);
        return l.showDialog(addOperation);
    }

    private Set<Library> showDialog(boolean addOperatation) {
        // show manage button only in embedded panel:
        manageLibrariesButton.setVisible(false);
        // import enabled only for non-global library manager
        importButton.setVisible(manager.getLocation() != null && importHandler != null);
        JPanel inset = new JPanel(new BorderLayout());
        inset.setBorder(new EmptyBorder(12,12,0,12));
        inset.add(this);
        String title;
        String buttonLabel;
        if (addOperatation) {
            title = NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.add.title");
            buttonLabel = NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.add.button");
        } else {
            title = NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.import.title");
            buttonLabel = NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.import.button");
            createButton.setVisible(false);
        }
        DialogDescriptor dd = new DialogDescriptor(inset, title);
        dd.setModal(true);
        final JButton add = new JButton(buttonLabel);
        add.setEnabled(false);
        add.setDefaultCapable(true);
        explorer.addPropertyChangeListener(new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent evt) {
               add.setEnabled(!getSelectedLibraries().isEmpty());
           }
        });
        dd.setOptions(new Object[] {add, NotifyDescriptor.CANCEL_OPTION});
        dd.setClosingOptions(new Object[] {add, NotifyDescriptor.CANCEL_OPTION});
        if (DialogDisplayer.getDefault().notify(dd) == add) {
            Set<Library> selection = getSelectedLibraries();
            assert !selection.isEmpty();
            return selection;
        } else {
            return null;
        }
    }

    private void configureForEmbedded() {
        explorer.addPropertyChangeListener(new PropertyChangeListener() {
           public void propertyChange(PropertyChangeEvent evt) {
               firePropertyChange(PROP_SELECTED_LIBRARIES, null, null);
           }
        });
        createButton.setVisible(false);
        importButton.setVisible(false);
    }

    public Set<Library> getSelectedLibraries() {
        Set<Library> s = new HashSet<Library>();
        for (Node n : explorer.getSelectedNodes()) {
            Library l = n.getLookup().lookup(Library.class);
            if (l != null) {
                s.add(l);
            } else {
                return Collections.emptySet();
            }
        }
        return s;
    }

    public Component getVisualComponent() {
        return this;
    }

    public ExplorerManager getExplorerManager() {
        return explorer;
    }

    public HelpCtx getHelpCtx() {
        return new HelpCtx(LibraryChooserGUI.class);
    }

    private void setRootNode() {
        explorer.setRootContext(new AbstractNode(new LibraryManagerChildren()));
        tree.expandAll();
        try {
            if (explorer.getRootContext().getChildren().getNodes(true).length > 0) {
                explorer.setSelectedNodes(new Node[] {explorer.getRootContext().getChildren().getNodes(true)[0]});
            }
        } catch (PropertyVetoException x) {
            Exceptions.printStackTrace(x);
        }
        /* XXX Nothing seems to work to scroll to top; how is it done?
        tree.getViewport().setViewPosition(new Point());
        tree.getViewport().scrollRectToVisible(new Rectangle(0, 0, 1, 1));
         */
        tree.requestFocus();
    }

    @Override
    public void addNotify() {
        super.addNotify();
        setRootNode();
    }

    private class LibraryManagerChildren extends Children.Keys<LibraryManager> {

        @Override
        protected void addNotify() {
            super.addNotify();
            if (manager != null) {
                setKeys(Collections.singleton(manager));
            }
        }

        protected Node[] createNodes(LibraryManager mgr) {
            List<Library> libs = new ArrayList<Library>();
            for (Library lib : mgr.getLibraries()) {
                if (filter == null || filter.accept(lib)) {
                    libs.add(lib);
                }
            }
            if (libs.isEmpty()) {
                return new Node[0];
            } else {
                Collections.sort(libs,new Comparator<Library>() {
                    Collator COLL = Collator.getInstance();
                    public int compare(Library lib1, Library lib2) {
                        return COLL.compare(lib1.getDisplayName(), lib2.getDisplayName());
                    }
                });
                Node n = new AbstractNode(new LibraryChildren(libs)) {
                    Node iconDelegate = DataFolder.findFolder(Repository.getDefault().getDefaultFileSystem().getRoot()).getNodeDelegate();
                    public Image getIcon(int type) {
                        return iconDelegate.getIcon(type);
                    }
                    public Image getOpenedIcon(int type) {
                        return iconDelegate.getOpenedIcon(type);
                    }
                };
                n.setName(mgr.getDisplayName());
                n.setDisplayName(mgr.getDisplayName());
                return new Node[] {n};
            }
        }

    }

    private class LibraryChildren extends Children.Keys<Library> {

        LibraryChildren(List<Library> libs) {
            setKeys(libs);
        }

        protected Node[] createNodes(Library lib) {
            AbstractNode n = new AbstractNode(Children.LEAF, Lookups.singleton(lib));
            n.setName(lib.getName());
            n.setDisplayName(lib.getDisplayName());
            n.setShortDescription(lib.getDescription());
            n.setIconBaseWithExtension("org/netbeans/modules/project/libraries/resources/libraries.gif"); // NOI18N
            return new Node[] {n};
        }

    }

    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
    private void initComponents() {

        librariesLabel = new javax.swing.JLabel();
        tree = new org.openide.explorer.view.BeanTreeView();
        createButton = new javax.swing.JButton();
        importButton = new javax.swing.JButton();
        manageLibrariesButton = new javax.swing.JButton();

        librariesLabel.setLabelFor(tree);
        org.openide.awt.Mnemonics.setLocalizedText(librariesLabel, org.openide.util.NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.librariesLabel")); // NOI18N

        tree.setBorder(javax.swing.BorderFactory.createEtchedBorder());
        tree.setPopupAllowed(false);
        tree.setRootVisible(false);

        createButton.setText(org.openide.util.NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.createButton.text")); // NOI18N
        createButton.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                createButtonActionPerformed(evt);
            }
        });

        importButton.setText(org.openide.util.NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.importButton.text")); // NOI18N
        importButton.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                importButtonActionPerformed(evt);
            }
        });

        manageLibrariesButton.setText(org.openide.util.NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.manageLibrariesButton.text")); // NOI18N
        manageLibrariesButton.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                manageLibrariesButtonActionPerformed(evt);
            }
        });

        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
        this.setLayout(layout);
        layout.setHorizontalGroup(
            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
            .add(librariesLabel)
            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
                .add(tree, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 257, Short.MAX_VALUE)
                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                    .add(createButton)
                    .add(importButton)))
            .add(layout.createSequentialGroup()
                .add(manageLibrariesButton)
                .addContainerGap())
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
            .add(layout.createSequentialGroup()
                .add(librariesLabel)
                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
                    .add(layout.createSequentialGroup()
                        .add(createButton)
                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                        .add(importButton))
                    .add(tree, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 284, Short.MAX_VALUE))
                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                .add(manageLibrariesButton))
        );

        getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.accessibleDescription")); // NOI18N
    }// </editor-fold>//GEN-END:initComponents

    private void manageLibrariesButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_manageLibrariesButtonActionPerformed
        if (LibrariesCustomizer.showCustomizer(null, manager)) {
            setRootNode();
        }
    }//GEN-LAST:event_manageLibrariesButtonActionPerformed

    private void createButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_createButtonActionPerformed
        Library l = LibrariesCustomizer.showCreateNewLibraryCustomizer(manager);
        if (l != null) {
            setRootNode();
            selectLibrary(Collections.singleton(l));
        }
    }//GEN-LAST:event_createButtonActionPerformed

    private void selectLibrary(Collection<Library> libraries) {
        Node root = explorer.getRootContext();
        List<Node> selection = new ArrayList<Node>();
        for (Library lib : libraries) {
            String[] path = {lib.getManager().getDisplayName(), lib.getName()};
            try {
                Node node = NodeOp.findPath(root, path);
                if (node != null) {
                    selection.add(node);
                }
            } catch (NodeNotFoundException e) {
                //Ignore it
            }
        }
        try {
            explorer.setSelectedNodes(selection.toArray(new Node[selection.size()]));
        } catch (PropertyVetoException e) {
            //Ignore it
        }
    }
    
    private void importButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_importButtonActionPerformed
        Set<Library> libs = showChooser(LibraryManager.getDefault(), 
                new IgnoreAlreadyImportedLibrariesFilter(), null, false);
        if (libs != null) {
            Set<Library> importedLibs = new HashSet<Library>();
            try {
                for (Library lib : libs) {
                    importedLibs.add(importHandler.importLibrary(lib));
                }
            } catch (IOException ex) {
                Exceptions.printStackTrace(ex);
            }
            setRootNode();        
            selectLibrary(importedLibs);
        }
    }//GEN-LAST:event_importButtonActionPerformed

    private class IgnoreAlreadyImportedLibrariesFilter implements LibraryChooser.Filter {
        public boolean accept(Library library) {
            return manager.getLibrary(library.getName()) == null;
        }
    }

    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JButton createButton;
    private javax.swing.JButton importButton;
    private javax.swing.JLabel librariesLabel;
    private javax.swing.JButton manageLibrariesButton;
    private org.openide.explorer.view.BeanTreeView tree;
    // End of variables declaration//GEN-END:variables

}





package org.netbeans.api.project.libraries;


import org.netbeans.api.project.libraries.Library;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryProvider;
import org.openide.util.Lookup;
import org.openide.util.LookupListener;
import org.openide.util.LookupEvent;

import java.beans.PropertyChangeSupport;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.netbeans.modules.project.libraries.LibraryAccessor;
import org.netbeans.modules.project.libraries.WritableLibraryProvider;
import org.netbeans.modules.project.libraries.ui.LibrariesModel;
import org.netbeans.spi.project.libraries.ArealLibraryProvider;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryProvider;
import org.netbeans.spi.project.libraries.LibraryStorageArea;
import org.netbeans.spi.project.libraries.LibraryTypeProvider;
import org.netbeans.spi.project.libraries.support.LibrariesSupport;
import org.openide.util.Lookup;
import org.openide.util.LookupListener;
import org.openide.util.LookupEvent;

/**
 * LibraryManager provides registry of the installed libraries.

 */
public final class LibraryManager {

    /**
     * Property fired when the set of libraries changes.
     */
    public static final String PROP_LIBRARIES = "libraries"; //NOI18N

    private static LibraryManager instance;

    private Lookup.Result<LibraryProvider> result;
    private final Collection<LibraryProvider> currentStorages = new ArrayList<LibraryProvider>();
    private final PropertyChangeListener plistener = new PropertyChangeListener() {
        public void propertyChange(PropertyChangeEvent evt) {
            if (LibraryProvider.PROP_LIBRARIES.equals(evt.getPropertyName())) {
                resetCache();
            }
        }
    };
    private final PropertyChangeSupport listeners = new PropertyChangeSupport(this);
    private static final PropertyChangeSupport openLibraryManagerListListeners = 
            new PropertyChangeSupport(LibraryManager.class);
    private static final PropertyChangeListener AREAL_LIBRARY_PROVIDER_LISTENER = new PropertyChangeListener() {
            public void propertyChange(PropertyChangeEvent evt) {
                openLibraryManagerListListeners.firePropertyChange(PROP_OPEN_LIBRARY_MANAGERS, null, null);
            }
        };
        
    /** Property fired when list of open library managers changes. */
    public static final String PROP_OPEN_LIBRARY_MANAGERS = "openManagers"; // NOI18N
    private static Lookup.Result<ArealLibraryProvider> areaProvidersLookupResult = null;
    private static Collection<? extends ArealLibraryProvider> currentAreaProviders = new ArrayList<ArealLibraryProvider>();

    private Collection<Library> cache;
    /** null for default manager */
    private final ArealLibraryProvider alp;
    /** null for default manager */
    private final LibraryStorageArea area;

    private LibraryManager () {
        alp = null;
        area = null;
    }

    private LibraryManager(ArealLibraryProvider alp, LibraryStorageArea area) {
        this.alp = alp;
        this.area = area;
        LibraryProvider lp = LibraryAccessor.getLibraries(alp, area);
        lp.addPropertyChangeListener(plistener);
        currentStorages.add(lp);
    }

    /**
     * Gets a human-readable description of this manager.
     * This may be used to visually differentiate the global manager from various local managers.
     * @return a localized display name
     * @see LibraryStorageArea#getDisplayName
     * @since org.netbeans.modules.project.libraries/1 1.15
     */
    public String getDisplayName() {
        if (area == null) {
            return LibrariesModel.GLOBAL_AREA.getDisplayName();
        } else {
            return area.getDisplayName();
        }
    }

    /**
     * Gets the location associated with this manager.
     * @return a location where library definitions are kept, or null in the case of {@link #getDefault}
     * @see LibraryStorageArea#getLocation
     * @see #forLocation
     * @since org.netbeans.modules.project.libraries/1 1.15
     */
    public URL getLocation() {
        return area != null ? area.getLocation() : null;
    }

    /**

    }

    /**
     * Lists all libraries defined in this manager.
     * @return library definitions (never <code>null</code>)
     * @return Library[] library definitions never <code>null</code>
     */
    public synchronized Library[] getLibraries() {
        if (this.cache == null) {
            List<Library> l = new ArrayList<Library>();
            if (area == null) {
                if (result == null) {
                    result = Lookup.getDefault().lookupResult(LibraryProvider.class);
                    result.addLookupListener(new LookupListener() {
                        public void resultChanged(LookupEvent ev) {
                            resetCache();
                        }
                    });
                }
                Collection<? extends LibraryProvider> instances = result.allInstances();
                Collection<LibraryProvider> added = new HashSet<LibraryProvider>(instances);
                added.removeAll(currentStorages);
                Collection<LibraryProvider> removed = new HashSet<LibraryProvider>(currentStorages);
                removed.removeAll(instances);
                currentStorages.clear();
                for (LibraryProvider storage : instances) {
                    this.currentStorages.add(storage);
                    for (LibraryImplementation impl : storage.getLibraries()) {
                        l.add(new Library(impl, this));
                    }
                }
                for (LibraryProvider p : removed) {
                    p.removePropertyChangeListener(this.plistener);
                }
                for (LibraryProvider p : added) {
                    p.addPropertyChangeListener(this.plistener);
                }
            } else {
                for (LibraryImplementation impl : currentStorages.iterator().next().getLibraries()) {
                    l.add(new Library(impl, this));
                }
            }
            List<Library> l = new ArrayList<Library>();
            Collection<? extends LibraryProvider> instances = result.allInstances();
            Collection<LibraryProvider> added = new HashSet<LibraryProvider>(instances);
            added.removeAll (currentStorages);
            Collection<LibraryProvider> removed = new HashSet<LibraryProvider>(currentStorages);
            removed.removeAll (instances);
            currentStorages.clear();
            for (LibraryProvider storage : instances) {
                this.currentStorages.add (storage);
                for (LibraryImplementation impl : storage.getLibraries()) {
                    l.add(LibraryFactory.createLibrary(impl));
                }
            }
            for (LibraryProvider p : removed) {
                p.removePropertyChangeListener(this.plistener);
            }
            for (LibraryProvider p : added) {
                p.addPropertyChangeListener(this.plistener);
            }            
            this.cache = l;
        }
        return this.cache.toArray(new Library[this.cache.size()]);

     * @throws IOException when the library cannot be stored
     * @throws IllegalArgumentException if the library is not recognized by any 
     * {@link org.netbeans.spi.project.libraries.LibraryTypeProvider} or the library
     * of the same name already exists, or if this manager is not {@link #getDefault}.
     * @since org.netbeans.modules.project.libraries/1 1.14
     * @deprecated Use {@link #createLibrary} instead, as this properly supports local managers.
     */
    @Deprecated
    public void addLibrary (final Library library) throws IOException, IllegalArgumentException {
        assert library != null;
        if (LibrariesSupport.getLibraryTypeProvider(library.getType()) == null) {

        assert providers.size() == 1;        
        providers.iterator().next().addLibrary(library.getLibraryImplementation());
    }

    /**
     * Creates a new library definition and adds it to the list.
     * @param type the type of library, as in {@link LibraryTypeProvider#getLibraryType} or {@link LibraryImplementation#getType}
     * @param name the identifying name of the new library (must not duplicate a name already in use by a library in this manager)
     * @param contents the initial contents of the library's volumes, as a map from volume type to volume content
     * @return a newly created library
     * @throws IOException if the new definition could not be stored
     * @throws IllegalArgumentException if the library type or one of the content volume types is not supported,
     *                                  or if a library of the same name already exists in this manager
     * @see ArealLibraryProvider#createLibrary
     * @since org.netbeans.modules.project.libraries/1 1.15
     */
    public Library createLibrary(String type, String name, Map<String,List<URL>> contents) throws IOException {
        if (getLibrary(name) != null) {
            throw new IllegalArgumentException("Name already in use: " + name); // NOI18N
        }
        LibraryImplementation impl;
        if (area == null) {
            LibraryTypeProvider ltp = LibrariesSupport.getLibraryTypeProvider(type);
            if (ltp == null) {
                throw new IllegalArgumentException("Trying to add a library of unknown type: " + type); // NOI18N
            }
            impl = ltp.createLibrary();
            impl.setName(name);
            for (Map.Entry<String,List<URL>> entry : contents.entrySet()) {
                impl.setContent(entry.getKey(), entry.getValue());
            }
            Lookup.getDefault().lookup(WritableLibraryProvider.class).addLibrary(impl);
        } else {
            impl = LibraryAccessor.createLibrary(alp, type, name, area, contents);
        }
        return new Library(impl, this);
    }

    /**
     * Removes installed library 
     * @param library to be removed. 

     */
    public void removeLibrary (final Library library) throws IOException, IllegalArgumentException {
        assert library != null;
        if (area == null) {
            final Collection<? extends WritableLibraryProvider> providers = Lookup.getDefault().lookupAll(WritableLibraryProvider.class);
            assert providers.size() == 1;
            providers.iterator().next().removeLibrary(library.getLibraryImplementation());
        } else {
            LibraryAccessor.remove(alp, library.getLibraryImplementation());
        }
    }

    /**

        return instance;
    }

    /**
     * Gets a library manager which loads library definitions from a particular location.
     * There is no guarantee that the return value is the same object from call to call with the same location.
     * @param location any storage location supported by an installed provider
     * @return a library manager whose {@link #getLocation} matches the supplied location
     * @throws IllegalArgumentException if no installed provider is able to manage locations of this kind
     * @see ArealLibraryProvider#loadArea
     * @see ArealLibraryProvider#getLibraries
     * @since org.netbeans.modules.project.libraries/1 1.15
     */
    public static LibraryManager forLocation(URL location) throws IllegalArgumentException {
        for (ArealLibraryProvider alp : Lookup.getDefault().lookupAll(ArealLibraryProvider.class)) {
            LibraryStorageArea area = alp.loadArea(location);
            if (area != null) {
                return new LibraryManager(alp, area);
            }
        }
        throw new IllegalArgumentException(location.toExternalForm());
    }

    /**
     * Gets an unspecified collection of managers which are somehow to be represented as open.
     * For example, library storages referred to from open projects might be returned.
     * You can listen on changes in list of open managers via {@link #addOpenManagersPropertyChangeListener}.
     * There is no guarantee that the non-default managers are the same objects from call to call
     * even if the locations remain the same.
     * @see ArealLibraryProvider#getOpenAreas
     * @return a set of managers, always including at least {@link #getDefault}
     * @since org.netbeans.modules.project.libraries/1 1.15
     */
    public static Collection<LibraryManager> getOpenManagers() {
        List<LibraryManager> managers = new ArrayList<LibraryManager>();
        managers.add(getDefault());
        Set<URL> locations = new HashSet<URL>();
        for (ArealLibraryProvider alp : Lookup.getDefault().lookupAll(ArealLibraryProvider.class)) {
            for (LibraryStorageArea area : LibraryAccessor.getOpenAreas(alp)) {
                if (locations.add(area.getLocation())) {
                    managers.add(new LibraryManager(alp, area));
                }
            }
        }
        for (ArealLibraryProvider alp : Lookup.getDefault().lookupAll(ArealLibraryProvider.class)) {
            for (URL location : LibrariesModel.createdAreas) {
                LibraryStorageArea area = alp.loadArea(location);
                if (area != null) {
                    assert area.getLocation().equals(location) : "Bad location " + area.getLocation() + " does not match " + location + " from " + alp.getClass().getName();
                    if (locations.add(location)) {
                        managers.add(new LibraryManager(alp, area));
                    }
                }
            }
        }
        return managers;
    }

    /**
     * Adds PropertyChangeListener on list of open library managers.
     * The listener is notified when list of open library managers changes via
     * {@link #PROP_OPEN_LIBRARY_MANAGERS}.
     * @param listener to be notified
     */
    public static synchronized void addOpenManagersPropertyChangeListener (PropertyChangeListener listener) {
        assert listener != null;
        if (areaProvidersLookupResult == null) {
            areaProvidersLookupResult = Lookup.getDefault().lookupResult(ArealLibraryProvider.class);
            attachListeners(areaProvidersLookupResult.allInstances());
            areaProvidersLookupResult.addLookupListener(new LookupListener() {
                public void resultChanged(LookupEvent ev) {
                    attachListeners(areaProvidersLookupResult.allInstances());
                }
            });
        }
        openLibraryManagerListListeners.addPropertyChangeListener (listener);
    }
    
    private static synchronized void attachListeners(Collection<? extends ArealLibraryProvider> currentProviders) {
        for (ArealLibraryProvider provider : currentAreaProviders) {
            provider.removePropertyChangeListener(AREAL_LIBRARY_PROVIDER_LISTENER);
        }
        for (ArealLibraryProvider provider : currentProviders) {
            provider.addPropertyChangeListener(AREAL_LIBRARY_PROVIDER_LISTENER);
        }
        currentAreaProviders = currentProviders;
    }

    /**
     * Removes PropertyChangeListener
     * @param listener
     */
    public static void removeOpenManagersPropertyChangeListener (PropertyChangeListener listener) {
        assert listener != null;
        openLibraryManagerListListeners.removePropertyChangeListener (listener);
    }
    
    @Override
    public String toString() {
        URL loc = getLocation();
        return "LibraryManager[" + (loc != null ? loc : "default") + "]"; // NOI18N
    }

    LibraryStorageArea getArea() {
        return area;
    }

} // end LibraryManager


Lines 139-146 Link Here

(-)projects/libraries/src/org/netbeans/modules/project/libraries/DefaultLibraryImplementation.java:1.8 (-2 / +2 lines)
139	this.listeners.remove (l);	139	this.listeners.remove (l);
140	}	140	}
141		141
142	public String toString () {	142	public @Override String toString() {
143	return "LibraryImplementation[Name="+this.name+"]"; //NOI18N	143	return "DefaultLibraryImplementation[" + name + "]"; // NOI18N
144	}	144	}
145		145
146	private void firePropertyChange (String propName, Object oldValue, Object newValue) {	146	private void firePropertyChange (String propName, Object oldValue, Object newValue) {

Lines 76-82 Link Here

(-)projects/libraries/src/org/netbeans/modules/project/libraries/LibrariesStorage.java:1.26 (-1 / +1 lines)
76	import org.xml.sax.InputSource;	76	import org.xml.sax.InputSource;
77	import org.xml.sax.SAXException;	77	import org.xml.sax.SAXException;
78		78
79	public class LibrariesStorage extends FileChangeAdapter implements WritableLibraryProvider {	79	public class LibrariesStorage extends FileChangeAdapter implements WritableLibraryProvider<LibraryImplementation> {
80		80
81	private static final String NB_HOME_PROPERTY = "netbeans.home"; //NOI18N	81	private static final String NB_HOME_PROPERTY = "netbeans.home"; //NOI18N
82	private static final String LIBRARIES_REPOSITORY = "org-netbeans-api-project-libraries/Libraries"; //NOI18N	82	private static final String LIBRARIES_REPOSITORY = "org-netbeans-api-project-libraries/Libraries"; //NOI18N

Lines 41-54 Link Here

(-)projects/libraries/src/org/netbeans/modules/project/libraries/LibraryAccessor.java:1.2 (-5 / +51 lines)
41		41
42	package org.netbeans.modules.project.libraries;	42	package org.netbeans.modules.project.libraries;
43		43
		44	import java.io.IOException;
		45	import java.net.URL;
		46	import java.util.List;
		47	import java.util.Map;
		48	import java.util.Set;
44	import org.netbeans.api.project.libraries.Library;	49	import org.netbeans.api.project.libraries.Library;
		50	import org.netbeans.spi.project.libraries.ArealLibraryProvider;
45	import org.netbeans.spi.project.libraries.LibraryImplementation;	51	import org.netbeans.spi.project.libraries.LibraryImplementation;
		52	import org.netbeans.spi.project.libraries.LibraryProvider;
		53	import org.netbeans.spi.project.libraries.LibraryStorageArea;
46	import org.openide.util.Exceptions;	54	import org.openide.util.Exceptions;
47		55
48	/**
49	*
50	* @author Tomas Zezula
51	*/
52	public abstract class LibraryAccessor {	56	public abstract class LibraryAccessor {
53		57
54	public static LibraryAccessor DEFAULT;	58	public static LibraryAccessor DEFAULT;
Lines 63-67 Link Here
63	}	67	}
64		68
65	public abstract Library createLibrary (LibraryImplementation libraryImplementation);	69	public abstract Library createLibrary (LibraryImplementation libraryImplementation);
66		70
		71	// RADIKAL GENERIC HAX!
		72
		73	/**
		74	* Type-safe accessor for {@link ArealLibraryProvider#remove}.
		75	* @throws ClassCastException if the runtime types do not match
		76	*/
		77	public static void remove(ArealLibraryProvider alp, LibraryImplementation lib) throws IOException {
		78	remove0((ArealLibraryProvider<?,?>) alp, lib);
		79	}
		80	private static <L extends LibraryImplementation> void remove0(ArealLibraryProvider<?,L> alp, LibraryImplementation lib) throws IOException {
		81	alp.remove(alp.libraryType().cast(lib));
		82	}
		83
		84	/**
		85	* Type-safe accessor for {@link ArealLibraryProvider#getOpenAreas}.
		86	*/
		87	public static Set<? extends LibraryStorageArea> getOpenAreas(ArealLibraryProvider alp) {
		88	return ((ArealLibraryProvider<?,?>) alp).getOpenAreas();
		89	}
		90
		91	/**
		92	* Type-safe accessor for {@link ArealLibraryProvider#createLibrary}.
		93	* @throws ClassCastException if the runtime types do not match
		94	*/
		95	public static LibraryImplementation createLibrary(ArealLibraryProvider alp, String type, String name, LibraryStorageArea area, Map<String,List<URL>> contents) throws IOException {
		96	return createLibrary0(((ArealLibraryProvider<?,?>) alp), type, name, area, contents);
		97	}
		98	private static <A extends LibraryStorageArea> LibraryImplementation createLibrary0(ArealLibraryProvider<A,?> alp, String type, String name, LibraryStorageArea area, Map<String,List<URL>> contents) throws IOException {
		99	return alp.createLibrary(type, name, alp.areaType().cast(area), contents);
		100	}
		101
		102	/**
		103	* Type-safe accessor for {@link ArealLibraryProvider#getLibraries}.
		104	* @throws ClassCastException if the runtime types do not match
		105	*/
		106	public static LibraryProvider getLibraries(ArealLibraryProvider alp, LibraryStorageArea area) {
		107	return getLibraries0((ArealLibraryProvider<?,?>) alp, area);
		108	}
		109	private static <A extends LibraryStorageArea> LibraryProvider getLibraries0(ArealLibraryProvider<A,?> alp, LibraryStorageArea area) {
		110	return alp.getLibraries(alp.areaType().cast(area));
		111	}
		112
67	}	113	}

Lines 44-50 Link Here

(-)projects/libraries/src/org/netbeans/modules/project/libraries/WritableLibraryProvider.java:1.2 (-1 / +1 lines)
44	import org.netbeans.spi.project.libraries.LibraryProvider;	44	import org.netbeans.spi.project.libraries.LibraryProvider;
45	import java.io.IOException;	45	import java.io.IOException;
46		46
47	public interface WritableLibraryProvider extends LibraryProvider {	47	public interface WritableLibraryProvider<L extends LibraryImplementation> extends LibraryProvider<L> {
48		48
49	void addLibrary(LibraryImplementation library) throws IOException;	49	void addLibrary(LibraryImplementation library) throws IOException;
50		50




<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <AuxValues>
    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
    <AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
    <AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
  </AuxValues>

  <Layout>
    <DimensionLayout dim="0">
      <Group type="103" groupAlignment="0" attributes="0">
          <Group type="102" alignment="1" attributes="0">
              <EmptySpace min="-2" max="-2" attributes="0"/>
              <Group type="103" groupAlignment="1" attributes="0">
                  <Component id="placeholder" alignment="0" pref="377" max="32767" attributes="0"/>
                  <Group type="102" alignment="1" attributes="0">
                      <Component id="jLabel1" min="-2" max="-2" attributes="0"/>
                      <EmptySpace max="-2" attributes="0"/>
                      <Component id="libraryManagerComboBox" pref="289" max="32767" attributes="0"/>
                  </Group>
              </Group>
              <EmptySpace min="-2" max="-2" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>
    <DimensionLayout dim="1">
      <Group type="103" groupAlignment="0" attributes="0">
          <Group type="102" alignment="0" attributes="0">
              <EmptySpace max="-2" attributes="0"/>
              <Group type="103" groupAlignment="3" attributes="0">
                  <Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
                  <Component id="libraryManagerComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
              </Group>
              <EmptySpace max="-2" attributes="0"/>
              <Component id="placeholder" pref="230" max="32767" attributes="0"/>
          </Group>
      </Group>
    </DimensionLayout>
  </Layout>
  <SubComponents>
    <Component class="javax.swing.JComboBox" name="libraryManagerComboBox">
      <Events>
        <EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="libraryManagerComboBoxActionPerformed"/>
      </Events>
    </Component>
    <Container class="javax.swing.JPanel" name="placeholder">

      <Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
    </Container>
    <Component class="javax.swing.JLabel" name="jLabel1">
      <Properties>
        <Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
          <ResourceString bundle="org/netbeans/modules/project/libraries/ui/Bundle.properties" key="AllLibrariesCustomizer.jLabel1.text" replaceFormat="java.text.MessageFormat.format(org.openide.util.NbBundle.getMessage({sourceFileName}.class, &quot;{key}&quot;), {arguments})"/>
        </Property>
      </Properties>
    </Component>
  </SubComponents>
</Form>




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 *
 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
 *
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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]"
 *
 * Contributor(s):
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
 * Microsystems, Inc. All Rights Reserved.
 *
 * 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.
 */

package org.netbeans.modules.project.libraries.ui;

import org.netbeans.api.project.libraries.*;
import org.netbeans.modules.project.libraries.ui.*;
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import javax.swing.DefaultComboBoxModel;
import org.netbeans.api.project.libraries.LibraryManager;
import org.netbeans.modules.project.libraries.LibraryAccessor;
import org.netbeans.spi.project.libraries.ArealLibraryProvider;
import org.netbeans.spi.project.libraries.LibraryStorageArea;
import org.netbeans.spi.project.libraries.support.LibrariesSupport;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;

/**
 *
 */
class AllLibrariesCustomizer extends javax.swing.JPanel {
    
    private org.netbeans.modules.project.libraries.ui.LibrariesCustomizer librariesCustomizer;
    /** Creates new form AllLibrariesCustomizer */
    public AllLibrariesCustomizer() {
        initComponents();
        librariesCustomizer = new org.netbeans.modules.project.libraries.ui.LibrariesCustomizer(null);
        placeholder.add(librariesCustomizer);
        initModel();
    }

    public boolean apply() {
        return librariesCustomizer.apply();
    }
    
    private void initModel() {
        List<String> items = new ArrayList<String>();
        items.add(NbBundle.getMessage(AllLibrariesCustomizer.class, "LABEL_Global_Libraries"));
        for (LibraryManager man : LibraryManager.getOpenManagers()) {
            if (man.getLocation() == null) {
                continue;
            }
            items.add(LibrariesSupport.convertURLToFile(man.getLocation()).getPath());
        }
        libraryManagerComboBox.setModel(new DefaultComboBoxModel(items.toArray(new String[items.size()])));
    }
    
    /** This method is called from within the constructor to
     * initialize the form.
     * WARNING: Do NOT modify this code. The content of this method is
     * always regenerated by the Form Editor.
     */
    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
    private void initComponents() {

        libraryManagerComboBox = new javax.swing.JComboBox();
        placeholder = new javax.swing.JPanel();
        jLabel1 = new javax.swing.JLabel();

        libraryManagerComboBox.addActionListener(new java.awt.event.ActionListener() {
            public void actionPerformed(java.awt.event.ActionEvent evt) {
                libraryManagerComboBoxActionPerformed(evt);
            }
        });

        placeholder.setLayout(new java.awt.BorderLayout());

        jLabel1.setText(java.text.MessageFormat.format(org.openide.util.NbBundle.getMessage(AllLibrariesCustomizer.class, "AllLibrariesCustomizer.jLabel1.text"), new Object[] {})); // NOI18N

        org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
        this.setLayout(layout);
        layout.setHorizontalGroup(
            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
            .add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
                .addContainerGap()
                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
                    .add(org.jdesktop.layout.GroupLayout.LEADING, placeholder, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 377, Short.MAX_VALUE)
                    .add(layout.createSequentialGroup()
                        .add(jLabel1)
                        .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                        .add(libraryManagerComboBox, 0, 289, Short.MAX_VALUE)))
                .addContainerGap())
        );
        layout.setVerticalGroup(
            layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
            .add(layout.createSequentialGroup()
                .addContainerGap()
                .add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
                    .add(jLabel1)
                    .add(libraryManagerComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
                .addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
                .add(placeholder, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 230, Short.MAX_VALUE))
        );
    }// </editor-fold>//GEN-END:initComponents

    private void libraryManagerComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_libraryManagerComboBoxActionPerformed
        int index = libraryManagerComboBox.getSelectedIndex();
        if (index == -1) {
            return;
        } else if (index == 0) {
            librariesCustomizer.setLibraryStorageArea(null);
        } else if (index > 0) {
            URL u = LibrariesSupport.convertFileToURL(new File ((String)libraryManagerComboBox.getModel().getSelectedItem()));
            librariesCustomizer.setLibraryStorageArea(findLibraryStorageArea(u));
        }
    }//GEN-LAST:event_libraryManagerComboBoxActionPerformed
    
    private LibraryStorageArea findLibraryStorageArea(URL u) {
        for (ArealLibraryProvider alp : Lookup.getDefault().lookupAll(ArealLibraryProvider.class)) {
            for (LibraryStorageArea area : LibraryAccessor.getOpenAreas(alp)) {
                if (u.equals(area.getLocation())) {
                    return area;
                }
            }
        }
        return null;
    }
    
    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JLabel jLabel1;
    private javax.swing.JComboBox libraryManagerComboBox;
    private javax.swing.JPanel placeholder;
    // End of variables declaration//GEN-END:variables
    
}

Lines 63-65 Link Here

(-)projects/libraries/src/org/netbeans/modules/project/libraries/ui/Bundle.properties:1.24 (+6 lines)
63	AD_NewLibraryPanel=N/A	63	AD_NewLibraryPanel=N/A
64		64
65	TXT_LibrariesPanel=&Libraries\:	65	TXT_LibrariesPanel=&Libraries\:
		66	LBL_global=Global Libraries
		67
		68	areaLabel.text=Storage &Location\:
		69	LABEL_Global_Libraries=Global Libraries
		70	TXT_LibrariesManager=Library Manager
		71	AllLibrariesCustomizer.jLabel1.text=Libraries location:

Lines 1-17 Link Here

(-)projects/libraries/src/org/netbeans/modules/project/libraries/ui/LibrariesCustomizer.form:1.10 (-8 / +17 lines)
1	<?xml version="1.0" encoding="UTF-8" ?>	1	<?xml version="1.0" encoding="UTF-8" ?>
2		2
3	<Form version="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">	3	<Form version="1.2" maxVersion="1.2" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
		4	<Properties>
		5	<Property name="minimumSize" type="java.awt.Dimension" editor="org.netbeans.beaninfo.editors.DimensionEditor">
		6	<Dimension value="[642, 395]"/>
		7	</Property>
		8	</Properties>
4	<AccessibilityProperties>	9	<AccessibilityProperties>
5	<Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">	10	<Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
6	<ResourceString bundle="org/netbeans/modules/project/libraries/ui/Bundle.properties" key="AD_LibrariesCustomizer" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>	11	<ResourceString bundle="org/netbeans/modules/project/libraries/ui/Bundle.properties" key="AD_LibrariesCustomizer" replaceFormat="java.util.ResourceBundle.getBundle("{bundleNameSlashes}").getString("{key}")"/>
7	</Property>	12	</Property>
8	</AccessibilityProperties>	13	</AccessibilityProperties>
9	<AuxValues>	14	<AuxValues>
		15	<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="0"/>
		16	<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
10	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>	17	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
		18	<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="false"/>
		19	<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
11	<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>	20	<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
12	<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>	21	<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
13	<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>	22	<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
14	<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-67,0,0,2,-112"/>	23	<AuxValue name="designerSize" type="java.awt.Dimension" value="-84,-19,0,5,115,114,0,18,106,97,118,97,46,97,119,116,46,68,105,109,101,110,115,105,111,110,65,-114,-39,-41,-84,95,68,20,2,0,2,73,0,6,104,101,105,103,104,116,73,0,5,119,105,100,116,104,120,112,0,0,1,-72,0,0,2,-112"/>
15	</AuxValues>	24	</AuxValues>
16		25
17	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>	26	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout"/>
Lines 27-33 Link Here
27	</Properties>	36	</Properties>
28	<Constraints>	37	<Constraints>
29	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	38	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
30	<GridBagConstraints gridX="2" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="6" insetsBottom="12" insetsRight="6" anchor="18" weightX="0.0" weightY="0.0"/>	39	<GridBagConstraints gridX="3" gridY="1" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="6" insetsBottom="12" insetsRight="6" anchor="18" weightX="0.0" weightY="0.0"/>
31	</Constraint>	40	</Constraint>
32	</Constraints>	41	</Constraints>
33	</Component>	42	</Component>
Lines 42-55 Link Here
42	</AccessibilityProperties>	51	</AccessibilityProperties>
43	<Constraints>	52	<Constraints>
44	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	53	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
45	<GridBagConstraints gridX="3" gridY="1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="12" insetsRight="12" anchor="18" weightX="0.6" weightY="0.0"/>	54	<GridBagConstraints gridX="4" gridY="1" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="12" insetsRight="0" anchor="18" weightX="0.6" weightY="0.0"/>
46	</Constraint>	55	</Constraint>
47	</Constraints>	56	</Constraints>
48	</Component>	57	</Component>
49	<Container class="javax.swing.JPanel" name="jPanel1">	58	<Container class="javax.swing.JPanel" name="jPanel1">
50	<Constraints>	59	<Constraints>
51	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	60	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
52	<GridBagConstraints gridX="2" gridY="2" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="6" insetsBottom="12" insetsRight="12" anchor="18" weightX="1.0" weightY="1.0"/>	61	<GridBagConstraints gridX="3" gridY="2" gridWidth="0" gridHeight="1" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="6" insetsBottom="12" insetsRight="0" anchor="18" weightX="1.0" weightY="1.0"/>
53	</Constraint>	62	</Constraint>
54	</Constraints>	63	</Constraints>
55		64
Lines 95-101 Link Here
95	</Events>	104	</Events>
96	<Constraints>	105	<Constraints>
97	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	106	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
98	<GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="12" insetsBottom="0" insetsRight="12" anchor="18" weightX="0.0" weightY="0.0"/>	107	<GridBagConstraints gridX="0" gridY="3" gridWidth="1" gridHeight="1" fill="0" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="0" insetsRight="12" anchor="18" weightX="0.0" weightY="0.0"/>
99	</Constraint>	108	</Constraint>
100	</Constraints>	109	</Constraints>
101	</Component>	110	</Component>
Lines 134-140 Link Here
134	</AccessibilityProperties>	143	</AccessibilityProperties>
135	<Constraints>	144	<Constraints>
136	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	145	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
137	<GridBagConstraints gridX="0" gridY="1" gridWidth="2" gridHeight="2" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="12" insetsBottom="12" insetsRight="6" anchor="18" weightX="0.0" weightY="1.0"/>	146	<GridBagConstraints gridX="0" gridY="1" gridWidth="3" gridHeight="2" fill="1" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="12" insetsRight="6" anchor="18" weightX="0.0" weightY="1.0"/>
138	</Constraint>	147	</Constraint>
139	</Constraints>	148	</Constraints>
140		149
Lines 151-157 Link Here
151	</Properties>	160	</Properties>
152	<Constraints>	161	<Constraints>
153	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">	162	<Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
154	<GridBagConstraints gridX="0" gridY="0" gridWidth="0" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="12" insetsLeft="12" insetsBottom="2" insetsRight="12" anchor="18" weightX="0.0" weightY="0.0"/>	163	<GridBagConstraints gridX="0" gridY="0" gridWidth="1" gridHeight="1" fill="2" ipadX="0" ipadY="0" insetsTop="0" insetsLeft="0" insetsBottom="2" insetsRight="12" anchor="18" weightX="0.0" weightY="0.0"/>
155	</Constraint>	164	</Constraint>
156	</Constraints>	165	</Constraints>
157	</Component>	166	</Component>

Lines 43-48 Link Here

(-)projects/libraries/src/org/netbeans/modules/project/libraries/ui/LibrariesCustomizer.java:1.28 (-168 / +322 lines)
43		43
44	import java.awt.Dialog;	44	import java.awt.Dialog;
45	import java.awt.Dimension;	45	import java.awt.Dimension;
		46	import java.awt.EventQueue;
46	import java.awt.GridBagConstraints;	47	import java.awt.GridBagConstraints;
47	import java.awt.GridBagLayout;	48	import java.awt.GridBagLayout;
48	import java.awt.Image;	49	import java.awt.Image;
Lines 54-69 Link Here
54	import java.beans.PropertyVetoException;	55	import java.beans.PropertyVetoException;
55	import java.beans.VetoableChangeListener;	56	import java.beans.VetoableChangeListener;
56	import java.io.IOException;	57	import java.io.IOException;
		58	import java.net.URL;
		59	import java.text.Collator;
57	import java.util.ArrayList;	60	import java.util.ArrayList;
58	import java.util.Collection;	61	import java.util.Collection;
		62	import java.util.Collections;
		63	import java.util.Comparator;
		64	import java.util.List;
59	import java.util.MissingResourceException;	65	import java.util.MissingResourceException;
60	import java.util.ResourceBundle;	66	import java.util.ResourceBundle;
61	import javax.swing.JComponent;	67	import javax.swing.JComponent;
62	import javax.swing.JPanel;	68	import javax.swing.JPanel;
63	import javax.swing.event.ListDataEvent;	69	import javax.swing.event.ChangeEvent;
64	import javax.swing.event.ListDataListener;	70	import javax.swing.event.ChangeListener;
65	import org.netbeans.modules.project.libraries.LibraryTypeRegistry;	71	import org.netbeans.modules.project.libraries.LibraryTypeRegistry;
66	import org.netbeans.spi.project.libraries.LibraryImplementation;	72	import org.netbeans.spi.project.libraries.LibraryImplementation;
		73	import org.netbeans.spi.project.libraries.LibraryStorageArea;
67	import org.netbeans.spi.project.libraries.LibraryTypeProvider;	74	import org.netbeans.spi.project.libraries.LibraryTypeProvider;
68	import org.openide.DialogDescriptor;	75	import org.openide.DialogDescriptor;
69	import org.openide.DialogDisplayer;	76	import org.openide.DialogDisplayer;
Lines 80-117 Link Here
80	import org.openide.nodes.NodeOp;	87	import org.openide.nodes.NodeOp;
81	import org.openide.util.HelpCtx;	88	import org.openide.util.HelpCtx;
82	import org.openide.util.NbBundle;	89	import org.openide.util.NbBundle;
		90	import org.openide.util.Utilities;
83	import org.openide.util.lookup.Lookups;	91	import org.openide.util.lookup.Lookups;
84		92
85	/**
86	*
87	* @author tom
88	*/
89	public final class LibrariesCustomizer extends JPanel implements ExplorerManager.Provider, HelpCtx.Provider {	93	public final class LibrariesCustomizer extends JPanel implements ExplorerManager.Provider, HelpCtx.Provider {
90		94
91	private ExplorerManager manager;	95	private ExplorerManager manager;
92	private LibrariesModel model;	96	private LibrariesModel model;
93	private BeanTreeView libraries;	97	private BeanTreeView libraries;
		98	private LibraryStorageArea libraryStorageArea;
94		99
95	/** Creates new form LibrariesCustomizer */	100	public LibrariesCustomizer (LibraryStorageArea libraryStorageArea) {
96	public LibrariesCustomizer () {
97	this.model = new LibrariesModel ();	101	this.model = new LibrariesModel ();
		102	this.libraryStorageArea = (libraryStorageArea != null ? libraryStorageArea : LibrariesModel.GLOBAL_AREA);
98	initComponents();	103	initComponents();
99	postInitComponents ();	104	postInitComponents ();
		105	expandTree();
		106	}
		107
		108	private void expandTree() {
		109	// get first library node
		110	Node[] n = getExplorerManager().getRootContext().getChildren().getNodes()[0].getChildren().getNodes();
		111	if (n.length != 0) {
		112	try {
		113	getExplorerManager().setSelectedNodes(new Node[]{n[0]});
		114	} catch (PropertyVetoException ex) {
		115	// OK to ignore - it is just selection initialization
		116	}
		117	}
		118	}
		119
		120	public void setLibraryStorageArea(LibraryStorageArea libraryStorageArea) {
		121	this.libraryStorageArea = (libraryStorageArea != null ? libraryStorageArea : LibrariesModel.GLOBAL_AREA);
		122	forceTreeRecreation();
		123	expandTree();
		124	}
		125
		126	public LibrariesModel getModel() {
		127	return model;
		128	}
		129
		130	public void hideLibrariesList() {
		131	libsPanel.setVisible(false);
		132	jLabel2.setVisible(false);
		133	createButton.setVisible(false);
		134	deleteButton.setVisible(false);
		135	}
		136
		137	/**
		138	* Force nodes recreation after LibrariesModel change. The nodes listen on
		139	* model and eventually refresh themselves but usually it is too late.
		140	* So forcing recreation makes sure that any subsequent call to
		141	* NodeOp.findPath is successful and selects just created library node.
		142	*/
		143	public void forceTreeRecreation() {
		144	getExplorerManager().setRootContext(buildTree());
100	}	145	}
101
102		146
103	public void setSelectedLibrary (LibraryImplementation library) {	147	public void setSelectedLibrary (LibraryImplementation library) {
104	if (library == null)	148	if (library == null)
105	return;	149	return;
106	ExplorerManager manager = this.getExplorerManager();	150	ExplorerManager currentManager = this.getExplorerManager();
107	Node root = manager.getRootContext();	151	Node root = currentManager.getRootContext();
108	String[] path = new String[2];	152	String[] path = {library.getType(), library.getName()};
109	path[0]=library.getType();
110	path[1]=library.getName();
111	try {	153	try {
112	Node node = NodeOp.findPath(root, path);	154	Node node = NodeOp.findPath(root, path);
113	if (node != null) {	155	if (node != null) {
114	manager.setSelectedNodes(new Node[] {node});	156	currentManager.setSelectedNodes(new Node[] {node});
115	}	157	}
116	} catch (NodeNotFoundException e) {	158	} catch (NodeNotFoundException e) {
117	//Ignore it	159	//Ignore it
Lines 135-167 Link Here
135	}	177	}
136	}	178	}
137		179
138	public void cancel () {
139	this.model.cancel();
140	}
141
142	public void addNotify() {	180	public void addNotify() {
143	super.addNotify();	181	super.addNotify();
144	expandAllNodes(this.libraries,this.getExplorerManager().getRootContext());	182	expandAllNodes(this.libraries,this.getExplorerManager().getRootContext());
145	//Select first library if nothing selected	183	//Select first library if nothing selected
146	if (this.getExplorerManager().getSelectedNodes().length == 0) {	184	if (this.getExplorerManager().getSelectedNodes().length == 0) {
147	Node root = this.getExplorerManager().getRootContext();	185	SELECTED: for (Node areaNode : getExplorerManager().getRootContext().getChildren().getNodes(true)) {
148	Node[] nodes = root.getChildren().getNodes (true);	186	for (Node typeNode : areaNode.getChildren().getNodes(true)) {
149	for (int i = 0; i< nodes.length; i++) {	187	for (Node libNode : typeNode.getChildren().getNodes(true)) {
150	Node[] lnodes = nodes[i].getChildren().getNodes(true);	188	try {
151	if (lnodes.length > 0) {	189	getExplorerManager().setSelectedNodes(new Node[] {libNode});
152	try {	190	} catch (PropertyVetoException e) {
153	this.getExplorerManager().setSelectedNodes(new Node[] {lnodes[0]});	191	//Ignore it
154	} catch (PropertyVetoException e) {	192	}
155	//Ignore it	193	break SELECTED;
156	}	194	}
157	break;
158	}	195	}
159	}	196	}
160	}	197	}
161	this.libraries.requestFocus();	198	this.libraries.requestFocus();
162	}	199	}
163		200
164
165	public ExplorerManager getExplorerManager () {	201	public ExplorerManager getExplorerManager () {
166	if (this.manager == null) {	202	if (this.manager == null) {
167	this.manager = new ExplorerManager ();	203	this.manager = new ExplorerManager ();
Lines 187-198 Link Here
187	}	223	}
188	}	224	}
189	});	225	});
190	this.manager.setRootContext (buildTree(this.model));	226	manager.setRootContext(buildTree());
191	}	227	}
192	return this.manager;	228	return this.manager;
193	}	229	}
194		230
195
196	private void postInitComponents () {	231	private void postInitComponents () {
197	this.libraries = new LibrariesView ();	232	this.libraries = new LibrariesView ();
198	GridBagConstraints c = new GridBagConstraints ();	233	GridBagConstraints c = new GridBagConstraints ();
Lines 217-235 Link Here
217	});	252	});
218	}	253	}
219		254
220
221	private void nameChanged () {	255	private void nameChanged () {
222	Node[] nodes = this.getExplorerManager().getSelectedNodes();	256	Node[] nodes = this.getExplorerManager().getSelectedNodes();
223	if (nodes.length == 1 && (nodes[0] instanceof LibraryNode)) {	257	if (nodes.length == 1) {
224	LibraryNode node = (LibraryNode) nodes[0];	258	LibraryImplementation lib = nodes[0].getLookup().lookup(LibraryImplementation.class);
		259	if (lib == null) {
		260	return;
		261	}
225	String newName = this.libraryName.getText();	262	String newName = this.libraryName.getText();
		263	if (newName.equals(lib.getName())) {
		264	return;
		265	}
226	if (newName.length () == 0) {	266	if (newName.length () == 0) {
227	DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message (	267	DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message (
228	NbBundle.getMessage(LibrariesCustomizer.class, "ERR_InvalidName"),	268	NbBundle.getMessage(LibrariesCustomizer.class, "ERR_InvalidName"),
229	NotifyDescriptor.ERROR_MESSAGE));	269	NotifyDescriptor.ERROR_MESSAGE));
230	}	270	} else if (isValidName(model, newName, model.getArea(lib))) {
231	else if (isValidName (this.model, newName)) {	271	lib.setName(newName);
232	node.getLibrary().setName(newName);
233	}	272	}
234	else {	273	else {
235	DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message (	274	DialogDisplayer.getDefault().notify(new NotifyDescriptor.Message (
Lines 239-245 Link Here
239	}	278	}
240	}	279	}
241		280
242
243	private void selectLibrary (Node[] nodes) {	281	private void selectLibrary (Node[] nodes) {
244	int tabCount = this.properties.getTabCount();	282	int tabCount = this.properties.getTabCount();
245	for (int i=0; i<tabCount; i++) {	283	for (int i=0; i<tabCount; i++) {
Lines 251-272 Link Here
251	this.libraryName.setVisible(false);	289	this.libraryName.setVisible(false);
252	this.properties.setVisible(false);	290	this.properties.setVisible(false);
253	this.deleteButton.setEnabled(false);	291	this.deleteButton.setEnabled(false);
254	if (nodes.length != 1 \|\| !(nodes[0] instanceof LibraryNode)) {	292	if (nodes.length != 1) {
		293	return;
		294	}
		295	LibraryImplementation impl = nodes[0].getLookup().lookup(LibraryImplementation.class);
		296	if (impl == null) {
255	return;	297	return;
256	}	298	}
257	this.jLabel1.setVisible(true);	299	this.jLabel1.setVisible(true);
258	this.libraryName.setVisible(true);	300	this.libraryName.setVisible(true);
259	this.properties.setVisible(true);	301	this.properties.setVisible(true);
260	LibraryNode lnode = (LibraryNode) nodes[0];
261	LibraryImplementation impl = lnode.getLibrary ();
262	boolean editable = model.isLibraryEditable (impl);	302	boolean editable = model.isLibraryEditable (impl);
263	this.libraryName.setEnabled(editable);	303	this.libraryName.setEnabled(editable);
264	this.deleteButton.setEnabled(editable);	304	this.deleteButton.setEnabled(editable);
265	this.libraryName.setText (getLocalizedString(impl.getLocalizingBundle(),impl.getName()));	305	this.libraryName.setText (getLocalizedString(impl.getLocalizingBundle(),impl.getName()));
266	String libraryType = impl.getType();	306	LibraryTypeProvider provider = nodes[0].getLookup().lookup(LibraryTypeProvider.class);
267	LibraryTypeProvider provider = lnode.getProvider ();
268	if (provider == null)	307	if (provider == null)
269	return;	308	return;
		309	// a library customizer needs to know location of sharable library in order to
		310	// relativize paths. that's why object implementing both LibraryImplementation
		311	// and LibraryStorageArea is passed to JComponent here:
		312	LibraryStorageArea area = nodes[0].getLookup().lookup(LibraryStorageArea.class);
		313	if (area != null && area != LibrariesModel.GLOBAL_AREA) {
		314	impl = new LibraryImplementationWrapper(impl, area);
		315	}
		316
270	String[] volumeTypes = provider.getSupportedVolumeTypes();	317	String[] volumeTypes = provider.getSupportedVolumeTypes();
271	for (int i=0; i< volumeTypes.length; i++) {	318	for (int i=0; i< volumeTypes.length; i++) {
272	Customizer c = provider.getCustomizer (volumeTypes[i]);	319	Customizer c = provider.getCustomizer (volumeTypes[i]);
Lines 282-294 Link Here
282	}	329	}
283	}	330	}
284	}	331	}
285		332
286	/** This method is called from within the constructor to	333	/** This method is called from within the constructor to
287	* initialize the form.	334	* initialize the form.
288	* WARNING: Do NOT modify this code. The content of this method is	335	* WARNING: Do NOT modify this code. The content of this method is
289	* always regenerated by the Form Editor.	336	* always regenerated by the Form Editor.
290	*/	337	*/
291	// <editor-fold defaultstate="collapsed" desc=" Generated Code ">//GEN-BEGIN:initComponents	338	// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
292	private void initComponents() {	339	private void initComponents() {
293	java.awt.GridBagConstraints gridBagConstraints;	340	java.awt.GridBagConstraints gridBagConstraints;
294		341
Lines 301-313 Link Here
301	libsPanel = new javax.swing.JPanel();	348	libsPanel = new javax.swing.JPanel();
302	jLabel2 = new javax.swing.JLabel();	349	jLabel2 = new javax.swing.JLabel();
303		350
		351	setMinimumSize(new java.awt.Dimension(642, 395));
304	setLayout(new java.awt.GridBagLayout());	352	setLayout(new java.awt.GridBagLayout());
305		353
306	getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("AD_LibrariesCustomizer"));
307	jLabel1.setLabelFor(libraryName);	354	jLabel1.setLabelFor(libraryName);
308	org.openide.awt.Mnemonics.setLocalizedText(jLabel1, java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("CTL_CustomizerLibraryName"));	355	java.util.ResourceBundle bundle = java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle"); // NOI18N
		356	org.openide.awt.Mnemonics.setLocalizedText(jLabel1, bundle.getString("CTL_CustomizerLibraryName")); // NOI18N
309	gridBagConstraints = new java.awt.GridBagConstraints();	357	gridBagConstraints = new java.awt.GridBagConstraints();
310	gridBagConstraints.gridx = 2;	358	gridBagConstraints.gridx = 3;
311	gridBagConstraints.gridy = 1;	359	gridBagConstraints.gridy = 1;
312	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;	360	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
313	gridBagConstraints.insets = new java.awt.Insets(0, 6, 12, 6);	361	gridBagConstraints.insets = new java.awt.Insets(0, 6, 12, 6);
Lines 315-410 Link Here
315		363
316	libraryName.setEditable(false);	364	libraryName.setEditable(false);
317	gridBagConstraints = new java.awt.GridBagConstraints();	365	gridBagConstraints = new java.awt.GridBagConstraints();
318	gridBagConstraints.gridx = 3;	366	gridBagConstraints.gridx = 4;
319	gridBagConstraints.gridy = 1;	367	gridBagConstraints.gridy = 1;
320	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;	368	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
321	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;	369	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
322	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;	370	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
323	gridBagConstraints.weightx = 0.6;	371	gridBagConstraints.weightx = 0.6;
324	gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 12);	372	gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 0);
325	add(libraryName, gridBagConstraints);	373	add(libraryName, gridBagConstraints);
326	libraryName.getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("AD_LibraryName"));	374	libraryName.getAccessibleContext().setAccessibleDescription(bundle.getString("AD_LibraryName")); // NOI18N
327		375
328	jPanel1.setLayout(new java.awt.BorderLayout());	376	jPanel1.setLayout(new java.awt.BorderLayout());
329		377
330	properties.setPreferredSize(new java.awt.Dimension(400, 300));	378	properties.setPreferredSize(new java.awt.Dimension(400, 300));
331	jPanel1.add(properties, java.awt.BorderLayout.CENTER);	379	jPanel1.add(properties, java.awt.BorderLayout.CENTER);
332	properties.getAccessibleContext().setAccessibleName(java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("AN_LibrariesCustomizerProperties"));	380	properties.getAccessibleContext().setAccessibleName(bundle.getString("AN_LibrariesCustomizerProperties")); // NOI18N
333	properties.getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("AD_LibrariesCustomizerProperties"));	381	properties.getAccessibleContext().setAccessibleDescription(bundle.getString("AD_LibrariesCustomizerProperties")); // NOI18N
334		382
335	gridBagConstraints = new java.awt.GridBagConstraints();	383	gridBagConstraints = new java.awt.GridBagConstraints();
336	gridBagConstraints.gridx = 2;	384	gridBagConstraints.gridx = 3;
337	gridBagConstraints.gridy = 2;	385	gridBagConstraints.gridy = 2;
338	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;	386	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
339	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;	387	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
340	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;	388	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
341	gridBagConstraints.weightx = 1.0;	389	gridBagConstraints.weightx = 1.0;
342	gridBagConstraints.weighty = 1.0;	390	gridBagConstraints.weighty = 1.0;
343	gridBagConstraints.insets = new java.awt.Insets(0, 6, 12, 12);	391	gridBagConstraints.insets = new java.awt.Insets(0, 6, 12, 0);
344	add(jPanel1, gridBagConstraints);	392	add(jPanel1, gridBagConstraints);
345		393
346	org.openide.awt.Mnemonics.setLocalizedText(createButton, java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("CTL_NewLibrary"));	394	org.openide.awt.Mnemonics.setLocalizedText(createButton, bundle.getString("CTL_NewLibrary")); // NOI18N
347	createButton.addActionListener(new java.awt.event.ActionListener() {	395	createButton.addActionListener(new java.awt.event.ActionListener() {
348	public void actionPerformed(java.awt.event.ActionEvent evt) {	396	public void actionPerformed(java.awt.event.ActionEvent evt) {
349	createLibrary(evt);	397	createLibrary(evt);
350	}	398	}
351	});	399	});
352
353	gridBagConstraints = new java.awt.GridBagConstraints();	400	gridBagConstraints = new java.awt.GridBagConstraints();
354	gridBagConstraints.gridx = 0;	401	gridBagConstraints.gridx = 0;
355	gridBagConstraints.gridy = 3;	402	gridBagConstraints.gridy = 3;
356	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;	403	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
357	gridBagConstraints.insets = new java.awt.Insets(0, 12, 0, 12);	404	gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 12);
358	add(createButton, gridBagConstraints);	405	add(createButton, gridBagConstraints);
359	createButton.getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("AD_NewLibrary"));	406	createButton.getAccessibleContext().setAccessibleDescription(bundle.getString("AD_NewLibrary")); // NOI18N
360		407
361	org.openide.awt.Mnemonics.setLocalizedText(deleteButton, java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("CTL_DeleteLibrary"));	408	org.openide.awt.Mnemonics.setLocalizedText(deleteButton, bundle.getString("CTL_DeleteLibrary")); // NOI18N
362	deleteButton.addActionListener(new java.awt.event.ActionListener() {	409	deleteButton.addActionListener(new java.awt.event.ActionListener() {
363	public void actionPerformed(java.awt.event.ActionEvent evt) {	410	public void actionPerformed(java.awt.event.ActionEvent evt) {
364	deleteLibrary(evt);	411	deleteLibrary(evt);
365	}	412	}
366	});	413	});
367
368	gridBagConstraints = new java.awt.GridBagConstraints();	414	gridBagConstraints = new java.awt.GridBagConstraints();
369	gridBagConstraints.gridx = 1;	415	gridBagConstraints.gridx = 1;
370	gridBagConstraints.gridy = 3;	416	gridBagConstraints.gridy = 3;
371	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;	417	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
372	gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 12);	418	gridBagConstraints.insets = new java.awt.Insets(0, 0, 0, 12);
373	add(deleteButton, gridBagConstraints);	419	add(deleteButton, gridBagConstraints);
374	deleteButton.getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("AD_DeleteLibrary"));	420	deleteButton.getAccessibleContext().setAccessibleDescription(bundle.getString("AD_DeleteLibrary")); // NOI18N
375		421
		422	libsPanel.setBorder(javax.swing.BorderFactory.createEtchedBorder());
376	libsPanel.setLayout(new java.awt.GridBagLayout());	423	libsPanel.setLayout(new java.awt.GridBagLayout());
377
378	libsPanel.setBorder(new javax.swing.border.EtchedBorder());
379	gridBagConstraints = new java.awt.GridBagConstraints();	424	gridBagConstraints = new java.awt.GridBagConstraints();
380	gridBagConstraints.gridx = 0;	425	gridBagConstraints.gridx = 0;
381	gridBagConstraints.gridy = 1;	426	gridBagConstraints.gridy = 1;
382	gridBagConstraints.gridwidth = 2;	427	gridBagConstraints.gridwidth = 3;
383	gridBagConstraints.gridheight = 2;	428	gridBagConstraints.gridheight = 2;
384	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;	429	gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;
385	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;	430	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
386	gridBagConstraints.weighty = 1.0;	431	gridBagConstraints.weighty = 1.0;
387	gridBagConstraints.insets = new java.awt.Insets(0, 12, 12, 6);	432	gridBagConstraints.insets = new java.awt.Insets(0, 0, 12, 6);
388	add(libsPanel, gridBagConstraints);	433	add(libsPanel, gridBagConstraints);
389	libsPanel.getAccessibleContext().setAccessibleDescription(java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("AD_libsPanel"));	434	libsPanel.getAccessibleContext().setAccessibleDescription(bundle.getString("AD_libsPanel")); // NOI18N
390		435
391	jLabel2.setLabelFor(libsPanel);	436	jLabel2.setLabelFor(libsPanel);
392	org.openide.awt.Mnemonics.setLocalizedText(jLabel2, java.util.ResourceBundle.getBundle("org/netbeans/modules/project/libraries/ui/Bundle").getString("TXT_LibrariesPanel"));	437	org.openide.awt.Mnemonics.setLocalizedText(jLabel2, bundle.getString("TXT_LibrariesPanel")); // NOI18N
393	gridBagConstraints = new java.awt.GridBagConstraints();	438	gridBagConstraints = new java.awt.GridBagConstraints();
394	gridBagConstraints.gridx = 0;	439	gridBagConstraints.gridx = 0;
395	gridBagConstraints.gridy = 0;	440	gridBagConstraints.gridy = 0;
396	gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
397	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;	441	gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL;
398	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;	442	gridBagConstraints.anchor = java.awt.GridBagConstraints.NORTHWEST;
399	gridBagConstraints.insets = new java.awt.Insets(12, 12, 2, 12);	443	gridBagConstraints.insets = new java.awt.Insets(0, 0, 2, 12);
400	add(jLabel2, gridBagConstraints);	444	add(jLabel2, gridBagConstraints);
401		445
402	}	446	getAccessibleContext().setAccessibleDescription(bundle.getString("AD_LibrariesCustomizer")); // NOI18N
403	// </editor-fold>//GEN-END:initComponents	447	}// </editor-fold>//GEN-END:initComponents
404		448
405	private void deleteLibrary(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteLibrary	449	private void deleteLibrary(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_deleteLibrary
406	Node[] nodes = this.getExplorerManager().getSelectedNodes();	450	Node[] nodes = this.getExplorerManager().getSelectedNodes();
407	if (nodes.length == 1 && (nodes[0] instanceof LibraryNode)) {	451	if (nodes.length == 1) {
		452	LibraryImplementation library = nodes[0].getLookup().lookup(LibraryImplementation.class);
		453	if (library == null) {
		454	return;
		455	}
408	Node[] sib = nodes[0].getParentNode().getChildren().getNodes(true);	456	Node[] sib = nodes[0].getParentNode().getChildren().getNodes(true);
409	Node selNode = null;	457	Node selNode = null;
410	for (int i=0; i < sib.length; i++) {	458	for (int i=0; i < sib.length; i++) {
Lines 417-423 Link Here
417	}	465	}
418	}	466	}
419	}	467	}
420	model.removeLibrary (((LibraryNode)nodes[0]).getLibrary());	468	model.removeLibrary(library);
421	try {	469	try {
422	if (selNode != null) {	470	if (selNode != null) {
423	this.getExplorerManager().setSelectedNodes(new Node[] {selNode});	471	this.getExplorerManager().setSelectedNodes(new Node[] {selNode});
Lines 433-446 Link Here
433	Dialog dlg = null;	481	Dialog dlg = null;
434	try {	482	try {
435	String preselectedLibraryType = null;	483	String preselectedLibraryType = null;
		484	LibraryStorageArea area = null;
436	Node[] preselectedNodes = this.getExplorerManager().getSelectedNodes();	485	Node[] preselectedNodes = this.getExplorerManager().getSelectedNodes();
437	if (preselectedNodes.length == 1) {	486	if (preselectedNodes.length == 1) {
438	LibraryCategory lc = preselectedNodes[0].getLookup().lookup(LibraryCategory.class);	487	LibraryTypeProvider provider = preselectedNodes[0].getLookup().lookup(LibraryTypeProvider.class);
439	if (lc != null) {	488	if (provider != null) {
440	preselectedLibraryType = lc.getCategoryType();	489	preselectedLibraryType = provider.getLibraryType();
441	}	490	}
		491	area = preselectedNodes[0].getLookup().lookup(LibraryStorageArea.class);
		492	}
		493	if (area == null) {
		494	area = LibrariesModel.GLOBAL_AREA;
442	}	495	}
443	NewLibraryPanel p = new NewLibraryPanel (this.model, preselectedLibraryType);	496	NewLibraryPanel p = new NewLibraryPanel(model, preselectedLibraryType, area);
444	DialogDescriptor dd = new DialogDescriptor (p, NbBundle.getMessage(LibrariesCustomizer.class,"CTL_CreateLibrary"),	497	DialogDescriptor dd = new DialogDescriptor (p, NbBundle.getMessage(LibrariesCustomizer.class,"CTL_CreateLibrary"),
445	true, DialogDescriptor.OK_CANCEL_OPTION, null, null);	498	true, DialogDescriptor.OK_CANCEL_OPTION, null, null);
446	p.setDialogDescriptor(dd);	499	p.setDialogDescriptor(dd);
Lines 448-464 Link Here
448	dlg.setVisible(true);	501	dlg.setVisible(true);
449	if (dd.getValue() == DialogDescriptor.OK_OPTION) {	502	if (dd.getValue() == DialogDescriptor.OK_OPTION) {
450	String libraryType = p.getLibraryType();	503	String libraryType = p.getLibraryType();
451	String libraryName = p.getLibraryName();	504	String currentLibraryName = p.getLibraryName();
452	LibraryTypeProvider provider = LibraryTypeRegistry.getDefault().getLibraryTypeProvider (libraryType);	505	LibraryImplementation impl;
453	if (provider == null) {	506	if (area != LibrariesModel.GLOBAL_AREA) {
454	return;	507	impl = model.createArealLibrary(libraryType, currentLibraryName, area);
		508	} else {
		509	LibraryTypeProvider provider = LibraryTypeRegistry.getDefault().getLibraryTypeProvider(libraryType);
		510	if (provider == null) {
		511	return;
		512	}
		513	impl = provider.createLibrary();
		514	impl.setName(currentLibraryName);
455	}	515	}
456	LibraryImplementation impl = provider.createLibrary();
457	impl.setName (libraryName);
458	model.addLibrary (impl);	516	model.addLibrary (impl);
459	String[] path = new String[2];	517	forceTreeRecreation();
460	path[0] = impl.getType();	518	String[] path = {impl.getType(), impl.getName()};
461	path[1] = impl.getName();
462	ExplorerManager mgr = this.getExplorerManager();	519	ExplorerManager mgr = this.getExplorerManager();
463	try {	520	try {
464	Node node = NodeOp.findPath(mgr.getRootContext(),path);	521	Node node = NodeOp.findPath(mgr.getRootContext(),path);
Lines 484-501 Link Here
484	}	541	}
485	}//GEN-LAST:event_createLibrary	542	}//GEN-LAST:event_createLibrary
486		543
487		544	static boolean isValidName(LibrariesModel model, String name, LibraryStorageArea area) {
488	static boolean isValidName (LibrariesModel model, String name) {	545	for (LibraryImplementation lib : model.getLibraries()) {
489	int count = model.getSize();	546	if (lib.getName().equals(name) && Utilities.compareObjects(model.getArea(lib), area)) {
490	for (int i=0; i<count; i++) {
491	LibraryImplementation lib = (LibraryImplementation) model.getElementAt (i);
492	if (lib != null && lib.getName().equals(name))
493	return false;	547	return false;
		548	}
494	}	549	}
495	return true;	550	return true;
496	}	551	}
497		552
498
499	static String getLocalizedString (String bundleResourceName, String key) {	553	static String getLocalizedString (String bundleResourceName, String key) {
500	if (key == null) {	554	if (key == null) {
501	return null;	555	return null;
Lines 519-525 Link Here
519	}	573	}
520	}	574	}
521		575
522
523	// Variables declaration - do not modify//GEN-BEGIN:variables	576	// Variables declaration - do not modify//GEN-BEGIN:variables
524	private javax.swing.JButton createButton;	577	private javax.swing.JButton createButton;
525	private javax.swing.JButton deleteButton;	578	private javax.swing.JButton deleteButton;
Lines 530-536 Link Here
530	private javax.swing.JPanel libsPanel;	583	private javax.swing.JPanel libsPanel;
531	private javax.swing.JTabbedPane properties;	584	private javax.swing.JTabbedPane properties;
532	// End of variables declaration//GEN-END:variables	585	// End of variables declaration//GEN-END:variables
533
534		586
535	private static void expandAllNodes (BeanTreeView btv, Node node) {	587	private static void expandAllNodes (BeanTreeView btv, Node node) {
536	btv.expandNode (node);	588	btv.expandNode (node);
Lines 558-573 Link Here
558		610
559	}	611	}
560		612
561		613	private class AreaChildren extends Children.Keys<LibraryStorageArea> implements ChangeListener {
562	private static class RootChildren extends Children.Keys<LibraryTypeProvider> {	614
563		615	@Override
564	private LibrariesModel model;	616	protected void addNotify() {
565		617	super.addNotify();
566	public RootChildren (LibrariesModel model) {	618	model.addChangeListener(this);
567	this.model = model;	619	computeKeys();
568	}	620	}
569		621
		622	@Override
		623	protected void removeNotify() {
		624	super.removeNotify();
		625	model.removeChangeListener(this);
		626	setKeys(Collections.<LibraryStorageArea>emptySet());
		627	}
		628
		629	private void computeKeys() {
		630	setKeys(getSortedAreas(model));
		631	}
		632
		633	protected Node[] createNodes(LibraryStorageArea area) {
		634	return new Node[] {new AreaNode(area)};
		635	}
		636
		637	public void stateChanged(ChangeEvent e) {
		638	EventQueue.invokeLater(new Runnable() {
		639	public void run() {
		640	computeKeys();
		641	}
		642	});
		643	}
		644
		645	}
		646
		647	static Collection<? extends LibraryStorageArea> getSortedAreas(LibrariesModel model) {
		648	List<LibraryStorageArea> areas = new ArrayList<LibraryStorageArea>(model.getAreas());
		649	Collections.sort(areas,new Comparator<LibraryStorageArea>() {
		650	Collator COLL = Collator.getInstance();
		651	public int compare(LibraryStorageArea a1, LibraryStorageArea a2) {
		652	return COLL.compare(a1.getDisplayName(), a2.getDisplayName());
		653	}
		654	});
		655	areas.add(0, LibrariesModel.GLOBAL_AREA);
		656	assert !areas.contains(null);
		657	return areas;
		658	}
		659
		660	private final class AreaNode extends AbstractNode {
		661
		662	private final LibraryStorageArea area;
		663
		664	AreaNode(LibraryStorageArea area) {
		665	super(new TypeChildren(area), Lookups.singleton(area));
		666	this.area = area;
		667	}
		668
		669	@Override
		670	public String getName() {
		671	return getDisplayName();
		672	}
		673
		674	@Override
		675	public String getDisplayName() {
		676	return area.getDisplayName();
		677	}
		678
		679	private Node delegate() {
		680	return DataFolder.findFolder(Repository.getDefault().getDefaultFileSystem().getRoot()).getNodeDelegate();
		681	}
		682
		683	public Image getIcon(int type) {
		684	return delegate().getIcon(type);
		685	}
686
687	public Image getOpenedIcon(int type) {
688	return delegate().getOpenedIcon(type);
689	}
690
691	}
692
693	private class TypeChildren extends Children.Keys<LibraryTypeProvider> {
694
695	private final LibraryStorageArea area;
696
697	TypeChildren(LibraryStorageArea area) {
698	this.area = area;
699	}
700
570	public void addNotify () {	701	public void addNotify () {
		702	// Could also filter by area (would then need to listen to model too)
571	this.setKeys(LibraryTypeRegistry.getDefault().getLibraryTypeProviders());	703	this.setKeys(LibraryTypeRegistry.getDefault().getLibraryTypeProviders());
572	}	704	}
573		705
Lines 576-609 Link Here
576	}	708	}
577		709
578	protected Node[] createNodes(LibraryTypeProvider provider) {	710	protected Node[] createNodes(LibraryTypeProvider provider) {
579	return new Node[] {new CategoryNode(provider, model)};	711	return new Node[] {new CategoryNode(provider, area)};
580	}	712	}
581		713
582	}	714	}
583		715
584		716	private class CategoryNode extends AbstractNode {
585	private static final class LibraryCategory {
586
587	private final String name;
588
589	LibraryCategory (String name) {
590	this.name = name;
591	}
592
593	public String getCategoryType () {
594	return this.name;
595	}
596
597	}
598
599	private static class CategoryNode extends AbstractNode {
600
601		717
602	private LibraryTypeProvider provider;	718	private LibraryTypeProvider provider;
603	private Node iconDelegate;	719	private Node iconDelegate;
604		720
605	public CategoryNode (LibraryTypeProvider provider, LibrariesModel model) {	721	public CategoryNode(LibraryTypeProvider provider, LibraryStorageArea area) {
606	super (new CategoryChildren(provider, model), Lookups.singleton(new LibraryCategory (provider.getLibraryType())));	722	super(new CategoryChildren(provider, area), Lookups.fixed(provider, area));
607	this.provider = provider;	723	this.provider = provider;
608	this.iconDelegate = DataFolder.findFolder (Repository.getDefault().getDefaultFileSystem().getRoot()).getNodeDelegate();	724	this.iconDelegate = DataFolder.findFolder (Repository.getDefault().getDefaultFileSystem().getRoot()).getNodeDelegate();
609	}	725	}
Lines 625-647 Link Here
625	}	741	}
626		742
627	}	743	}
628		744
629	private static class CategoryChildren extends Children.Keys<LibraryImplementation> implements ListDataListener {	745	private class CategoryChildren extends Children.Keys<LibraryImplementation> implements ChangeListener {
630		746
631	private LibraryTypeProvider provider;	747	private LibraryTypeProvider provider;
632	private LibrariesModel model;	748	private final LibraryStorageArea area;
633		749
634	public CategoryChildren (LibraryTypeProvider provider, LibrariesModel model) {	750	public CategoryChildren(LibraryTypeProvider provider, LibraryStorageArea area) {
635	this.provider = provider;	751	this.provider = provider;
636	this.model = model;	752	this.area = area;
637	this.model.addListDataListener(this);	753	model.addChangeListener(this);
638	}	754	}
639		755
640	public void addNotify () {	756	public void addNotify () {
641	Collection<LibraryImplementation> keys = new ArrayList<LibraryImplementation>();	757	Collection<LibraryImplementation> keys = new ArrayList<LibraryImplementation>();
642	for (int i=0; i<model.getSize(); i++) {	758	for (LibraryImplementation impl : model.getLibraries()) {
643	LibraryImplementation impl = (LibraryImplementation) model.getElementAt(i);	759	if (provider.getLibraryType().equals(impl.getType()) && model.getArea(impl).equals(area)) {
644	if (this.provider.getLibraryType().equals(impl.getType())) {
645	keys.add (impl);	760	keys.add (impl);
646	}	761	}
647	}	762	}
Lines 653-674 Link Here
653	}	768	}
654		769
655	protected Node[] createNodes(LibraryImplementation impl) {	770	protected Node[] createNodes(LibraryImplementation impl) {
656	return new Node[] {new LibraryNode(impl, provider)};	771	return new Node[] {new LibraryNode(impl, provider, area)};
657	}
658
659	public void contentsChanged(ListDataEvent e) {
660	//Todo: Optimize it
661	this.addNotify();
662	}
663
664	public void intervalAdded(ListDataEvent e) {
665	//Todo: Optimize it
666	this.addNotify();
667	}	772	}
668		773
669	public void intervalRemoved(ListDataEvent e) {	774	public void stateChanged(ChangeEvent e) {
670	//Todo: Optimize it	775	EventQueue.invokeLater(new Runnable() {
671	this.addNotify();	776	public void run() {
		777	addNotify();
		778	}
		779	});
672	}	780	}
673		781
674	}	782	}
Lines 680-687 Link Here
680	private LibraryImplementation lib;	788	private LibraryImplementation lib;
681	private LibraryTypeProvider provider;	789	private LibraryTypeProvider provider;
682		790
683	public LibraryNode (LibraryImplementation lib, LibraryTypeProvider provider) {	791	public LibraryNode(LibraryImplementation lib, LibraryTypeProvider provider, LibraryStorageArea area) {
684	super (Children.LEAF);	792	super(Children.LEAF, Lookups.fixed(lib, provider, area));
685	this.lib = lib;	793	this.lib = lib;
686	this.provider = provider;	794	this.provider = provider;
687	this.setIconBaseWithExtension(ICON);	795	this.setIconBaseWithExtension(ICON);
Lines 695-721 Link Here
695	return getLocalizedString(this.lib.getLocalizingBundle(), this.lib.getName());	803	return getLocalizedString(this.lib.getLocalizingBundle(), this.lib.getName());
696	}	804	}
697		805
698	public LibraryImplementation getLibrary () {	806	}
699	return this.lib;	807
700	}	808	private Node buildTree() {
		809	return new AbstractNode(new TypeChildren(libraryStorageArea));
		810	}
		811
		812	private static class LibraryImplementationWrapper implements LibraryImplementation, LibraryStorageArea {
701		813
702	public LibraryTypeProvider getProvider () {	814	private LibraryImplementation lib;
703	return this.provider;	815	private LibraryStorageArea area;
704	}
705		816
706	public boolean equals (Object other) {	817	public LibraryImplementationWrapper(LibraryImplementation lib, LibraryStorageArea area) {
707	if (other instanceof LibraryNode) {	818	this.lib = lib;
708	LibraryNode ol = (LibraryNode) other;	819	this.area = area;
709	return (this.lib == null ? ol.lib == null : this.lib.equals(ol.lib))	820	}
710	&& (this.provider == null ? ol.provider == null : this.provider.equals(ol.provider));	821
711	}	822	public String getType() {
712	return false;	823	return lib.getType();
		824	}
		825
		826	public String getName() {
		827	return lib.getName();
		828	}
		829
		830	public String getDescription() {
		831	return lib.getDescription();
		832	}
		833
		834	public String getLocalizingBundle() {
		835	return lib.getLocalizingBundle();
		836	}
		837
		838	public List<URL> getContent(String volumeType) throws IllegalArgumentException {
		839	return lib.getContent(volumeType);
		840	}
		841
		842	public void setName(String name) {
		843	lib.setName(name);
		844	}
		845
		846	public void setDescription(String text) {
		847	lib.setDescription(text);
		848	}
		849
		850	public void setLocalizingBundle(String resourceName) {
		851	lib.setLocalizingBundle(resourceName);
		852	}
		853
		854	public void addPropertyChangeListener(PropertyChangeListener l) {
		855	lib.addPropertyChangeListener(l);
		856	}
		857
		858	public void removePropertyChangeListener(PropertyChangeListener l) {
		859	lib.removePropertyChangeListener(l);
		860	}
		861
		862	public void setContent(String volumeType, List<URL> path) throws IllegalArgumentException {
		863	lib.setContent(volumeType, path);
		864	}
		865
		866	public URL getLocation() {
		867	return area.getLocation();
		868	}
		869
		870	public String getDisplayName() {
		871	return area.getDisplayName();
713	}	872	}
714	}	873	}
715
716	private static Node buildTree (LibrariesModel model) {
717	return new AbstractNode (new RootChildren (model));
718	}
719
720		874
721	}	875	}

Lines 40-45 Link Here

(-)projects/libraries/src/org/netbeans/modules/project/libraries/ui/LibrariesCustomizerAction.java:1.5 (-1 / +27 lines)
40	*/	40	*/
41	package org.netbeans.modules.project.libraries.ui;	41	package org.netbeans.modules.project.libraries.ui;
42		42
		43	import java.awt.Dialog;
		44	import org.openide.DialogDescriptor;
		45	import org.openide.DialogDisplayer;
43	import org.openide.util.HelpCtx;	46	import org.openide.util.HelpCtx;
44	import org.openide.util.NbBundle;	47	import org.openide.util.NbBundle;
45	import org.openide.util.actions.CallableSystemAction;	48	import org.openide.util.actions.CallableSystemAction;
Lines 54-60 Link Here
54	}	57	}
55		58
56	public void performAction() {	59	public void performAction() {
57	org.netbeans.api.project.libraries.LibrariesCustomizer.showCustomizer(null);	60	showCustomizer();
58	}	61	}
59		62
60	public String getName() {	63	public String getName() {
Lines 68-72 Link Here
68	protected boolean asynchronous () {	71	protected boolean asynchronous () {
69	return false;	72	return false;
70	}	73	}
		74
		75	/**
		76	* Shows libraries customizer displaying all currently open library managers.
		77	* @return true if user pressed OK and libraries were sucessfully modified
		78	*/
		79	private static boolean showCustomizer () {
		80	AllLibrariesCustomizer customizer =
		81	new AllLibrariesCustomizer();
		82	DialogDescriptor descriptor = new DialogDescriptor (customizer,
		83	NbBundle.getMessage(LibrariesCustomizerAction.class, "TXT_LibrariesManager"));
		84	Dialog dlg = DialogDisplayer.getDefault().createDialog(descriptor);
		85	try {
		86	dlg.setVisible(true);
		87	if (descriptor.getValue() == DialogDescriptor.OK_OPTION) {
		88	return customizer.apply();
		89	} else {
		90	return false;
		91	}
		92	} finally {
		93	dlg.dispose();
		94	}
		95	}
		96
71		97
72	}	98	}





package org.netbeans.modules.project.libraries.ui;

import java.awt.EventQueue;
import java.beans.PropertyChangeEvent;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.event.ChangeListener;
import org.netbeans.modules.project.libraries.LibraryAccessor;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryProvider;
import org.netbeans.modules.project.libraries.WritableLibraryProvider;
import org.netbeans.spi.project.libraries.ArealLibraryProvider;
import org.netbeans.spi.project.libraries.LibraryStorageArea;
import org.openide.util.Lookup;
import org.openide.util.ChangeSupport;
import org.openide.util.NbBundle;
import org.openide.util.WeakListeners;

public class LibrariesModel implements PropertyChangeListener {

    public static final LibraryStorageArea GLOBAL_AREA = new LibraryStorageArea() {
        public String getDisplayName() {
            return NbBundle.getMessage(LibrariesModel.class, "LBL_global");
        }
        public URL getLocation() {
            throw new AssertionError();
        }
    };

    private static final Logger LOG = Logger.getLogger(LibrariesModel.class.getName());

    /**
     * Set of areas which have been explicitly created/loaded in this IDE session (thus static).
     * Keep only URL, <em>not</em> LibraryStorageArea, to avoid memory leaks.
     * Could also be modified to persist a LRU in NbPreferences, etc.
     */
    public static final Set<URL> createdAreas = Collections.synchronizedSet(new HashSet<URL>());

    private final Map<LibraryImplementation,LibraryStorageArea> library2Area = new HashMap<LibraryImplementation,LibraryStorageArea>();
    private final Map<LibraryStorageArea,ArealLibraryProvider> area2Storage = new HashMap<LibraryStorageArea,ArealLibraryProvider>();
    private final Map<LibraryImplementation,LibraryProvider> storageByLib = new HashMap<LibraryImplementation,LibraryProvider>();
    private final Map<LibraryStorageArea,LibraryProvider> area2Provider = new HashMap<LibraryStorageArea,LibraryProvider>();
    private final Collection<LibraryImplementation> actualLibraries = new TreeSet<LibraryImplementation>(new LibrariesComparator());
    private final List<LibraryImplementation> addedLibraries;
    private final List<LibraryImplementation> removedLibraries;
    private final List<ProxyLibraryImplementation> changedLibraries;
    private WritableLibraryProvider writableProvider;
    private final ChangeSupport cs = new ChangeSupport(this);

    /** Creates a new instance of LibrariesModel */
    public LibrariesModel () {
        this.addedLibraries = new ArrayList<LibraryImplementation>();
        this.removedLibraries = new ArrayList<LibraryImplementation>();
        this.changedLibraries = new ArrayList<ProxyLibraryImplementation>();
        for (LibraryProvider lp : Lookup.getDefault().lookupAll(LibraryProvider.class)) {
            lp.addPropertyChangeListener(WeakListeners.propertyChange(this, lp));
            if (writableProvider == null && lp instanceof WritableLibraryProvider) {
                writableProvider = (WritableLibraryProvider) lp;
            }
        }
        for (ArealLibraryProvider alp : Lookup.getDefault().lookupAll(ArealLibraryProvider.class)) {
            alp.addPropertyChangeListener(WeakListeners.propertyChange(this, alp));
        }
        this.computeLibraries();
    }
    
    public synchronized Collection<? extends LibraryImplementation> getLibraries() {
        return actualLibraries;
    }

    public void addChangeListener(ChangeListener l) {
        cs.addChangeListener(l);
    }

    public void removeChangeListener(ChangeListener l) {
        cs.removeChangeListener(l);
    }

    public LibraryStorageArea createArea() {
        for (ArealLibraryProvider alp : Lookup.getDefault().lookupAll(ArealLibraryProvider.class)) {
            LibraryStorageArea area = alp.createArea();
            if (area != null) {
                createdAreas.add(area.getLocation());
                area2Storage.put(area, alp);
                propertyChange(null); // recompute libraries & fire change
                return area;
            }
        }
        return null;
    }

    public LibraryImplementation createArealLibrary(String type, String name, LibraryStorageArea area) {
        LibraryImplementation impl = new DummyArealLibrary(type, name);
        library2Area.put(impl, area);
        return impl;
    }

    public Collection<? extends LibraryStorageArea> getAreas() {
        Set<LibraryStorageArea> areas = new HashSet<LibraryStorageArea>();
        for (ArealLibraryProvider alp : Lookup.getDefault().lookupAll(ArealLibraryProvider.class)) {
            for (LibraryStorageArea area : LibraryAccessor.getOpenAreas(alp)) {
                area2Storage.put(area, alp);
                areas.add(area);
            }
        }
        for (ArealLibraryProvider alp : Lookup.getDefault().lookupAll(ArealLibraryProvider.class)) {
            for (URL location : createdAreas) {
                LibraryStorageArea area = alp.loadArea(location);
                if (area != null) {
                    assert area.getLocation().equals(location) : "Bad location " + area.getLocation() + " does not match " + location + " from " + alp.getClass().getName();
                    area2Storage.put(area, alp);
                    areas.add(area);
                }
            }
        }
        return areas;
    }

    public LibraryStorageArea getArea(LibraryImplementation library) {
        LibraryStorageArea area = getAreaOrNull(library);
        return area != null ? area : GLOBAL_AREA;
    }
    private LibraryStorageArea getAreaOrNull(LibraryImplementation library) {
        if (library instanceof ProxyLibraryImplementation) {
            library = ((ProxyLibraryImplementation) library).getOriginal();
        }
        return library2Area.get(library);
    }

    public void addLibrary (LibraryImplementation impl) {
        synchronized (this) {
            addedLibraries.add(impl);
            actualLibraries.add(impl);
        for (; index < this.actualLibraries.size(); index++) {
            LibraryImplementation tmp = this.actualLibraries.get(index);
            if (c.compare(impl,tmp)<0)
                break;
        }
        cs.fireChange();
        this.fireIntervalAdded (this,index,index);
    }

    public void removeLibrary (LibraryImplementation impl) {
        synchronized (this) {
            if (addedLibraries.contains(impl)) {
                addedLibraries.remove(impl);
            } else {
                removedLibraries.add(((ProxyLibraryImplementation) impl).getOriginal());
            }
            actualLibraries.remove(impl);
        }
        cs.fireChange();
        this.actualLibraries.remove(index);
        this.fireIntervalRemoved(this,index,index);
    }

    public void modifyLibrary(ProxyLibraryImplementation impl) {
        synchronized (this) {
            if (!addedLibraries.contains(impl) && !changedLibraries.contains(impl)) {
                changedLibraries.add(impl);
            }
        }
        cs.fireChange();
        this.fireContentsChanged(this,index,index);
    }

    public boolean isLibraryEditable (LibraryImplementation impl) {

            return true;
        LibraryProvider provider = storageByLib.get
                (((ProxyLibraryImplementation)impl).getOriginal());
        return provider == writableProvider || getAreaOrNull(impl) != null;
        //Todo: if changed, must be rewritten to handle it
        return (provider == this.writableProvider);
    }

    public void apply () throws IOException {
        //Todo: Currently just one WritableLibraryProvider
        //Todo: if changed, must be rewritten to handle it
        for (LibraryImplementation impl : removedLibraries) {
            LibraryProvider storage = storageByLib.get(impl);
            if (storage == this.writableProvider) {
                this.writableProvider.removeLibrary (impl);
            } else {
                LibraryStorageArea area = getAreaOrNull(impl);
                if (area != null) {
                    LibraryAccessor.remove(area2Storage.get(area), impl);
                } else {
                    throw new IOException("Cannot find storage for library: " + impl.getName()); // NOI18N
                }
            }
        }
        for (LibraryImplementation impl : addedLibraries) {
            LibraryStorageArea area = getAreaOrNull(impl);
            if (area != null) {
                ArealLibraryProvider alp = area2Storage.get(area);
                assert alp != null : area;
                LibraryAccessor.createLibrary(alp, impl.getType(), impl.getName(), area, ((DummyArealLibrary) impl).contents);
            } else if (writableProvider != null) {
                writableProvider.addLibrary(impl);
            } else {
                throw new IOException("Cannot add libraries, no WritableLibraryProvider."); // NOI18N
            }
        }
        else {
            ErrorManager.getDefault().log("Cannot add libraries, no WritableLibraryProvider."); //NOI18N
        }
        for (ProxyLibraryImplementation proxy : changedLibraries) {
            LibraryImplementation orig = proxy.getOriginal();
            LibraryProvider storage = storageByLib.get(orig);
            if (storage == this.writableProvider) {
                this.writableProvider.updateLibrary(orig, proxy);
            } else {
                LibraryStorageArea area = library2Area.get(orig);
                if (area != null) {
                    if (proxy.newContents != null) {
                        for (Map.Entry<String,List<URL>> entry : proxy.newContents.entrySet()) {
                            orig.setContent(entry.getKey(), entry.getValue());
                        }
                    }
                } else {
                    throw new IOException("Cannot find storage for library: " + orig.getName()); // NOI18N
                }
            }
        }
        cleanUp ();
    }

    public void cancel() {
        cleanUp ();
    }

    public void propertyChange(java.beans.PropertyChangeEvent evt) {
        this.storagesChanged();
    }

    public void resultChanged(LookupEvent ev) {
        this.storagesChanged();
    }

    public void propertyChange(PropertyChangeEvent evt) {
        // compute libraries later in AWT thread and not in calling thread
        // to prevent deadlocks
        EventQueue.invokeLater(new Runnable() {
            public void run() {
                computeLibraries();
                cs.fireChange();
            }
        });
    }

    private ProxyLibraryImplementation findModified (LibraryImplementation impl) {
        for (ProxyLibraryImplementation proxy : changedLibraries) {
            ProxyLibraryImplementation proxy = (ProxyLibraryImplementation) it.next();
            if (proxy.getOriginal().equals (impl)) {
                return proxy;
            }

        return null;
    }

    private synchronized void computeLibraries() {
        actualLibraries.clear();
        for (LibraryProvider storage : Lookup.getDefault().lookupAll(LibraryProvider.class)) {
        this.changedLibraries.clear();
        for (LibraryProvider p : currentStorages) {
            p.removePropertyChangeListener (this);
        }
        this.currentStorages = Collections.emptySet();
    }

    private synchronized void getLibraries () {
        List<LibraryImplementation> libraries = new ArrayList<LibraryImplementation>();
        if (this.lresult == null) {
            //First time
            this.lresult = Lookup.getDefault().lookupResult(LibraryProvider.class);
            this.lresult.addLookupListener (this);
        }
        Collection<? extends LibraryProvider> instances = this.lresult.allInstances();
        Collection<LibraryProvider> toAdd = new HashSet<LibraryProvider>(instances);
        toAdd.removeAll(this.currentStorages);
        Collection<LibraryProvider> toRemove = new HashSet<LibraryProvider>(this.currentStorages);
        toRemove.removeAll (instances);
        this.currentStorages = instances;
        this.storageByLib.clear();
        for (LibraryProvider storage : instances) {
            //TODO: in case of more WritableLibraryProvider must be changed
            if (this.writableProvider == null && storage instanceof WritableLibraryProvider) {
                this.writableProvider = (WritableLibraryProvider) storage;
            }
            for (LibraryImplementation lib : storage.getLibraries()) {
                ProxyLibraryImplementation proxy = findModified(lib);
                if (proxy != null) {
                    actualLibraries.add(proxy);
                } else {
                    actualLibraries.add(proxy = new ProxyLibraryImplementation(lib, this));
                    libraries.add (proxy);
                    this.storageByLib.put (lib,storage);
                }
                else {
                    libraries.add(new ProxyLibraryImplementation(lib,this));
                    this.storageByLib.put (lib,storage);
                }
                storageByLib.put(lib, storage);
                LOG.log(Level.FINER, "computeLibraries: storage={0} lib={1} proxy={2}", new Object[] {storage, lib, proxy});
            }
        }
        for (LibraryStorageArea area : getAreas()) {
            ArealLibraryProvider alp = area2Storage.get(area);
            assert alp != null : area;
            LibraryProvider prov = area2Provider.get(area);
            if (prov == null) {
                prov = LibraryAccessor.getLibraries(alp, area);
                prov.addPropertyChangeListener(this); // need not be weak, we just created the source
                area2Provider.put(area, prov);
            }
            for (LibraryImplementation lib : prov.getLibraries()) {
                ProxyLibraryImplementation proxy = findModified(lib);
                if (proxy != null) {
                    actualLibraries.add(proxy);
                } else {
                    actualLibraries.add(proxy = new ProxyLibraryImplementation(lib, this));
                }
                library2Area.put(lib, area);
                LOG.log(Level.FINER, "computeLibraries: alp={0} area={1} lib={2} proxy={3}", new Object[] {alp, area, lib, proxy});
            }
        }
        actualLibraries.addAll(addedLibraries);
        LOG.log(Level.FINE, "computeLibraries: actualLibraries={0} library2Area={1}", new Object[] {actualLibraries, library2Area});
    }

    private static class LibrariesComparator implements Comparator<LibraryImplementation> {
        public int compare(LibraryImplementation lib1, LibraryImplementation lib2) {
            String name1 = LibrariesCustomizer.getLocalizedString(lib1.getLocalizingBundle(), lib1.getName());
            String name2 = LibrariesCustomizer.getLocalizedString(lib2.getLocalizingBundle(), lib2.getName());
            int r = name1.compareToIgnoreCase(name2);
            return r != 0 ? r : System.identityHashCode(lib1) - System.identityHashCode(lib2);
        }
    }

    private static final class DummyArealLibrary implements LibraryImplementation {

        private final String type, name;
        final Map<String,List<URL>> contents = new HashMap<String,List<URL>>();
        private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);

        public DummyArealLibrary(String type, String name) {
            this.type = type;
            this.name = name;
        }

        public String getType() {
            return type;
        }

        public String getName() {
            return name;
        }

        public String getDescription() {
            return null;
        }

        public String getLocalizingBundle() {
            return null;
        }

        public List<URL> getContent(String volumeType) throws IllegalArgumentException {
            List<URL> content = contents.get(volumeType);
            if (content != null) {
                return content; 
            } else {
                return Collections.emptyList();
            }
        }

        public void setName(String name) {
            throw new UnsupportedOperationException();
        }

        public void setDescription(String text) {
            throw new UnsupportedOperationException();
        }

        public void setLocalizingBundle(String resourceName) {
            throw new UnsupportedOperationException();
        }

        public void addPropertyChangeListener(PropertyChangeListener l) {
            pcs.addPropertyChangeListener(l);
        }

        public void removePropertyChangeListener(PropertyChangeListener l) {
            pcs.removePropertyChangeListener(l);
        }

        public void setContent(String volumeType, List<URL> path) throws IllegalArgumentException {
            contents.put(volumeType, path);
            pcs.firePropertyChange(LibraryImplementation.PROP_CONTENT, null, null);
        }

        @Override
        public String toString() {
            return "DummyArealLibrary[" + name + "]"; // NOI18N
        }

    }

}




<?xml version="1.0" encoding="UTF-8" ?>

<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
  <AccessibilityProperties>
    <Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
      <ResourceString bundle="org/netbeans/modules/project/libraries/ui/Bundle.properties" key="AD_NewLibraryPanel" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
    </Property>
  </AccessibilityProperties>
  <AuxValues>
    <AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
    <AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
    <AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
    <AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
    <AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
    <AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>

    <Component class="javax.swing.JLabel" name="status">
      <Constraints>
        <Constraint layoutClass="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout" value="org.netbeans.modules.form.compat2.layouts.DesignGridBagLayout$GridBagConstraintsDescription">
          <GridBagConstraints gridX="0" gridY="3" gridWidth="0" gridHeight="0" fill="1" ipadX="0" ipadY="0" insetsTop="6" insetsLeft="12" insetsBottom="12" insetsRight="12" anchor="10" weightX="1.0" weightY="0.0"/>
        </Constraint>
      </Constraints>
    </Component>




package org.netbeans.modules.project.libraries.ui;

import java.awt.Color;
import java.awt.Component;
import java.util.HashMap;
import java.util.Map;
import java.util.regex.Pattern;
import javax.swing.DefaultComboBoxModel;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JList;
import org.openide.DialogDescriptor;
import org.openide.util.NbBundle;
import org.netbeans.modules.project.libraries.LibraryTypeRegistry;
import org.netbeans.spi.project.libraries.LibraryStorageArea;
import org.netbeans.spi.project.libraries.LibraryTypeProvider;



/**
 *
 * @author  tom
 */
public class NewLibraryPanel extends javax.swing.JPanel {

    private LibrariesModel model;
    private Map<Integer,String> typeMap;
    private LibraryStorageArea area;

    private DialogDescriptor dd;

    private static final Pattern VALID_LIBRARY_NAME = Pattern.compile("[-._a-zA-Z0-9]+"); // NOI18N

    public NewLibraryPanel (LibrariesModel model, String preselectedLibraryType, LibraryStorageArea area) {
    public NewLibraryPanel (LibrariesModel model, String preselectedLibraryType) {
        this.model = model;
        this.area = area;
        initComponents();
        this.name.setColumns(25);
        this.name.getDocument().addDocumentListener(new javax.swing.event.DocumentListener () {

            }

        });
        initModel(preselectedLibraryType);
        Color c = javax.swing.UIManager.getColor("nb.errorForeground"); //NOI18N
        if (c == null) {
            c = new Color(89,79,191);  // RGB suggested by Bruce in #28466

        status.setForeground(c);
    }
    
    public void setDialogDescriptor(DialogDescriptor dd) {
        assert this.dd == null;
        this.dd = dd;
        nameChanged();
    }
    
    public String getLibraryType () {

    }


    private void initModel(String preselectedLibraryType) {
        this.typeMap = new HashMap<Integer,String>();
        this.name.setText (NbBundle.getMessage (NewLibraryPanel.class,"TXT_NewLibrary"));
        LibraryTypeRegistry regs = LibraryTypeRegistry.getDefault();

            message = NbBundle.getMessage(NewLibraryPanel.class,"ERR_InvalidName");
        }
        else {
            valid = LibrariesCustomizer.isValidName(model, name, area);
            if (valid) {
                if (isReasonableAntProperty(name)) {
                    message = " ";   //NOI18N

     * WARNING: Do NOT modify this code. The content of this method is
     * always regenerated by the Form Editor.
     */
    // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
    private void initComponents() {
        java.awt.GridBagConstraints gridBagConstraints;


        libraryType.getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(NewLibraryPanel.class, "AD_LibraryType")); // NOI18N

        gridBagConstraints = new java.awt.GridBagConstraints();
        gridBagConstraints.gridx = 0;
        gridBagConstraints.gridy = 3;
        gridBagConstraints.gridwidth = java.awt.GridBagConstraints.REMAINDER;
        gridBagConstraints.gridheight = java.awt.GridBagConstraints.REMAINDER;
        gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH;





import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.openide.util.WeakListeners;

/**
 *
 * @author  tom


    private final LibraryImplementation original;
    private final LibrariesModel model;
    Map<String,List<URL>> newContents;
    private String newName;
    private String newDescription;
    private PropertyChangeSupport support;

    /** Creates a new instance of ProxyLibraryImplementation */
    public ProxyLibraryImplementation (LibraryImplementation original, LibrariesModel model) {
        assert original != null && model != null;
        this.original = original;

            return false;
    }

    public @Override String toString() {
        return "Proxy[" + original + "]"; // NOI18N
    }

}




/*
 * The contents of this file are subject to the terms of the Common Development
 * and Distribution License (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.html
 * or http://www.netbeans.org/cddl.txt.
 *
 * When distributing Covered Code, include this CDDL Header Notice in each file
 * and include the License file at http://www.netbeans.org/cddl.txt.
 * If applicable, add the following below the CDDL Header, with the fields
 * enclosed by brackets [] replaced by your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.spi.project.libraries;

import java.beans.PropertyChangeListener;
import java.io.IOException;
import java.net.URL;
import java.util.List;
import java.util.Map;
import java.util.Set;

/**
 * Library provider which can define libraries in particular areas.
 * There is no explicit method to save a library; setters on {@link LibraryImplementation} should do this.
 * @param A the type of storage area used by this provider
 * @param L the type of library created by this provider
 * @since org.netbeans.modules.project.libraries/1 1.15
 */
public interface ArealLibraryProvider<A extends LibraryStorageArea, L extends LibraryImplementation> {

    /**
     * Property to fire when {@link #getOpenAreas} might have changed.
     */
    String PROP_OPEN_AREAS = "openAreas"; // NOI18N

    /**
     * Adds a listener to {@link #PROP_OPEN_AREAS}.
     * @param listener a listener to add
     */
    void addPropertyChangeListener(PropertyChangeListener listener);

    /**
     * Removes a listener to {@link #PROP_OPEN_AREAS}.
     * @param listener a listener to remove
     */
    void removePropertyChangeListener(PropertyChangeListener listener);

    /**
     * Gets the runtime type of the area used by this provider.
     * @return the area type
     */
    Class<A> areaType();

    /**
     * Gets the runtime type of the libraries created by this provider.
     * @return the library type
     */
    Class<L> libraryType();

    /**
     * Creates or otherwise picks a storage area interactively.
     * This might actually create a fresh area, or just load an existing one,
     * or even do nothing (and return null).
     * The implementor is free to show a dialog here.
     * @return a new or existing storage area, or null
     */
    A createArea();

    /**
     * Loads a storage area (which may or may exist yet).
     * @param location an abstract storage location which may or may not be recognized by this provider
     * @return an area whose {@link LibraryStorageArea#getLocation} matches the provided location,
     *         or null if this type of location is not recognized by this provider
     */
    A loadArea(URL location);

    /**
     * Looks for areas which should be somehow listed as open.
     * For example, a provider which refers to library areas from project metadata
     * could list all areas referred to from currently open projects.
     * It is <em>not</em> necessary to include areas recently mentioned e.g. by {@link #createArea}.
     * @return a (possibly empty) collection of areas
     */
    Set<A> getOpenAreas();

    /**
     * Gets all libraries defined in a given area.
     * No two libraries in this area may share a given name (as in {@link LibraryImplementation#getName},
     * though it is permitted for libraries from different areas to have the same name.
     * Changes in the set of libraries defined in this area should be fired through {@link LibraryProvider#PROP_LIBRARIES}.
     * Since {@link IOException} is not thrown either from this method or from {@link LibraryProvider#getLibraries},
     * it is expected that any problems loading library definitions will be logged and that those libraries will be skipped.
     * @param area some storage area (which might not even exist yet, in which case the set of libraries will initially be empty)
     * @return a listenable set of libraries in this area
     *         (it is permitted to return distinct objects from call to call on the same area,
     *         i.e. no caching by the implementation is necessary)
     */
    LibraryProvider<L> getLibraries(A area);

    /**
     * Creates a new library.
     * @param type the kind of library to make, as in {@link LibraryTypeProvider#getLibraryType} or {@link LibraryImplementation#getType}
     * @param name the library name, as in {@link LibraryImplementation#getName}
     * @param area the location to define the library
     * @param contents initial volume contents (keys must be contained in the appropriate {@link LibraryTypeProvider#getSupportedVolumeTypes})
     * @return a new library with matching type, name, area, and contents
     * @throws IOException if an error occurs creating the library definition     */
    L createLibrary(String type, String name, A area, Map<String,List<URL>> contents) throws IOException;

    /**
     * Deletes an existing library.
     * @param library a library produced by this provider
     * @throws IOException if a problem can encountered deleting the library definition
     */
    void remove(L library) throws IOException;

}

Lines 58-68 Link Here

(-)projects/libraries/src/org/netbeans/spi/project/libraries/LibraryFactory.java:1.2 (-2 / +1 lines)
58	private LibraryFactory() {	58	private LibraryFactory() {
59	}	59	}
60		60
61
62	/**	61	/**
63	* Creates Library for LibraryImplementation	62	* Creates Library for LibraryImplementation
64	* @param libraryImplementation the library SPI object	63	* @param libraryImplementation the library SPI object
65	* @return Library API instance	64	* @return Library API instance, for which the {@link Library#getManager} will be {@link LibraryManager#getDefault}
66	*/	65	*/
67	public static Library createLibrary (LibraryImplementation libraryImplementation) {	66	public static Library createLibrary (LibraryImplementation libraryImplementation) {
68	assert libraryImplementation != null;	67	assert libraryImplementation != null;




 * Version 2 license, then the option applies only if the new code is
 * made subject to such option by the copyright holder.
 */

package org.netbeans.spi.project.libraries;

import java.beans.PropertyChangeListener;

 * Library storage is a source of libraries used by LibraryManager.
 * LibraryManager allows existence of multiple LibraryProviders registered in
 * the default lookup.
 * @param L the type of implementation which will be produced by this provider
 */
public interface LibraryProvider<L extends LibraryImplementation> {

    /**
     * Name of libraries property
     */
    String PROP_LIBRARIES = "libraries"; // NOI18N

    /**
     * Returns libraries provided by the implemented provider.
     * @return (possibly empty but not null) list of libraries
     */
    L[] getLibraries();

    /**
     * Adds property change listener, the listener is notified when the libraries changed
     * @param listener
     */
    void addPropertyChangeListener (PropertyChangeListener listener);

    /**
     * Removes property change listener
     * @param listener
     */
    void removePropertyChangeListener (PropertyChangeListener listener);

}




/*
 * The contents of this file are subject to the terms of the Common Development
 * and Distribution License (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.html
 * or http://www.netbeans.org/cddl.txt.
 * 
 * When distributing Covered Code, include this CDDL Header Notice in each file
 * and include the License file at http://www.netbeans.org/cddl.txt.
 * If applicable, add the following below the CDDL Header, with the fields
 * enclosed by brackets [] replaced by your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 * 
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.spi.project.libraries;

import java.net.URL;

/**
 * Abstract location where zero or more libraries are defined.
 * {@link Object#equals} and {@link Object#hashCode} are expected to be defined
 * such that object identity (within the implementing class) are driven by {@link #getLocation}.
 * @see ArealLibraryProvider
 * @since org.netbeans.modules.project.libraries/1 1.15
 */
public interface LibraryStorageArea {

    /**
     * Gets an associated storage location.
     * The contents of the URL (if it is even accessible) are unspecified.
     * @return an associated URL uniquely identifying this location
     */
    URL getLocation();

    /**
     * Gets a human-readable display label for this area.
     * @return a localized display name
     */
    String getDisplayName();

}

Lines 40-49 Link Here

(-)projects/libraries/src/org/netbeans/spi/project/libraries/support/LibrariesSupport.java:1.5 (+135 lines)
40	*/	40	*/
41	package org.netbeans.spi.project.libraries.support;	41	package org.netbeans.spi.project.libraries.support;
42		42
		43	import java.io.File;
		44	import java.net.MalformedURLException;
		45	import java.net.URI;
		46	import java.net.URISyntaxException;
		47	import java.net.URL;
43	import org.netbeans.modules.project.libraries.LibraryTypeRegistry;	48	import org.netbeans.modules.project.libraries.LibraryTypeRegistry;
44	import org.netbeans.spi.project.libraries.LibraryImplementation;	49	import org.netbeans.spi.project.libraries.LibraryImplementation;
45	import org.netbeans.modules.project.libraries.DefaultLibraryImplementation;	50	import org.netbeans.modules.project.libraries.DefaultLibraryImplementation;
46	import org.netbeans.spi.project.libraries.LibraryTypeProvider;	51	import org.netbeans.spi.project.libraries.LibraryTypeProvider;
		52	import org.openide.filesystems.FileObject;
		53	import org.openide.filesystems.FileUtil;
		54	import org.openide.filesystems.URLMapper;
		55	import org.openide.util.Parameters;
47		56
48	/**	57	/**
49	* SPI Support class.	58	* SPI Support class.
Lines 85-88 Link Here
85	public static LibraryTypeProvider[] getLibraryTypeProviders () {	94	public static LibraryTypeProvider[] getLibraryTypeProviders () {
86	return LibraryTypeRegistry.getDefault().getLibraryTypeProviders();	95	return LibraryTypeRegistry.getDefault().getLibraryTypeProviders();
87	}	96	}
		97
		98	/**
		99	* Properly converts possibly relative file to URL.
		100	* @param f file to convert; can be relative; cannot be null
		101	* @return url
		102	*/
		103	public static URL convertFileToURL(File f) {
		104	try {
		105	if (f.isAbsolute()) {
		106	return f.toURI().toURL();
		107	} else {
		108	// create hierarchical relative URI (that is no schema)
		109	// to encode OS characters
		110	URI uri = new URI(null, null, f.getPath().replace('\\', '/'), null);
		111	return new URL("file", null, uri.getRawPath());
		112	}
		113
		114	} catch (URISyntaxException ex) {
		115	IllegalArgumentException y = new IllegalArgumentException();
		116	y.initCause(ex);
		117	throw y;
		118	} catch (MalformedURLException ex) {
		119	IllegalArgumentException y = new IllegalArgumentException();
		120	y.initCause(ex);
		121	throw y;
		122	}
		123	}
		124
		125	/**
		126	* Properly converts possibly relative URL to file.
		127	* @param url file URL to convert; can be relative; cannot be null
		128	* @return url
		129	*/
		130	public static File convertURLToFile(URL url) {
		131	if (!"file".equals(url.getProtocol())) {
		132	throw new IllegalArgumentException("not file URL "+url); //NOI18N
		133	}
		134	try {
		135	if (isAbsoluteURL(url)) {
		136	return new File(new URI(url.toExternalForm()));
		137	} else {
		138	// workaround to decode URL path - created fake absolute URI
		139	// just to construct File instance and properly decoded path:
		140	URI uri3 = new URI("file:/"+url.getPath());
		141	return new File(new File(uri3).getPath().substring(1));
		142	}
		143	} catch (URISyntaxException ex) {
		144	IllegalArgumentException y = new IllegalArgumentException();
		145	y.initCause(ex);
		146	throw y;
		147	}
		148	}
		149
		150	/**
		151	* Is given URL absolute?
		152	*
		153	* @param url url to test; cannot be null
		154	* @return is absolute
		155	*/
		156	public static boolean isAbsoluteURL(URL url) {
		157	if ("jar".equals(url.getProtocol())) { // NOI18N
		158	url = FileUtil.getArchiveFile(url);
		159	}
		160	return url.getPath().startsWith("/");
161	}
162
163	/**
164	* Helper method to resolve (possibly relative) library content URL to FileObject.
165	*
166	* @param libraryLocation library location file; can be null for global libraries
167	* @param libraryEntry library entry to resolve
168	* @return file object
169	*/
170	public static FileObject resolveLibraryEntryFileObject(URL libraryLocation, URL libraryEntry) {
171	URL u = resolveLibraryEntryURL(libraryLocation, libraryEntry);
172	return URLMapper.findFileObject(u);
173	}
174
175	/**
176	* Helper method to resolve (possibly relative) library content URL.
177	*
178	* @param libraryLocation library location file; can be null for global libraries
179	* @param libraryEntry library entry to resolve
180	* @return absolute URL
181	*/
182	public static URL resolveLibraryEntryURL(URL libraryLocation, URL libraryEntry) {
183	Parameters.notNull("libraryEntry", libraryEntry); //NOI18N
184	if (isAbsoluteURL(libraryEntry)) {
185	return libraryEntry;
186	} else {
187	if (libraryLocation == null) {
188	throw new IllegalArgumentException("cannot resolve relative URL without library location"); //NOI18N
189	}
190	if (!"file".equals(libraryLocation.getProtocol())) { //NOI18N
191	throw new IllegalArgumentException("not file: protocol - "+libraryLocation.toExternalForm()); //NOI18N
192	}
193	File libLocation = new File(URI.create(libraryLocation.toExternalForm()));
194	if (!libLocation.getName().endsWith(".properties")) { //NOI18N
195	throw new IllegalArgumentException("library location must be a file - "+libraryLocation.toExternalForm()); //NOI18N
196	}
197	File libBase = libLocation.getParentFile();
198	boolean archiveURL = false;
199	if ("jar".equals(libraryEntry.getProtocol())) {
200	libraryEntry = FileUtil.getArchiveFile(libraryEntry);
201	archiveURL = true;
202	}
203	File f = convertURLToFile(libraryEntry);
204	f = FileUtil.normalizeFile(new File(libBase, f.getPath()));
205	URL u;
206	try {
207	u = f.toURI().toURL();
208	} catch (MalformedURLException ex) {
209	IllegalArgumentException y = new IllegalArgumentException();
210	y.initCause(ex);
211	throw y;
212	}
213	if (archiveURL) {
214	u = FileUtil.getArchiveRoot(u);
215	}
216	return u;
217	}
218	}
219
220	// TODO: add method which compares two libraries: compare content and file sizes and ...
221
222	// TODO: move some of these methods to openide.FileUtil
88	}	223	}

Lines 1-3 Link Here

(-)projects/libraries/test/.cvsignore:1.1 (-1 / +2 lines)
		1	coverage
1	lib	2	lib
2	work
3	results	3	results
		4	work





package org.netbeans.api.project.libraries;

import static org.netbeans.modules.project.libraries.TestUtil.*;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.StringTokenizer;
import org.netbeans.api.project.TestUtil;
import org.netbeans.junit.NbTestCase;
import org.netbeans.modules.project.libraries.ui.LibrariesModel;
import org.netbeans.spi.project.libraries.LibraryFactory;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryTypeProvider;

import org.openide.loaders.DataFolder;
import org.openide.loaders.InstanceDataObject;
import org.openide.util.lookup.Lookups;
import org.openide.util.test.MockLookup;
import org.openide.util.test.MockPropertyChangeListener;

 * @author  Tomas Zezula
 */
public class LibraryManagerTest extends NbTestCase {

    private WLP lp;

    private static final String LIBRARY_TYPE = "j2se";  //NOI18N
    private static final String[] VOLUME_TYPES = new String[] {
        "bin",
        "src",
        "doc"
    };

    /** Creates a new instance of LibraryManagerTest */
    public LibraryManagerTest (String testName) {
        super (testName);
    }

    protected void setUp() throws Exception {
        super.setUp();
        lp = new WLP();
        MockLookup.setLookup(Lookups.singleton(lp));
            lp
        }));
        registerLibraryTypeProvider();
    }

    
    private static void registerLibraryTypeProvider () throws Exception {
        StringTokenizer tk = new StringTokenizer("org-netbeans-api-project-libraries/LibraryTypeProviders","/");
        FileObject root = Repository.getDefault().getDefaultFileSystem().getRoot();

            InstanceDataObject.create (DataFolder.findFolder(root),"TestLibraryTypeProvider",TestLibraryTypeProvider.class);
        }
    }

    public void testGetLibraries () throws Exception {
        LibraryManager lm = LibraryManager.getDefault();
        MockPropertyChangeListener pcl = new MockPropertyChangeListener();
        lm.addPropertyChangeListener(pcl);
        Library[] libs = lm.getLibraries();
        assertEquals ("Libraries count", 0, libs.length);
        LibraryImplementation[] impls = createTestLibs ();
        lp.set(impls);
        libs = lm.getLibraries();
        pcl.assertEvents(LibraryManager.PROP_LIBRARIES);
        tl.reset();
        assertEquals ("Libraries count", 2, libs.length);
        assertLibsEquals (libs, impls);
        lp.set();
        pcl.assertEvents(LibraryManager.PROP_LIBRARIES);
        tl.reset();
        libs = lm.getLibraries();
        assertEquals ("Libraries count", 0, libs.length);
    }

    public void testGetLibrary () throws Exception {
        LibraryImplementation[] impls = createTestLibs ();
        lp.set(impls);
        LibraryManager lm = LibraryManager.getDefault();
        Library[] libs = lm.getLibraries();
        assertEquals ("Libraries count", 2, libs.length);

        lib = lm.getLibrary("Library3");
        assertNull ("Nonexisting library", lib);
    }

    @SuppressWarnings("deprecation")
    public void testAddRemoveLibrary () throws Exception {
        final LibraryImplementation[] impls = createTestLibs();
        lp.set(impls);
        final LibraryManager lm = LibraryManager.getDefault();
        Library[] libs = lm.getLibraries();
        assertEquals ("Libraries count", 2, libs.length);

        assertEquals("Libraries count",2,libs.length);
        assertLibsEquals (libs, impls);
    }

    public void testCreateRemoveLibrary() throws Exception {
        LibraryManager mgr = LibraryManager.getDefault();
        URL fooJar = mkJar("foo.jar");
        Library lib = mgr.createLibrary(LIBRARY_TYPE, "NewLib", Collections.singletonMap("bin", Arrays.asList(fooJar)));
        assertEquals(mgr, lib.getManager());
        assertEquals(Collections.singletonList(lib), Arrays.asList(mgr.getLibraries()));
        assertEquals(1, lp.libs.size());
        assertLibsEquals(new Library[] {lib}, lp.libs.toArray(new LibraryImplementation[1]));
        mgr.removeLibrary(lib);
        assertEquals(Collections.emptyList(), Arrays.asList(mgr.getLibraries()));
        assertEquals(0, lp.libs.size());
    }

    public void testArealLibraryManagers() throws Exception {
        ALP alp = new ALP();
        MockLookup.setLookup(Lookups.fixed(lp, alp));
        new LibrariesModel().createArea();
        Area home = new Area("home");
        Area away = new Area("away");
        alp.setOpen(home, away);
        List<String> locations = new ArrayList<String>(); // use list, not set, to confirm size also
        for (LibraryManager mgr : LibraryManager.getOpenManagers()) {
            URL loc = mgr.getLocation();
            locations.add(loc != null ? loc.toString() : "<none>");
        }
        Collections.sort(locations);
        assertEquals("[<none>, http://nowhere.net/away, http://nowhere.net/home, http://nowhere.net/new]", locations.toString());
        alp.setOpen();
        try {
            LibraryManager.forLocation(new URL("http://even-less-anywhere.net/"));
            fail();
        } catch (IllegalArgumentException x) {}
        LibraryManager mgr = LibraryManager.forLocation(home.getLocation());
        assertEquals(home.getLocation(), mgr.getLocation());
        assertEquals("home", mgr.getDisplayName());
        assertEquals(0, mgr.getLibraries().length);
        MockPropertyChangeListener pcl = new MockPropertyChangeListener();
        mgr.addPropertyChangeListener(pcl);
        URL fooJar = mkJar("foo.jar");
        Library lib = mgr.createLibrary(LIBRARY_TYPE, "NewLib", Collections.singletonMap("bin", Arrays.asList(fooJar)));
        assertEquals(mgr, lib.getManager());
        pcl.assertEvents(LibraryManager.PROP_LIBRARIES);
        assertEquals(Collections.singletonList(lib), Arrays.asList(mgr.getLibraries()));
        assertEquals(1, alp.libs.get(home).size());
        LibraryImplementation impl = alp.libs.get(home).iterator().next();
        assertEquals("NewLib", impl.getName());
        assertEquals(LIBRARY_TYPE, impl.getType());
        assertEquals(Arrays.asList(fooJar), impl.getContent("bin"));
        mgr.removeLibrary(lib);
        pcl.assertEvents(LibraryManager.PROP_LIBRARIES);
        assertEquals(Collections.emptyList(), Arrays.asList(mgr.getLibraries()));
        assertEquals(0, alp.libs.get(home).size());
    }

    static LibraryImplementation[] createTestLibs () throws MalformedURLException {
        LibraryImplementation[] impls = {
            LibrariesSupport.createLibraryImplementation(LIBRARY_TYPE, VOLUME_TYPES),
            LibrariesSupport.createLibraryImplementation(LIBRARY_TYPE, VOLUME_TYPES),
        };
        impls[0].setName ("Library1");
        impls[1].setName ("Library2");

        impls[1].setContent("bin", Collections.singletonList(new URL("file:/lib/libest2.so")));
        return impls;
    }

    static void assertLibsEquals (Library[] libs, LibraryImplementation[] impls) {
        assertEquals ("libs equals (size)", impls.length, libs.length);
        for (int i=0; i< libs.length; i++) {

            assertEquals ("libs equals (content doc)", ic, lc);
        }
    }

    static void assertEventsEquals (List eventNames, String[] expectedName) {
        assertEquals ("Events equals", Arrays.asList(expectedName), eventNames);
    }
    
    
    static class TestLibraryProvider implements WritableLibraryProvider  {
        
        private PropertyChangeSupport support;
        private List<LibraryImplementation> libraries;
        
        public TestLibraryProvider () {
            this.support = new PropertyChangeSupport (this);
            this.libraries = new ArrayList<LibraryImplementation>();
        }
        
        public void removePropertyChangeListener(PropertyChangeListener listener) {
            this.support.removePropertyChangeListener(listener);
        }

        public void addPropertyChangeListener(PropertyChangeListener listener) {
            this.support.addPropertyChangeListener(listener);
        }

        public LibraryImplementation[] getLibraries() {
            return this.libraries.toArray(new LibraryImplementation[libraries.size()]);
        }                
        
        public void setLibraries (LibraryImplementation[] libraries) {
            this.libraries = new ArrayList<LibraryImplementation>(Arrays.asList(libraries));
            this.support.firePropertyChange(PROP_LIBRARIES,null,null);
        }

        public void addLibrary(LibraryImplementation library) throws IOException {
            this.libraries.add (library);
            this.support.firePropertyChange(PROP_LIBRARIES,null,null);
        }

        public void removeLibrary(LibraryImplementation library) throws IOException {
            this.libraries.remove (library);
            this.support.firePropertyChange(PROP_LIBRARIES,null,null);
        }

        public void updateLibrary(LibraryImplementation oldLibrary, LibraryImplementation newLibrary) throws IOException {
            this.libraries.remove(oldLibrary);
            this.libraries.add (newLibrary);
            this.support.firePropertyChange(PROP_LIBRARIES,null,null);
        }
        
    }
    
    static class TestListener implements PropertyChangeListener {
        
        private List<String> events = new ArrayList<String>();
        
        public void propertyChange(PropertyChangeEvent event) {
            this.events.add(event.getPropertyName());
        }                
        
        public void reset () {
            this.events.clear();
        }
        
        public List getEventNames () {
            return this.events;
        }
    }
    
    
    public static class TestLibraryTypeProvider implements LibraryTypeProvider {


        public String getDisplayName() {
            return LIBRARY_TYPE;

            return null;
        }
    }
    
    static class TestLibraryImplementation implements LibraryImplementation {
        
        private static final Set<String> supportedTypes;
        
        private String name;
        private String description;        
        private Map<String,List<URL>> contents;
        private PropertyChangeSupport support;
        
        static {            
            supportedTypes = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(VOLUME_TYPES)));
        }
        
        public TestLibraryImplementation () {
            this.contents = new HashMap<String,List<URL>>();
            this.support = new PropertyChangeSupport (this);
        }
        
        public String getType() {
            return LIBRARY_TYPE;
        }
        
        public String getName() {
            return this.name;
        }
        
        public void setName(String name) {
            this.name = name;
            this.support.firePropertyChange(PROP_NAME, null, null);
        }

        public String getLocalizingBundle() {
            return null;
        }
        
        public void setLocalizingBundle(String resourceName) {  
        }
        
        public String getDescription() {
            return this.description;
        }

        public void setDescription(String text) {
            this.description = text;
            this.support.firePropertyChange(PROP_DESCRIPTION, null, null);
        }

        public List<URL> getContent(String volumeType) throws IllegalArgumentException {
            if (supportedTypes.contains(volumeType)) {
                List<URL> l = contents.get(volumeType);
                if (l == null) {
                    l = Collections.emptyList();
                }
                return Collections.unmodifiableList(l);
            }
            else {
                throw new IllegalArgumentException ();
            }
        }
        
        public void setContent(String volumeType, List<URL> path) throws IllegalArgumentException {
            if (supportedTypes.contains(volumeType)) {
                this.contents.put (volumeType, path);
                this.support.firePropertyChange(PROP_CONTENT, null, null);
            }
            else {
                throw new IllegalArgumentException ();
            }
        }

        public void removePropertyChangeListener(PropertyChangeListener l) {
            this.support.removePropertyChangeListener(l);
        }

        public void addPropertyChangeListener(PropertyChangeListener l) {
            this.support.addPropertyChangeListener(l);
        }              
    }
    
}





package org.netbeans.api.project.libraries;

import static org.netbeans.modules.project.libraries.TestUtil.*;
import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import org.netbeans.api.project.TestUtil;
import org.netbeans.junit.NbTestCase;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryProvider;
import org.openide.util.lookup.Lookups;
import org.openide.util.test.MockLookup;
import org.openide.util.test.MockPropertyChangeListener;

 */
public class LibraryTest extends NbTestCase {

    private WLP lp;

    /** Creates a new instance of LibraryManagerTest */
    public LibraryTest (String testName) {
        super (testName);
    }
    
    protected void setUp() throws Exception {
        super.setUp();
        lp = new WLP();
        MockLookup.setLookup(Lookups.singleton(lp));
    }
    
    public void testGetLibraries () throws Exception {        
        LibraryManager lm = LibraryManager.getDefault();
        Library[] libs = lm.getLibraries();
        LibraryImplementation[] impls = LibraryManagerTest.createTestLibs ();
        lp.set(impls);
        libs = lm.getLibraries();
        assertEquals ("Libraries count", 2, libs.length);
        LibraryManagerTest.assertLibsEquals (libs, impls);
        MockPropertyChangeListener pcl = new MockPropertyChangeListener();
        libs[0].addPropertyChangeListener(pcl);
        impls[0].setName("NewLibrary1");
        pcl.assertEvents(Library.PROP_NAME);
        tl.reset();
        LibraryManagerTest.assertLibsEquals (new Library[] {libs[0]}, new LibraryImplementation[] {impls[0]});
        
        impls[0].setDescription("NewLibrary1Description");
        pcl.assertEvents(Library.PROP_DESCRIPTION);
        tl.reset();
        LibraryManagerTest.assertLibsEquals (new Library[] {libs[0]}, new LibraryImplementation[] {impls[0]});
        List<URL> urls = new ArrayList<URL>();
        urls.add (new URL ("file:/lib/libnew1.so"));
        urls.add (new URL ("file:/lib/libnew2.so"));
        impls[0].setContent ("bin",urls);        
        pcl.assertEvents(Library.PROP_CONTENT);
        tl.reset();
        LibraryManagerTest.assertLibsEquals (new Library[] {libs[0]}, new LibraryImplementation[] {impls[0]});
        urls = new ArrayList<URL>();
        urls.add (new URL ("file:/src/new/src/"));
        impls[0].setContent ("src",urls);        
        pcl.assertEvents(Library.PROP_CONTENT);
        tl.reset();
        LibraryManagerTest.assertLibsEquals (new Library[] {libs[0]}, new LibraryImplementation[] {impls[0]});
    }    
    




/*
 * The contents of this file are subject to the terms of the Common Development
 * and Distribution License (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.html
 * or http://www.netbeans.org/cddl.txt.
 *
 * When distributing Covered Code, include this CDDL Header Notice in each file
 * and include the License file at http://www.netbeans.org/cddl.txt.
 * If applicable, add the following below the CDDL Header, with the fields
 * enclosed by brackets [] replaced by your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.modules.project.libraries;

import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.IOException;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import org.netbeans.spi.project.libraries.ArealLibraryProvider;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryProvider;
import org.netbeans.spi.project.libraries.LibraryStorageArea;
import org.netbeans.spi.project.libraries.support.LibrariesSupport;
import org.openide.util.WeakSet;

/**
 * Common support classes for unit tests in this module.
 */
public class TestUtil {

    private TestUtil() {}

    public static class NWLP implements LibraryProvider<LibraryImplementation> {

        public final List<LibraryImplementation> libs = new ArrayList<LibraryImplementation>();
        final PropertyChangeSupport pcs = new PropertyChangeSupport(this);

        public void set(LibraryImplementation... nue) {
            libs.clear();
            libs.addAll(Arrays.asList(nue));
            pcs.firePropertyChange(PROP_LIBRARIES, null, null);
        }

        public LibraryImplementation[] getLibraries() {
            return libs.toArray(new LibraryImplementation[0]);
        }

        public void addPropertyChangeListener(PropertyChangeListener listener) {
            pcs.addPropertyChangeListener(listener);
        }

        public void removePropertyChangeListener(PropertyChangeListener listener) {
            pcs.removePropertyChangeListener(listener);
        }

    }

    public static final class WLP extends NWLP implements WritableLibraryProvider<LibraryImplementation> {

        public void addLibrary(LibraryImplementation library) throws IOException {
            libs.add(library);
            pcs.firePropertyChange(PROP_LIBRARIES, null, null);
        }

        public void removeLibrary(LibraryImplementation library) throws IOException {
            libs.remove(library);
            pcs.firePropertyChange(PROP_LIBRARIES, null, null);
        }

        public void updateLibrary(LibraryImplementation oldLibrary, LibraryImplementation newLibrary) throws IOException {
            libs.remove(oldLibrary);
            libs.add(newLibrary);
            pcs.firePropertyChange(PROP_LIBRARIES, null, null);
        }

    }

    public static final class Area implements LibraryStorageArea {

        final String id;

        public Area(String id) {
            this.id = id;
        }

        public URL getLocation() {
            try {
                return new URL("http://nowhere.net/" + id);
            } catch (MalformedURLException x) {
                throw new AssertionError(x);
            }
        }

        public String getDisplayName() {
            return id;
        }

        public boolean equals(Object obj) {
            return obj instanceof Area && ((Area) obj).id.equals(id);
        }

        public int hashCode() {
            return id.hashCode();
        }

        public @Override String toString() {
            return "Area[" + id + "]";
        }

    }

    public static final class ALP implements ArealLibraryProvider<Area,LibraryImplementation> {

        final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
        public final Map<Area,List<LibraryImplementation>> libs = new HashMap<Area,List<LibraryImplementation>>();
        final Set<LP> lps = new WeakSet<LP>();
        final Set<Area> open = new HashSet<Area>();

        public void addPropertyChangeListener(PropertyChangeListener listener) {
            pcs.addPropertyChangeListener(listener);
        }

        public void removePropertyChangeListener(PropertyChangeListener listener) {
            pcs.removePropertyChangeListener(listener);
        }

        public Class<Area> areaType() {
            return Area.class;
        }

        public Class<LibraryImplementation> libraryType() {
            return LibraryImplementation.class;
        }

        public Area createArea() {
            return new Area("new");
        }

        public Area loadArea(URL location) {
            Matcher m = Pattern.compile("http://nowhere\\.net/(.+)$").matcher(location.toExternalForm());
            if (m.matches()) {
                return new Area(m.group(1));
            } else {
                return null;
            }
        }

        public Set<Area> getOpenAreas() {
            return open;
        }

        public void setOpen(Area... areas) {
            open.clear();
            open.addAll(Arrays.asList(areas));
            pcs.firePropertyChange(PROP_OPEN_AREAS, null, null);
        }

        private class LP implements LibraryProvider<LibraryImplementation> {

            final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
            final Area area;

            LP(Area area) {
                this.area = area;
                lps.add(this);
            }

            public LibraryImplementation[] getLibraries() {
                if (libs.containsKey(area)) {
                    return libs.get(area).toArray(new LibraryImplementation[0]);
                } else {
                    return new LibraryImplementation[0];
                }
            }

            public void addPropertyChangeListener(PropertyChangeListener listener) {
                pcs.addPropertyChangeListener(listener);
            }

            public void removePropertyChangeListener(PropertyChangeListener listener) {
                pcs.removePropertyChangeListener(listener);
            }

        }

        public LibraryProvider<LibraryImplementation> getLibraries(Area area) {
            return new LP(area);
        }

        public LibraryImplementation createLibrary(String type, String name, Area area, Map<String,List<URL>> contents) throws IOException {
            LibraryImplementation lib = LibrariesSupport.createLibraryImplementation(type, contents.keySet().toArray(new String[0]));
            lib.setName(name);
            for (Map.Entry<String,List<URL>> entry : contents.entrySet()) {
                lib.setContent(entry.getKey(), entry.getValue());
            }
            List<LibraryImplementation> l = libs.get(area);
            if (l == null) {
                l = new ArrayList<LibraryImplementation>();
                libs.put(area, l);
            }
            l.add(lib);
            for (LP lp : lps) {
                if (lp.area.equals(area)) {
                    lp.pcs.firePropertyChange(LibraryProvider.PROP_LIBRARIES, null, null);
                }
            }
            return lib;
        }

        public void remove(LibraryImplementation library) throws IOException {
            for (Map.Entry<Area,List<LibraryImplementation>> entry : libs.entrySet()) {
                if (entry.getValue().remove(library)) {
                    for (LP lp : lps) {
                        if (lp.area.equals(entry.getKey())) {
                            lp.pcs.firePropertyChange(LibraryProvider.PROP_LIBRARIES, null, null);
                        }
                    }
                }
            }
        }

    }

    public static URL mkJar(String name) throws MalformedURLException {
        return new URL("jar:http://nowhere.net/" + name + "!/");
    }

}




/*
 * The contents of this file are subject to the terms of the Common Development
 * and Distribution License (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.html
 * or http://www.netbeans.org/cddl.txt.
 *
 * When distributing Covered Code, include this CDDL Header Notice in each file
 * and include the License file at http://www.netbeans.org/cddl.txt.
 * If applicable, add the following below the CDDL Header, with the fields
 * enclosed by brackets [] replaced by your own identifying information:
 * "Portions Copyrighted [year] [name of copyright owner]"
 *
 * The Original Software is NetBeans. The Initial Developer of the Original
 * Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
 * Microsystems, Inc. All Rights Reserved.
 */

package org.netbeans.modules.project.libraries.ui;

import static org.netbeans.modules.project.libraries.TestUtil.*;
import java.net.URL;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.SortedSet;
import java.util.TreeSet;
import org.netbeans.junit.NbTestCase;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryStorageArea;
import org.netbeans.spi.project.libraries.support.LibrariesSupport;
import org.openide.util.test.MockChangeListener;
import org.openide.util.test.MockLookup;

public class LibrariesModelTest extends NbTestCase {

    // XXX test:
    // editing global libs
    // library editability flag is correct
    // IOException thrown by providers handled reasonably

    public LibrariesModelTest(String n) {
        super(n);
    }

    private LibrariesModel model;
    private LibraryImplementation lib1, lib2, lib3;
    private URL jar1, jar2, jar3;
    private MockChangeListener cl;
    private WLP wlp;
    private NWLP nwlp;
    private ALP alp;

    @Override
    protected void setUp() throws Exception {
        super.setUp();
        wlp = new WLP();
        nwlp = new NWLP();
        alp = new ALP();
        MockLookup.setInstances(wlp, nwlp, alp);
        LibrariesModel.createdAreas.clear();
        model = new LibrariesModel();
        cl = new MockChangeListener();
        model.addChangeListener(cl);
        lib1 = mkLib("lib1");
        lib2 = mkLib("lib2");
        lib3 = mkLib("lib3");
        jar1 = mkJar("lib1.jar");
        jar2 = mkJar("lib2.jar");
        jar3 = mkJar("lib3.jar");
        cl.assertNoEvents();
        assertEquals(0, model.getLibraries().size());
    }

    public void testNWLP() throws Exception {
        nwlp.set(lib1, lib2);
        cl.assertEvent();
        assertEquals(2, model.getLibraries().size());
    }

    public void testWLP() throws Exception {
        model.addLibrary(lib1);
        cl.assertEvent();
        assertEquals(1, model.getLibraries().size());
        model.addLibrary(lib2);
        cl.assertEvent();
        assertEquals(2, model.getLibraries().size());
        model.removeLibrary(lib1);
        cl.assertEvent();
        assertEquals(1, model.getLibraries().size());
        model.apply();
        assertEquals(1, wlp.libs.size());
        LibraryImplementation lib = wlp.libs.iterator().next();
        assertEquals("lib2", lib.getName());
    }

    public void testAreas() throws Exception {
        assertEquals("[]", areas2S());
        alp.setOpen(new Area("o1"), new Area("o2"));
        cl.assertEvent();
        assertEquals("[o1, o2]", areas2S());
        assertEquals("new", model.createArea().getDisplayName());
        cl.assertEvent();
        assertEquals("[new, o1, o2]", areas2S());
    }
    private String areas2S() {
        SortedSet<String> names = new TreeSet<String>();
        for (LibraryStorageArea area : model.getAreas()) {
            names.add(area.getDisplayName());
        }
        return names.toString();
    }

    public void testArealLibs() throws Exception {
        Area a = new Area("home");
        alp.setOpen(a);
        LibraryImplementation lib1 = model.createArealLibrary("jar", "mylib1", a);
        assertEquals(a, model.getArea(lib1));
        model.addLibrary(lib1);
        LibraryImplementation lib2 = model.createArealLibrary("jar", "mylib2", a);
        model.addLibrary(lib2);
        model.removeLibrary(lib2);
        lib1.setContent("cp", Arrays.asList(jar1, jar2));
        model.apply();
        assertEquals(1, alp.libs.size());
        assertEquals(a, alp.libs.keySet().iterator().next());
        List<LibraryImplementation> libs = alp.libs.get(a);
        assertEquals(1, libs.size());
        LibraryImplementation lib = libs.iterator().next();
        assertEquals("mylib1", lib.getName());
        assertEquals(Arrays.asList(jar1, jar2), lib.getContent("cp"));
        assertEquals(a, model.getArea(lib));
        model = new LibrariesModel();
        assertEquals(1, model.getLibraries().size());
        lib = model.getLibraries().iterator().next();
        assertEquals(a, model.getArea(lib));
        lib.setContent("cp", Collections.singletonList(jar3));
        model.apply();
        assertEquals(1, alp.libs.size());
        assertEquals(a, alp.libs.keySet().iterator().next());
        libs = alp.libs.get(a);
        assertEquals(1, libs.size());
        lib = libs.iterator().next();
        assertEquals("mylib1", lib.getName());
        assertEquals(Collections.singletonList(jar3), lib.getContent("cp"));
        assertEquals(a, model.getArea(lib));
        model = new LibrariesModel();
        assertEquals(1, model.getLibraries().size());
        lib = model.getLibraries().iterator().next();
        model.removeLibrary(lib);
        model.apply();
        assertEquals(1, alp.libs.size());
        assertEquals(a, alp.libs.keySet().iterator().next());
        libs = alp.libs.get(a);
        assertEquals(0, libs.size());
        Area a2 = new Area("away");
        assertEquals(0, model.getLibraries().size());
        model.addLibrary(model.createArealLibrary("jar", "generic", a));
        model.addLibrary(model.createArealLibrary("jar", "generic", a2));
        assertEquals(2, model.getLibraries().size());
    }

    public void testLoadLibsAfterCreateArea() throws Exception {
        LibraryStorageArea a = model.createArea();
        model.addLibrary(model.createArealLibrary("jar", "foo", a));
        model.apply();
        LibrariesModel.createdAreas.clear();
        model = new LibrariesModel();
        cl = new MockChangeListener();
        model.addChangeListener(cl);
        assertEquals(a, model.createArea());
        cl.assertEvent();
        Collection<? extends LibraryImplementation> libs = model.getLibraries();
        assertEquals(1, libs.size());
        assertEquals("foo", libs.iterator().next().getName());
    }

    private LibraryImplementation mkLib(String name) {
        LibraryImplementation lib = LibrariesSupport.createLibraryImplementation("jar", new String[] {"cp"});
        lib.setName(name);
        return lib;
    }

}




/*
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
 * 
 * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
 * 
 * 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.  Sun designates this
 * particular file as subject to the "Classpath" exception as provided
 * by Sun 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 2007 Sun Microsystems, Inc.
 */

package org.netbeans.spi.project.libraries.support;

import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
import org.netbeans.junit.NbTestCase;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;

/**
 */
public class LibrariesSupportTest extends NbTestCase {

    public LibrariesSupportTest(String testName) {
        super(testName);
    }            

    @Override
    protected void setUp() throws Exception {
        super.setUp();
    }

    /**
     * Test of convertFileToURL method, of class LibrariesSupport.
     */
    public void testConvertFileToURL() {
        File f = new File("/aa/bb/c c.ext".replace('/', File.separatorChar));
        URL u = LibrariesSupport.convertFileToURL(f);
        assertEquals("file:/aa/bb/c%20c.ext", u.toExternalForm());
        f = new File("../zz/re l.ext".replace('/', File.separatorChar));
        u = LibrariesSupport.convertFileToURL(f);
        assertEquals("file:../zz/re%20l.ext", u.toExternalForm());
    }

    /**
     * Test of convertURLToFile method, of class LibrariesSupport.
     */
    public void testConvertURLToFile() throws MalformedURLException{
        URL u = new URL("file:/aa/bb/c%20c.ext");
        File f = LibrariesSupport.convertURLToFile(u);
        assertEquals("/aa/bb/c c.ext".replace('/', File.separatorChar), f.getPath());
        u = new URL("file:../zz/re%20l.ext");
        f = LibrariesSupport.convertURLToFile(u);
        assertEquals("../zz/re l.ext".replace('/', File.separatorChar), f.getPath());
    }

    /**
     * Test of isAbsoluteURL method, of class LibrariesSupport.
     */
    public void testIsAbsoluteURL() throws MalformedURLException{
        URL u = new URL("file", null, "/test/absolute");
        assertTrue(u.toExternalForm(), LibrariesSupport.isAbsoluteURL(u));
        u = new URL("file", null, "../relative");
        assertFalse(u.toExternalForm(), LibrariesSupport.isAbsoluteURL(u));
    }

    /**
     * Test of resolveLibraryEntryFileObject method, of class LibrariesSupport.
     */
    public void testResolveLibraryEntry() throws Exception {
        File f = new File(this.getWorkDir(), "knihovna.properties");
        File f2 = new File(this.getWorkDir(), "bertie.jar");
        f.createNewFile();
        f2.createNewFile();
        FileObject fo = LibrariesSupport.resolveLibraryEntryFileObject(
                f.toURI().toURL(), 
                new URL("file", null, "bertie.jar"));
        assertEquals(f2.getPath(), FileUtil.toFile(fo).getPath());
        fo = LibrariesSupport.resolveLibraryEntryFileObject(
                null, 
                f2.toURI().toURL());
        assertEquals(f2.getPath(), FileUtil.toFile(fo).getPath());
    }

}

Return to bug 44035

Lines 103-108 Link Here

(-)projects/libraries/apichanges.xml:1.9 (+43 lines)
103		103
104	<!-- ACTUAL CHANGES BEGIN HERE: -->	104	<!-- ACTUAL CHANGES BEGIN HERE: -->
105	<changes>	105	<changes>
		106
		107	<change id="project-libraries">
		108	<api name="general"/>
		109	<summary>Support for project libraries</summary>
		110	<version major="1" minor="17"/>
		111	<date day="22" month="1" year="2008"/>
		112	<author login="jglick"/>
		113	<compatibility addition="yes" deprecation="yes">
		114	<p>
		115	<code>LibraryManager.addLibrary</code> will not work with areas,
		116	so it was deprecated in favor of the new <code>createLibrary</code>.
		117	</p>
		118	<p>
		119	Code which obtained a <code>Library</code> of arbitrary origin,
		120	and then assumed it could refer to that library henceforth by name only,
		121	will not work with project libraries.
		122	The simplest persistent identifier for a new-style library is pair of name
		123	and URL of manager (null for the default manager).
		124	</p>
		125	</compatibility>
		126	<description>
		127	<p>
		128	There is a new API and SPI for project libraries
		129	(or, more generally, libraries with specific storage locations).
		130	<code>LibraryChooser</code>, <code>ArealLibraryProvider</code>,
		131	and <code>LibraryStorageArea</code> are new, as are methods
		132	<code>Library.getManager</code>,
		133	<code>LibraryManager.getDisplayName</code>,
		134	<code>LibraryManager.getLocation</code>,
		135	<code>LibraryManager.createLibrary</code>,
		136	<code>LibraryManager.forLocation</code>, and
		137	<code>LibraryManager.getOpenManagers</code>.
		138	(<code>LibraryProvider</code> was also generified.)
		139	</p>
		140	</description>
		141	<class package="org.netbeans.api.project.libraries" name="LibraryManager"/>
		142	<class package="org.netbeans.api.project.libraries" name="Library"/>
		143	<class package="org.netbeans.api.project.libraries" name="LibraryChooser"/>
		144	<class package="org.netbeans.spi.project.libraries" name="LibraryProvider"/>
		145	<class package="org.netbeans.spi.project.libraries" name="ArealLibraryProvider"/>
		146	<class package="org.netbeans.spi.project.libraries" name="LibraryStorageArea"/>
		147	<issue number="44035"/>
		148	</change>
106		149
107	<change id="Customizer-can-be-null">	150	<change id="Customizer-can-be-null">
108	<api name="general"/>	151	<api name="general"/>

Lines 47-52 Link Here

(-)projects/libraries/nbproject/project.xml:1.16 (+10 lines)
47	<code-name-base>org.netbeans.modules.project.libraries</code-name-base>	47	<code-name-base>org.netbeans.modules.project.libraries</code-name-base>
48	<module-dependencies>	48	<module-dependencies>
49	<dependency>	49	<dependency>
		50	<code-name-base>org.jdesktop.layout</code-name-base>
		51	<build-prerequisite/>
		52	<compile-dependency/>
		53	<run-dependency>
		54	<release-version>1</release-version>
		55	<specification-version>1.5</specification-version>
		56	</run-dependency>
		57	</dependency>
		58	<dependency>
50	<code-name-base>org.netbeans.modules.projectapi</code-name-base>	59	<code-name-base>org.netbeans.modules.projectapi</code-name-base>
51	<build-prerequisite/>	60	<build-prerequisite/>
52	<compile-dependency/>	61	<compile-dependency/>
Lines 145-150 Link Here
145	</test-dependency>	154	</test-dependency>
146	<test-dependency>	155	<test-dependency>
147	<code-name-base>org.openide.util</code-name-base>	156	<code-name-base>org.openide.util</code-name-base>
		157	<compile-dependency/>
148	<test/>	158	<test/>
149	</test-dependency>	159	</test-dependency>
150	</test-type>	160	</test-type>

Lines 38-40 Link Here

(-)projects/libraries/src/org/netbeans/api/project/libraries/Bundle.properties:1.6 (+13 lines)
38	# made subject to such option by the copyright holder.	38	# made subject to such option by the copyright holder.
39		39
40	TXT_LibrariesManager=Library Manager	40	TXT_LibrariesManager=Library Manager
		41
		42	LibraryChooserGUI.add.title=Add Library
		43	LibraryChooserGUI.add.button=Add Library
		44	LibraryChooserGUI.import.title=Import Library
		45	LibraryChooserGUI.import.button=Import Library
		46	LibraryChooserGUI.manage=&Manage Libraries...
		47	LibraryChooserGUI.accessibleDescription=The library manager allows you to add predefined libraries to the project classpath or to edit library definitions.
		48	LibraryChooserGUI.librariesLabel=Available &Libraries:
		49	LibraryChooserGUI.createButton.text=Create...
		50	LibraryChooserGUI.importButton.text=Import...
		51	LibraryChooserGUI.manageLibrariesButton.text=Manage Libraries...
		52	LibrariesCustomizer.createLibrary.title=Create New Library
		53	LibrariesCustomizer.customizeLibrary.title=Customize Library

Lines 45-51 Link Here

(-)projects/libraries/src/org/netbeans/api/project/libraries/Library.java:1.12 (-12 / +19 lines)
45	import java.beans.PropertyChangeEvent;	45	import java.beans.PropertyChangeEvent;
46	import java.net.URL;	46	import java.net.URL;
47	import java.util.ArrayList;	47	import java.util.ArrayList;
48	import java.util.Iterator;
49	import java.util.List;	48	import java.util.List;
50	import java.util.MissingResourceException;	49	import java.util.MissingResourceException;
51	import java.util.ResourceBundle;	50	import java.util.ResourceBundle;
Lines 76-86 Link Here
76		75
77	private List<PropertyChangeListener> listeners;	76	private List<PropertyChangeListener> listeners;
78		77
79	/**	78	private final LibraryManager manager;
80	* Creates new library instance	79
81	*	80	Library(LibraryImplementation impl, LibraryManager manager) {
82	*/
83	private Library (LibraryImplementation impl) {
84	this.impl = impl;	81	this.impl = impl;
85	this.impl.addPropertyChangeListener (new PropertyChangeListener () {	82	this.impl.addPropertyChangeListener (new PropertyChangeListener () {
86	public void propertyChange(PropertyChangeEvent evt) {	83	public void propertyChange(PropertyChangeEvent evt) {
Lines 88-96 Link Here
88	Library.this.fireChange (propName,evt.getOldValue(),evt.getNewValue());	85	Library.this.fireChange (propName,evt.getOldValue(),evt.getNewValue());
89	}	86	}
90	});	87	});
		88	this.manager = manager;
91	} // end create	89	} // end create
92		90
93	/**	91	/**
		92	* Gets the associated library manager.
		93	* @return the manager (may be the "default" global manager, or a local manager)
		94	* @since org.netbeans.modules.project.libraries/1 1.15
		95	*/
		96	public LibraryManager getManager() {
		97	return manager;
		98	}
		99
		100	/**
94	* Access typed but raw library data.	101	* Access typed but raw library data.
95	* <p>	102	* <p>
96	* The contents are defined by SPI providers and identified	103	* The contents are defined by SPI providers and identified
Lines 169-179 Link Here
169	return impl.hashCode();	176	return impl.hashCode();
170	}	177	}
171		178
172	@Override
173	public String toString () {
174	return this.getName();
175	}
176
177	/**	179	/**
178	* Adds PropertyChangeListener	180	* Adds PropertyChangeListener
179	* @param listener	181	* @param listener
Lines 235-245 Link Here
235	return key;	237	return key;
236	}	238	}
237	}	239	}
		240
		241	@Override
		242	public String toString() {
		243	return "Library[" + getName() + "]"; // NOI18N
		244	}
238		245
239	static {	246	static {
240	LibraryAccessor.DEFAULT = new LibraryAccessor () {	247	LibraryAccessor.DEFAULT = new LibraryAccessor () {
241	public Library createLibrary (LibraryImplementation impl) {	248	public Library createLibrary (LibraryImplementation impl) {
242	return new Library (impl);	249	return new Library(impl, LibraryManager.getDefault());
243	}	250	}
244	};	251	};
245	}	252	}

Added Link Here

(-)/dev/null (+135 lines)
1	/*
2	* The contents of this file are subject to the terms of the Common Development
3	* and Distribution License (the License). You may not use this file except in
4	* compliance with the License.
5	*
6	* You can obtain a copy of the License at http://www.netbeans.org/cddl.html
7	* or http://www.netbeans.org/cddl.txt.
8	*
9	* When distributing Covered Code, include this CDDL Header Notice in each file
10	* and include the License file at http://www.netbeans.org/cddl.txt.
11	* If applicable, add the following below the CDDL Header, with the fields
12	* enclosed by brackets [] replaced by your own identifying information:
13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.
18	*/
19
20	package org.netbeans.api.project.libraries;
21
22	import java.awt.Component;
23	import java.beans.PropertyChangeListener;
24	import java.io.IOException;
25	import java.util.Set;
26
27	/**
28	* Visual picker for libraries.
29	* @since org.netbeans.modules.project.libraries/1 1.16
30	*/
31	public final class LibraryChooser {
32
33	private LibraryChooser() {
34	}
35
36	/**
37	* Create a chooser showing libraries from given library manager and let the
38	* user to pick some.
39	* @param manager manager; can be null in which case global libraries are listed
40	* @param filter optional libraries filter; null for no filtering
41	* @param handler handler to perform library importing; can be null in which case
42	* import will not be allowed in UI
43	* @return a nonempty set of libraries that were selected, or null if the dialog was cancelled
44	*/
45	public static Set<Library> showDialog(LibraryManager manager, Filter filter, LibraryImportHandler handler) {
46	return LibraryChooserGUI.showChooser(manager, filter, handler, true);
47	}
48
49	/**
50	* Create a picker as an embeddable panel.
51	* Might be used in a wizard, for example.
52	* @param manager library manager to use or null for global libraries
53	* @param filter optional libraries filter; null for no filtering
54	* @return a panel controller
55	*/
56	public static Panel createPanel(LibraryManager manager, Filter filter) {
57	return LibraryChooserGUI.createPanel(manager, filter);
58	}
59
60	/**
61	* Filter for use by {@link LibraryChooser#createPanel()} or
62	* {@link LibraryChooser#showDialog()}.
63	*/
64	public interface Filter {
65
66	/**
67	* Accepts or rejects a library.
68	* @param library a library found in one of the managers
69	* @return true to display, false to hide
70	*/
71	boolean accept(Library library);
72
73	}
74
75	/**
76	* Represents operations permitted by {@link #createPanel}.
77	* Not to be implemented by foreign code (methods may be added in the future).
78	*/
79	public interface Panel {
80
81	/**
82	* Produces the actual component you can display.
83	* @return an embeddable GUI component
84	*/
85	Component getVisualComponent();
86
87	/**
88	* Gets the set of libraries which are currently selected.
89	* @return a (possibly empty) set of libraries
90	*/
91	Set<Library> getSelectedLibraries();
92
93	/**
94	* Property fired when {@link #getSelectedLibraries} changes.
95	* Do not expect the old and new values to be non-null.
96	*/
97	String PROP_SELECTED_LIBRARIES = "selectedLibraries"; // NOI18N
98
99	/**
100	* Add a listener for {@link #PROP_SELECTED_LIBRARIES}.
101	* @param listener the listener to add
102	*/
103	void addPropertyChangeListener(PropertyChangeListener listener);
104
105	/**
106	* Remove a listener.
107	* @param listener the listener to remove
108	*/
109	void removePropertyChangeListener(PropertyChangeListener listener);
110
111	}
112
113	/**
114	* Handler for library importing. The handler is used from library chooser
115	* UI in order to import global library to sharable libraries location. A
116	* library is only imported if there is no library with the same library
117	* name in destination library manager.
118	*/
119	public interface LibraryImportHandler {
120
121	/**
122	* Implementation is expected to copy given global library to
123	* sharable libraries location, that is to library manager the library
124	* chooser was created for.
125	*
126	* @param library library to copy
127	* @return newly created library
128	* @throws java.io.IOException any IO failure
129	* @throws IllegalArgumentException if there already exists library
130	* with this name
131	*/
132	Library importLibrary(Library library) throws IOException;
133	}
134
135	}

Added Link Here

(-)/dev/null (+113 lines)
1	<?xml version="1.0" encoding="UTF-8" ?>
2
3	<Form version="1.4" maxVersion="1.4" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<AccessibilityProperties>
5	<Property name="AccessibleContext.accessibleDescription" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
6	<ResourceString bundle="org/netbeans/api/project/libraries/Bundle.properties" key="LibraryChooserGUI.accessibleDescription" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
7	</Property>
8	</AccessibilityProperties>
9	<AuxValues>
10	<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
11	<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
12	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
13	<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
14	<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
15	<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
16	<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
17	<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
18	</AuxValues>
19
20	<Layout>
21	<DimensionLayout dim="0">
22	<Group type="103" groupAlignment="0" attributes="0">
23	<Component id="librariesLabel" min="-2" max="-2" attributes="0"/>
24	<Group type="102" alignment="1" attributes="0">
25	<Component id="tree" pref="257" max="32767" attributes="0"/>
26	<EmptySpace max="-2" attributes="0"/>
27	<Group type="103" groupAlignment="1" attributes="0">
28	<Component id="createButton" min="-2" max="-2" attributes="0"/>
29	<Component id="importButton" min="-2" max="-2" attributes="0"/>
30	</Group>
31	</Group>
32	<Group type="102" alignment="0" attributes="0">
33	<Component id="manageLibrariesButton" min="-2" max="-2" attributes="0"/>
34	<EmptySpace max="-2" attributes="0"/>
35	</Group>
36	</Group>
37	</DimensionLayout>
38	<DimensionLayout dim="1">
39	<Group type="103" groupAlignment="0" attributes="0">
40	<Group type="102" alignment="0" attributes="0">
41	<Component id="librariesLabel" min="-2" max="-2" attributes="0"/>
42	<EmptySpace min="-2" max="-2" attributes="0"/>
43	<Group type="103" groupAlignment="0" attributes="0">
44	<Group type="102" attributes="0">
45	<Component id="createButton" min="-2" max="-2" attributes="0"/>
46	<EmptySpace max="-2" attributes="0"/>
47	<Component id="importButton" min="-2" max="-2" attributes="0"/>
48	</Group>
49	<Component id="tree" pref="284" max="32767" attributes="0"/>
50	</Group>
51	<EmptySpace max="-2" attributes="0"/>
52	<Component id="manageLibrariesButton" min="-2" max="-2" attributes="0"/>
53	</Group>
54	</Group>
55	</DimensionLayout>
56	</Layout>
57	<SubComponents>
58	<Component class="javax.swing.JLabel" name="librariesLabel">
59	<Properties>
60	<Property name="labelFor" type="java.awt.Component" editor="org.netbeans.modules.form.ComponentChooserEditor">
61	<ComponentRef name="tree"/>
62	</Property>
63	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
64	<ResourceString bundle="org/netbeans/api/project/libraries/Bundle.properties" key="LibraryChooserGUI.librariesLabel" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
65	</Property>
66	</Properties>
67	<AuxValues>
68	<AuxValue name="generateMnemonicsCode" type="java.lang.Boolean" value="true"/>
69	</AuxValues>
70	</Component>
71	<Component class="org.openide.explorer.view.BeanTreeView" name="tree">
72	<Properties>
73	<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
74	<Border info="org.netbeans.modules.form.compat2.border.EtchedBorderInfo">
75	<EtchetBorder/>
76	</Border>
77	</Property>
78	<Property name="popupAllowed" type="boolean" value="false"/>
79	<Property name="rootVisible" type="boolean" value="false"/>
80	</Properties>
81	</Component>
82	<Component class="javax.swing.JButton" name="createButton">
83	<Properties>
84	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
85	<ResourceString bundle="org/netbeans/api/project/libraries/Bundle.properties" key="LibraryChooserGUI.createButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
86	</Property>
87	</Properties>
88	<Events>
89	<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="createButtonActionPerformed"/>
90	</Events>
91	</Component>
92	<Component class="javax.swing.JButton" name="importButton">
93	<Properties>
94	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
95	<ResourceString bundle="org/netbeans/api/project/libraries/Bundle.properties" key="LibraryChooserGUI.importButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
96	</Property>
97	</Properties>
98	<Events>
99	<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="importButtonActionPerformed"/>
100	</Events>
101	</Component>
102	<Component class="javax.swing.JButton" name="manageLibrariesButton">
103	<Properties>
104	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
105	<ResourceString bundle="org/netbeans/api/project/libraries/Bundle.properties" key="LibraryChooserGUI.manageLibrariesButton.text" replaceFormat="org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}")"/>
106	</Property>
107	</Properties>
108	<Events>
109	<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="manageLibrariesButtonActionPerformed"/>
110	</Events>
111	</Component>
112	</SubComponents>
113	</Form>

Added Link Here

(-)/dev/null (+382 lines)
1	/*
2	* The contents of this file are subject to the terms of the Common Development
3	* and Distribution License (the License). You may not use this file except in
4	* compliance with the License.
5	*
6	* You can obtain a copy of the License at http://www.netbeans.org/cddl.html
7	* or http://www.netbeans.org/cddl.txt.
8	*
9	* When distributing Covered Code, include this CDDL Header Notice in each file
10	* and include the License file at http://www.netbeans.org/cddl.txt.
11	* If applicable, add the following below the CDDL Header, with the fields
12	* enclosed by brackets [] replaced by your own identifying information:
13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.
18	*/
19
20	package org.netbeans.api.project.libraries;
21
22	import java.awt.BorderLayout;
23	import java.awt.Component;
24	import java.awt.Image;
25	import java.beans.PropertyChangeEvent;
26	import java.beans.PropertyChangeListener;
27	import java.beans.PropertyVetoException;
28	import java.io.IOException;
29	import java.text.Collator;
30	import java.util.ArrayList;
31	import java.util.Collection;
32	import java.util.Collections;
33	import java.util.Comparator;
34	import java.util.HashSet;
35	import java.util.List;
36	import java.util.Set;
37	import javax.swing.JButton;
38	import javax.swing.JPanel;
39	import javax.swing.border.EmptyBorder;
40	import org.openide.DialogDescriptor;
41	import org.openide.DialogDisplayer;
42	import org.openide.NotifyDescriptor;
43	import org.openide.explorer.ExplorerManager;
44	import org.openide.filesystems.Repository;
45	import org.openide.loaders.DataFolder;
46	import org.openide.nodes.AbstractNode;
47	import org.openide.nodes.Children;
48	import org.openide.nodes.Node;
49	import org.openide.nodes.NodeNotFoundException;
50	import org.openide.nodes.NodeOp;
51	import org.openide.util.Exceptions;
52	import org.openide.util.HelpCtx;
53	import org.openide.util.NbBundle;
54	import org.openide.util.lookup.Lookups;
55
56	class LibraryChooserGUI extends JPanel implements ExplorerManager.Provider, HelpCtx.Provider, LibraryChooser.Panel {
57
58	private final LibraryManager manager;
59	private final LibraryChooser.Filter filter;
60	private final ExplorerManager explorer;
61	private LibraryChooser.LibraryImportHandler importHandler;
62
63	private LibraryChooserGUI(LibraryManager manager, LibraryChooser.Filter filter,
64	LibraryChooser.LibraryImportHandler importHandler) {
65	if (manager == null) {
66	manager = LibraryManager.getDefault();
67	}
68	this.manager = manager;
69	this.filter = filter;
70	this.importHandler = importHandler;
71	explorer = new ExplorerManager();
72	initComponents();
73	tree.setDefaultActionAllowed(false);
74	}
75
76	public static LibraryChooser.Panel createPanel(LibraryManager manager,
77	LibraryChooser.Filter filter) {
78	LibraryChooserGUI l = new LibraryChooserGUI(manager, filter, null);
79	l.configureForEmbedded();
80	return l;
81	}
82
83	public static Set<Library> showChooser(LibraryManager manager, LibraryChooser.Filter filter,
84	LibraryChooser.LibraryImportHandler handler, boolean addOperation) {
85	LibraryChooserGUI l = new LibraryChooserGUI(manager, filter, handler);
86	return l.showDialog(addOperation);
87	}
88
89	private Set<Library> showDialog(boolean addOperatation) {
90	// show manage button only in embedded panel:
91	manageLibrariesButton.setVisible(false);
92	// import enabled only for non-global library manager
93	importButton.setVisible(manager.getLocation() != null && importHandler != null);
94	JPanel inset = new JPanel(new BorderLayout());
95	inset.setBorder(new EmptyBorder(12,12,0,12));
96	inset.add(this);
97	String title;
98	String buttonLabel;
99	if (addOperatation) {
100	title = NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.add.title");
101	buttonLabel = NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.add.button");
102	} else {
103	title = NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.import.title");
104	buttonLabel = NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.import.button");
105	createButton.setVisible(false);
106	}
107	DialogDescriptor dd = new DialogDescriptor(inset, title);
108	dd.setModal(true);
109	final JButton add = new JButton(buttonLabel);
110	add.setEnabled(false);
111	add.setDefaultCapable(true);
112	explorer.addPropertyChangeListener(new PropertyChangeListener() {
113	public void propertyChange(PropertyChangeEvent evt) {
114	add.setEnabled(!getSelectedLibraries().isEmpty());
115	}
116	});
117	dd.setOptions(new Object[] {add, NotifyDescriptor.CANCEL_OPTION});
118	dd.setClosingOptions(new Object[] {add, NotifyDescriptor.CANCEL_OPTION});
119	if (DialogDisplayer.getDefault().notify(dd) == add) {
120	Set<Library> selection = getSelectedLibraries();
121	assert !selection.isEmpty();
122	return selection;
123	} else {
124	return null;
125	}
126	}
127
128	private void configureForEmbedded() {
129	explorer.addPropertyChangeListener(new PropertyChangeListener() {
130	public void propertyChange(PropertyChangeEvent evt) {
131	firePropertyChange(PROP_SELECTED_LIBRARIES, null, null);
132	}
133	});
134	createButton.setVisible(false);
135	importButton.setVisible(false);
136	}
137
138	public Set<Library> getSelectedLibraries() {
139	Set<Library> s = new HashSet<Library>();
140	for (Node n : explorer.getSelectedNodes()) {
141	Library l = n.getLookup().lookup(Library.class);
142	if (l != null) {
143	s.add(l);
144	} else {
145	return Collections.emptySet();
146	}
147	}
148	return s;
149	}
150
151	public Component getVisualComponent() {
152	return this;
153	}
154
155	public ExplorerManager getExplorerManager() {
156	return explorer;
157	}
158
159	public HelpCtx getHelpCtx() {
160	return new HelpCtx(LibraryChooserGUI.class);
161	}
162
163	private void setRootNode() {
164	explorer.setRootContext(new AbstractNode(new LibraryManagerChildren()));
165	tree.expandAll();
166	try {
167	if (explorer.getRootContext().getChildren().getNodes(true).length > 0) {
168	explorer.setSelectedNodes(new Node[] {explorer.getRootContext().getChildren().getNodes(true)[0]});
169	}
170	} catch (PropertyVetoException x) {
171	Exceptions.printStackTrace(x);
172	}
173	/* XXX Nothing seems to work to scroll to top; how is it done?
174	tree.getViewport().setViewPosition(new Point());
175	tree.getViewport().scrollRectToVisible(new Rectangle(0, 0, 1, 1));
176	*/
177	tree.requestFocus();
178	}
179
180	@Override
181	public void addNotify() {
182	super.addNotify();
183	setRootNode();
184	}
185
186	private class LibraryManagerChildren extends Children.Keys<LibraryManager> {
187
188	@Override
189	protected void addNotify() {
190	super.addNotify();
191	if (manager != null) {
192	setKeys(Collections.singleton(manager));
193	}
194	}
195
196	protected Node[] createNodes(LibraryManager mgr) {
197	List<Library> libs = new ArrayList<Library>();
198	for (Library lib : mgr.getLibraries()) {
199	if (filter == null \|\| filter.accept(lib)) {
200	libs.add(lib);
201	}
202	}
203	if (libs.isEmpty()) {
204	return new Node[0];
205	} else {
206	Collections.sort(libs,new Comparator<Library>() {
207	Collator COLL = Collator.getInstance();
208	public int compare(Library lib1, Library lib2) {
209	return COLL.compare(lib1.getDisplayName(), lib2.getDisplayName());
210	}
211	});
212	Node n = new AbstractNode(new LibraryChildren(libs)) {
213	Node iconDelegate = DataFolder.findFolder(Repository.getDefault().getDefaultFileSystem().getRoot()).getNodeDelegate();
214	public Image getIcon(int type) {
215	return iconDelegate.getIcon(type);
216	}
217	public Image getOpenedIcon(int type) {
218	return iconDelegate.getOpenedIcon(type);
219	}
220	};
221	n.setName(mgr.getDisplayName());
222	n.setDisplayName(mgr.getDisplayName());
223	return new Node[] {n};
224	}
225	}
226
227	}
228
229	private class LibraryChildren extends Children.Keys<Library> {
230
231	LibraryChildren(List<Library> libs) {
232	setKeys(libs);
233	}
234
235	protected Node[] createNodes(Library lib) {
236	AbstractNode n = new AbstractNode(Children.LEAF, Lookups.singleton(lib));
237	n.setName(lib.getName());
238	n.setDisplayName(lib.getDisplayName());
239	n.setShortDescription(lib.getDescription());
240	n.setIconBaseWithExtension("org/netbeans/modules/project/libraries/resources/libraries.gif"); // NOI18N
241	return new Node[] {n};
242	}
243
244	}
245
246	// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
247	private void initComponents() {
248
249	librariesLabel = new javax.swing.JLabel();
250	tree = new org.openide.explorer.view.BeanTreeView();
251	createButton = new javax.swing.JButton();
252	importButton = new javax.swing.JButton();
253	manageLibrariesButton = new javax.swing.JButton();
254
255	librariesLabel.setLabelFor(tree);
256	org.openide.awt.Mnemonics.setLocalizedText(librariesLabel, org.openide.util.NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.librariesLabel")); // NOI18N
257
258	tree.setBorder(javax.swing.BorderFactory.createEtchedBorder());
259	tree.setPopupAllowed(false);
260	tree.setRootVisible(false);
261
262	createButton.setText(org.openide.util.NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.createButton.text")); // NOI18N
263	createButton.addActionListener(new java.awt.event.ActionListener() {
264	public void actionPerformed(java.awt.event.ActionEvent evt) {
265	createButtonActionPerformed(evt);
266	}
267	});
268
269	importButton.setText(org.openide.util.NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.importButton.text")); // NOI18N
270	importButton.addActionListener(new java.awt.event.ActionListener() {
271	public void actionPerformed(java.awt.event.ActionEvent evt) {
272	importButtonActionPerformed(evt);
273	}
274	});
275
276	manageLibrariesButton.setText(org.openide.util.NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.manageLibrariesButton.text")); // NOI18N
277	manageLibrariesButton.addActionListener(new java.awt.event.ActionListener() {
278	public void actionPerformed(java.awt.event.ActionEvent evt) {
279	manageLibrariesButtonActionPerformed(evt);
280	}
281	});
282
283	org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
284	this.setLayout(layout);
285	layout.setHorizontalGroup(
286	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
287	.add(librariesLabel)
288	.add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
289	.add(tree, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 257, Short.MAX_VALUE)
290	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
291	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
292	.add(createButton)
293	.add(importButton)))
294	.add(layout.createSequentialGroup()
295	.add(manageLibrariesButton)
296	.addContainerGap())
297	);
298	layout.setVerticalGroup(
299	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
300	.add(layout.createSequentialGroup()
301	.add(librariesLabel)
302	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
303	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
304	.add(layout.createSequentialGroup()
305	.add(createButton)
306	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
307	.add(importButton))
308	.add(tree, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 284, Short.MAX_VALUE))
309	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
310	.add(manageLibrariesButton))
311	);
312
313	getAccessibleContext().setAccessibleDescription(org.openide.util.NbBundle.getMessage(LibraryChooserGUI.class, "LibraryChooserGUI.accessibleDescription")); // NOI18N
314	}// </editor-fold>//GEN-END:initComponents
315
316	private void manageLibrariesButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_manageLibrariesButtonActionPerformed
317	if (LibrariesCustomizer.showCustomizer(null, manager)) {
318	setRootNode();
319	}
320	}//GEN-LAST:event_manageLibrariesButtonActionPerformed
321
322	private void createButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_createButtonActionPerformed
323	Library l = LibrariesCustomizer.showCreateNewLibraryCustomizer(manager);
324	if (l != null) {
325	setRootNode();
326	selectLibrary(Collections.singleton(l));
327	}
328	}//GEN-LAST:event_createButtonActionPerformed
329
330	private void selectLibrary(Collection<Library> libraries) {
331	Node root = explorer.getRootContext();
332	List<Node> selection = new ArrayList<Node>();
333	for (Library lib : libraries) {
334	String[] path = {lib.getManager().getDisplayName(), lib.getName()};
335	try {
336	Node node = NodeOp.findPath(root, path);
337	if (node != null) {
338	selection.add(node);
339	}
340	} catch (NodeNotFoundException e) {
341	//Ignore it
342	}
343	}
344	try {
345	explorer.setSelectedNodes(selection.toArray(new Node[selection.size()]));
346	} catch (PropertyVetoException e) {
347	//Ignore it
348	}
349	}
350
351	private void importButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_importButtonActionPerformed
352	Set<Library> libs = showChooser(LibraryManager.getDefault(),
353	new IgnoreAlreadyImportedLibrariesFilter(), null, false);
354	if (libs != null) {
355	Set<Library> importedLibs = new HashSet<Library>();
356	try {
357	for (Library lib : libs) {
358	importedLibs.add(importHandler.importLibrary(lib));
359	}
360	} catch (IOException ex) {
361	Exceptions.printStackTrace(ex);
362	}
363	setRootNode();
364	selectLibrary(importedLibs);
365	}
366	}//GEN-LAST:event_importButtonActionPerformed
367
368	private class IgnoreAlreadyImportedLibrariesFilter implements LibraryChooser.Filter {
369	public boolean accept(Library library) {
370	return manager.getLibrary(library.getName()) == null;
371	}
372	}
373
374	// Variables declaration - do not modify//GEN-BEGIN:variables
375	private javax.swing.JButton createButton;
376	private javax.swing.JButton importButton;
377	private javax.swing.JLabel librariesLabel;
378	private javax.swing.JButton manageLibrariesButton;
379	private org.openide.explorer.view.BeanTreeView tree;
380	// End of variables declaration//GEN-END:variables
381
382	}

Added Link Here

(-)/dev/null (+64 lines)
1	<?xml version="1.0" encoding="UTF-8" ?>
2
3	<Form version="1.5" maxVersion="1.5" type="org.netbeans.modules.form.forminfo.JPanelFormInfo">
4	<AuxValues>
5	<AuxValue name="FormSettings_autoResourcing" type="java.lang.Integer" value="1"/>
6	<AuxValue name="FormSettings_autoSetComponentName" type="java.lang.Boolean" value="false"/>
7	<AuxValue name="FormSettings_generateMnemonicsCode" type="java.lang.Boolean" value="false"/>
8	<AuxValue name="FormSettings_i18nAutoMode" type="java.lang.Boolean" value="true"/>
9	<AuxValue name="FormSettings_layoutCodeTarget" type="java.lang.Integer" value="2"/>
10	<AuxValue name="FormSettings_listenerGenerationStyle" type="java.lang.Integer" value="0"/>
11	<AuxValue name="FormSettings_variablesLocal" type="java.lang.Boolean" value="false"/>
12	<AuxValue name="FormSettings_variablesModifier" type="java.lang.Integer" value="2"/>
13	</AuxValues>
14
15	<Layout>
16	<DimensionLayout dim="0">
17	<Group type="103" groupAlignment="0" attributes="0">
18	<Group type="102" alignment="1" attributes="0">
19	<EmptySpace min="-2" max="-2" attributes="0"/>
20	<Group type="103" groupAlignment="1" attributes="0">
21	<Component id="placeholder" alignment="0" pref="377" max="32767" attributes="0"/>
22	<Group type="102" alignment="1" attributes="0">
23	<Component id="jLabel1" min="-2" max="-2" attributes="0"/>
24	<EmptySpace max="-2" attributes="0"/>
25	<Component id="libraryManagerComboBox" pref="289" max="32767" attributes="0"/>
26	</Group>
27	</Group>
28	<EmptySpace min="-2" max="-2" attributes="0"/>
29	</Group>
30	</Group>
31	</DimensionLayout>
32	<DimensionLayout dim="1">
33	<Group type="103" groupAlignment="0" attributes="0">
34	<Group type="102" alignment="0" attributes="0">
35	<EmptySpace max="-2" attributes="0"/>
36	<Group type="103" groupAlignment="3" attributes="0">
37	<Component id="jLabel1" alignment="3" min="-2" max="-2" attributes="0"/>
38	<Component id="libraryManagerComboBox" alignment="3" min="-2" max="-2" attributes="0"/>
39	</Group>
40	<EmptySpace max="-2" attributes="0"/>
41	<Component id="placeholder" pref="230" max="32767" attributes="0"/>
42	</Group>
43	</Group>
44	</DimensionLayout>
45	</Layout>
46	<SubComponents>
47	<Component class="javax.swing.JComboBox" name="libraryManagerComboBox">
48	<Events>
49	<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="libraryManagerComboBoxActionPerformed"/>
50	</Events>
51	</Component>
52	<Container class="javax.swing.JPanel" name="placeholder">
53
54	<Layout class="org.netbeans.modules.form.compat2.layouts.DesignBorderLayout"/>
55	</Container>
56	<Component class="javax.swing.JLabel" name="jLabel1">
57	<Properties>
58	<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
59	<ResourceString bundle="org/netbeans/modules/project/libraries/ui/Bundle.properties" key="AllLibrariesCustomizer.jLabel1.text" replaceFormat="java.text.MessageFormat.format(org.openide.util.NbBundle.getMessage({sourceFileName}.class, "{key}"), {arguments})"/>
60	</Property>
61	</Properties>
62	</Component>
63	</SubComponents>
64	</Form>

Added Link Here

(-)/dev/null (+166 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
5	*
6	* The contents of this file are subject to the terms of either the GNU
7	* General Public License Version 2 only ("GPL") or the Common
8	* Development and Distribution License("CDDL") (collectively, the
9	* "License"). You may not use this file except in compliance with the
10	* License. You can obtain a copy of the License at
11	* http://www.netbeans.org/cddl-gplv2.html
12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13	* specific language governing permissions and limitations under the
14	* License. When distributing the software, include this License Header
15	* Notice in each file and include the License file at
16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17	* particular file as subject to the "Classpath" exception as provided
18	* by Sun in the GPL Version 2 section of the License file that
19	* accompanied this code. If applicable, add the following below the
20	* License Header, with the fields enclosed by brackets [] replaced by
21	* your own identifying information:
22	* "Portions Copyrighted [year] [name of copyright owner]"
23	*
24	* Contributor(s):
25	*
26	* The Original Software is NetBeans. The Initial Developer of the Original
27	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2006 Sun
28	* Microsystems, Inc. All Rights Reserved.
29	*
30	* If you wish your version of this file to be governed by only the CDDL
31	* or only the GPL Version 2, indicate your decision by adding
32	* "[Contributor] elects to include this software in this distribution
33	* under the [CDDL or GPL Version 2] license." If you do not indicate a
34	* single choice of license, a recipient has the option to distribute
35	* your version of this file under either the CDDL, the GPL Version 2 or
36	* to extend the choice of license to its licensees as provided above.
37	* However, if you add GPL Version 2 code and therefore, elected the GPL
38	* Version 2 license, then the option applies only if the new code is
39	* made subject to such option by the copyright holder.
40	*/
41
42	package org.netbeans.modules.project.libraries.ui;
43
44	import org.netbeans.api.project.libraries.*;
45	import org.netbeans.modules.project.libraries.ui.*;
46	import java.io.File;
47	import java.net.URL;
48	import java.util.ArrayList;
49	import java.util.List;
50	import javax.swing.DefaultComboBoxModel;
51	import org.netbeans.api.project.libraries.LibraryManager;
52	import org.netbeans.modules.project.libraries.LibraryAccessor;
53	import org.netbeans.spi.project.libraries.ArealLibraryProvider;
54	import org.netbeans.spi.project.libraries.LibraryStorageArea;
55	import org.netbeans.spi.project.libraries.support.LibrariesSupport;
56	import org.openide.util.Lookup;
57	import org.openide.util.NbBundle;
58
59	/**
60	*
61	*/
62	class AllLibrariesCustomizer extends javax.swing.JPanel {
63
64	private org.netbeans.modules.project.libraries.ui.LibrariesCustomizer librariesCustomizer;
65	/** Creates new form AllLibrariesCustomizer */
66	public AllLibrariesCustomizer() {
67	initComponents();
68	librariesCustomizer = new org.netbeans.modules.project.libraries.ui.LibrariesCustomizer(null);
69	placeholder.add(librariesCustomizer);
70	initModel();
71	}
72
73	public boolean apply() {
74	return librariesCustomizer.apply();
75	}
76
77	private void initModel() {
78	List<String> items = new ArrayList<String>();
79	items.add(NbBundle.getMessage(AllLibrariesCustomizer.class, "LABEL_Global_Libraries"));
80	for (LibraryManager man : LibraryManager.getOpenManagers()) {
81	if (man.getLocation() == null) {
82	continue;
83	}
84	items.add(LibrariesSupport.convertURLToFile(man.getLocation()).getPath());
85	}
86	libraryManagerComboBox.setModel(new DefaultComboBoxModel(items.toArray(new String[items.size()])));
87	}
88
89	/** This method is called from within the constructor to
90	* initialize the form.
91	* WARNING: Do NOT modify this code. The content of this method is
92	* always regenerated by the Form Editor.
93	*/
94	// <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
95	private void initComponents() {
96
97	libraryManagerComboBox = new javax.swing.JComboBox();
98	placeholder = new javax.swing.JPanel();
99	jLabel1 = new javax.swing.JLabel();
100
101	libraryManagerComboBox.addActionListener(new java.awt.event.ActionListener() {
102	public void actionPerformed(java.awt.event.ActionEvent evt) {
103	libraryManagerComboBoxActionPerformed(evt);
104	}
105	});
106
107	placeholder.setLayout(new java.awt.BorderLayout());
108
109	jLabel1.setText(java.text.MessageFormat.format(org.openide.util.NbBundle.getMessage(AllLibrariesCustomizer.class, "AllLibrariesCustomizer.jLabel1.text"), new Object[] {})); // NOI18N
110
111	org.jdesktop.layout.GroupLayout layout = new org.jdesktop.layout.GroupLayout(this);
112	this.setLayout(layout);
113	layout.setHorizontalGroup(
114	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
115	.add(org.jdesktop.layout.GroupLayout.TRAILING, layout.createSequentialGroup()
116	.addContainerGap()
117	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.TRAILING)
118	.add(org.jdesktop.layout.GroupLayout.LEADING, placeholder, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 377, Short.MAX_VALUE)
119	.add(layout.createSequentialGroup()
120	.add(jLabel1)
121	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
122	.add(libraryManagerComboBox, 0, 289, Short.MAX_VALUE)))
123	.addContainerGap())
124	);
125	layout.setVerticalGroup(
126	layout.createParallelGroup(org.jdesktop.layout.GroupLayout.LEADING)
127	.add(layout.createSequentialGroup()
128	.addContainerGap()
129	.add(layout.createParallelGroup(org.jdesktop.layout.GroupLayout.BASELINE)
130	.add(jLabel1)
131	.add(libraryManagerComboBox, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, org.jdesktop.layout.GroupLayout.PREFERRED_SIZE))
132	.addPreferredGap(org.jdesktop.layout.LayoutStyle.RELATED)
133	.add(placeholder, org.jdesktop.layout.GroupLayout.DEFAULT_SIZE, 230, Short.MAX_VALUE))
134	);
135	}// </editor-fold>//GEN-END:initComponents
136
137	private void libraryManagerComboBoxActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_libraryManagerComboBoxActionPerformed
138	int index = libraryManagerComboBox.getSelectedIndex();
139	if (index == -1) {
140	return;
141	} else if (index == 0) {
142	librariesCustomizer.setLibraryStorageArea(null);
143	} else if (index > 0) {
144	URL u = LibrariesSupport.convertFileToURL(new File ((String)libraryManagerComboBox.getModel().getSelectedItem()));
145	librariesCustomizer.setLibraryStorageArea(findLibraryStorageArea(u));
146	}
147	}//GEN-LAST:event_libraryManagerComboBoxActionPerformed
148
149	private LibraryStorageArea findLibraryStorageArea(URL u) {
150	for (ArealLibraryProvider alp : Lookup.getDefault().lookupAll(ArealLibraryProvider.class)) {
151	for (LibraryStorageArea area : LibraryAccessor.getOpenAreas(alp)) {
152	if (u.equals(area.getLocation())) {
153	return area;
154	}
155	}
156	}
157	return null;
158	}
159
160	// Variables declaration - do not modify//GEN-BEGIN:variables
161	private javax.swing.JLabel jLabel1;
162	private javax.swing.JComboBox libraryManagerComboBox;
163	private javax.swing.JPanel placeholder;
164	// End of variables declaration//GEN-END:variables
165
166	}

Added Link Here

(-)/dev/null (+124 lines)
1	/*
2	* The contents of this file are subject to the terms of the Common Development
3	* and Distribution License (the License). You may not use this file except in
4	* compliance with the License.
5	*
6	* You can obtain a copy of the License at http://www.netbeans.org/cddl.html
7	* or http://www.netbeans.org/cddl.txt.
8	*
9	* When distributing Covered Code, include this CDDL Header Notice in each file
10	* and include the License file at http://www.netbeans.org/cddl.txt.
11	* If applicable, add the following below the CDDL Header, with the fields
12	* enclosed by brackets [] replaced by your own identifying information:
13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.
18	*/
19
20	package org.netbeans.spi.project.libraries;
21
22	import java.beans.PropertyChangeListener;
23	import java.io.IOException;
24	import java.net.URL;
25	import java.util.List;
26	import java.util.Map;
27	import java.util.Set;
28
29	/**
30	* Library provider which can define libraries in particular areas.
31	* There is no explicit method to save a library; setters on {@link LibraryImplementation} should do this.
32	* @param A the type of storage area used by this provider
33	* @param L the type of library created by this provider
34	* @since org.netbeans.modules.project.libraries/1 1.15
35	*/
36	public interface ArealLibraryProvider<A extends LibraryStorageArea, L extends LibraryImplementation> {
37
38	/**
39	* Property to fire when {@link #getOpenAreas} might have changed.
40	*/
41	String PROP_OPEN_AREAS = "openAreas"; // NOI18N
42
43	/**
44	* Adds a listener to {@link #PROP_OPEN_AREAS}.
45	* @param listener a listener to add
46	*/
47	void addPropertyChangeListener(PropertyChangeListener listener);
48
49	/**
50	* Removes a listener to {@link #PROP_OPEN_AREAS}.
51	* @param listener a listener to remove
52	*/
53	void removePropertyChangeListener(PropertyChangeListener listener);
54
55	/**
56	* Gets the runtime type of the area used by this provider.
57	* @return the area type
58	*/
59	Class<A> areaType();
60
61	/**
62	* Gets the runtime type of the libraries created by this provider.
63	* @return the library type
64	*/
65	Class<L> libraryType();
66
67	/**
68	* Creates or otherwise picks a storage area interactively.
69	* This might actually create a fresh area, or just load an existing one,
70	* or even do nothing (and return null).
71	* The implementor is free to show a dialog here.
72	* @return a new or existing storage area, or null
73	*/
74	A createArea();
75
76	/**
77	* Loads a storage area (which may or may exist yet).
78	* @param location an abstract storage location which may or may not be recognized by this provider
79	* @return an area whose {@link LibraryStorageArea#getLocation} matches the provided location,
80	* or null if this type of location is not recognized by this provider
81	*/
82	A loadArea(URL location);
83
84	/**
85	* Looks for areas which should be somehow listed as open.
86	* For example, a provider which refers to library areas from project metadata
87	* could list all areas referred to from currently open projects.
88	* It is <em>not</em> necessary to include areas recently mentioned e.g. by {@link #createArea}.
89	* @return a (possibly empty) collection of areas
90	*/
91	Set<A> getOpenAreas();
92
93	/**
94	* Gets all libraries defined in a given area.
95	* No two libraries in this area may share a given name (as in {@link LibraryImplementation#getName},
96	* though it is permitted for libraries from different areas to have the same name.
97	* Changes in the set of libraries defined in this area should be fired through {@link LibraryProvider#PROP_LIBRARIES}.
98	* Since {@link IOException} is not thrown either from this method or from {@link LibraryProvider#getLibraries},
99	* it is expected that any problems loading library definitions will be logged and that those libraries will be skipped.
100	* @param area some storage area (which might not even exist yet, in which case the set of libraries will initially be empty)
101	* @return a listenable set of libraries in this area
102	* (it is permitted to return distinct objects from call to call on the same area,
103	* i.e. no caching by the implementation is necessary)
104	*/
105	LibraryProvider<L> getLibraries(A area);
106
107	/**
108	* Creates a new library.
109	* @param type the kind of library to make, as in {@link LibraryTypeProvider#getLibraryType} or {@link LibraryImplementation#getType}
110	* @param name the library name, as in {@link LibraryImplementation#getName}
111	* @param area the location to define the library
112	* @param contents initial volume contents (keys must be contained in the appropriate {@link LibraryTypeProvider#getSupportedVolumeTypes})
113	* @return a new library with matching type, name, area, and contents
114	* @throws IOException if an error occurs creating the library definition */
115	L createLibrary(String type, String name, A area, Map<String,List<URL>> contents) throws IOException;
116
117	/**
118	* Deletes an existing library.
119	* @param library a library produced by this provider
120	* @throws IOException if a problem can encountered deleting the library definition
121	*/
122	void remove(L library) throws IOException;
123
124	}

Added Link Here

(-)/dev/null (+46 lines)
1	/*
2	* The contents of this file are subject to the terms of the Common Development
3	* and Distribution License (the License). You may not use this file except in
4	* compliance with the License.
5	*
6	* You can obtain a copy of the License at http://www.netbeans.org/cddl.html
7	* or http://www.netbeans.org/cddl.txt.
8	*
9	* When distributing Covered Code, include this CDDL Header Notice in each file
10	* and include the License file at http://www.netbeans.org/cddl.txt.
11	* If applicable, add the following below the CDDL Header, with the fields
12	* enclosed by brackets [] replaced by your own identifying information:
13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.
18	*/
19
20	package org.netbeans.spi.project.libraries;
21
22	import java.net.URL;
23
24	/**
25	* Abstract location where zero or more libraries are defined.
26	* {@link Object#equals} and {@link Object#hashCode} are expected to be defined
27	* such that object identity (within the implementing class) are driven by {@link #getLocation}.
28	* @see ArealLibraryProvider
29	* @since org.netbeans.modules.project.libraries/1 1.15
30	*/
31	public interface LibraryStorageArea {
32
33	/**
34	* Gets an associated storage location.
35	* The contents of the URL (if it is even accessible) are unspecified.
36	* @return an associated URL uniquely identifying this location
37	*/
38	URL getLocation();
39
40	/**
41	* Gets a human-readable display label for this area.
42	* @return a localized display name
43	*/
44	String getDisplayName();
45
46	}

Lines 75-80 Link Here

(-)projects/libraries/src/org/netbeans/spi/project/libraries/LibraryTypeProvider.java:1.8 (-2 / +5 lines)
75		75
76	/**	76	/**
77	* Creates a new empty library implementation.	77	* Creates a new empty library implementation.
		78	* Generally will use {@link LibrariesSupport#createLibraryImplementation}.
		79	* This method is <strong>not</strong> used by {@link LibraryManager#createLibrary} except in the case of {@link LibraryManager#getDefault}.
78	* @return the created library model, never null	80	* @return the created library model, never null
79	*/	81	*/
80	public LibraryImplementation createLibrary ();	82	public LibraryImplementation createLibrary ();
Lines 85-90 Link Here
85	* If the LibraryTypeProvider implementation requires clean of	87	* If the LibraryTypeProvider implementation requires clean of
86	* additional settings (e.g. remove properties in the build.properties)	88	* additional settings (e.g. remove properties in the build.properties)
87	* it should be done in this method.	89	* it should be done in this method.
		90	* This method is <strong>not</strong> used by {@link LibraryManager#createLibrary} except in the case of {@link LibraryManager#getDefault}.
88	* @param libraryImpl	91	* @param libraryImpl
89	*/	92	*/
90	public void libraryDeleted (LibraryImplementation libraryImpl);	93	public void libraryDeleted (LibraryImplementation libraryImpl);
Lines 96-108 Link Here
96	* If the LibraryTypeProvider implementation requires initialization of	99	* If the LibraryTypeProvider implementation requires initialization of
97	* additional settings (e.g. adding properties into the build.properties)	100	* additional settings (e.g. adding properties into the build.properties)
98	* it should be done in this method.	101	* it should be done in this method.
99	*	102	* This method is <strong>not</strong> used by {@link LibraryManager#createLibrary} except in the case of {@link LibraryManager#getDefault}.
100	*/	103	*/
101	public void libraryCreated (LibraryImplementation libraryImpl);	104	public void libraryCreated (LibraryImplementation libraryImpl);
102		105
103	/**	106	/**
104	* Returns customizer for given volume's type, or null if the volume is not customizable.	107	* Returns customizer for given volume's type, or null if the volume is not customizable.
105	* The object of the LibraryImplementation type is	108	* The object of the LibraryImplementation type and optionally LibraryStorageArea type is
106	* passed to the customizer's setObject method.	109	* passed to the customizer's setObject method.
107	* The customized object describes the library created by this	110	* The customized object describes the library created by this
108	* provider, but the customizer cannot assume that the customized	111	* provider, but the customizer cannot assume that the customized

Lines 41-64 Link Here

(-)projects/libraries/test/unit/src/org/netbeans/api/project/libraries/LibraryManagerTest.java:1.8 (-195 / +87 lines)
41		41
42	package org.netbeans.api.project.libraries;	42	package org.netbeans.api.project.libraries;
43		43
44	import java.beans.PropertyChangeEvent;	44	import static org.netbeans.modules.project.libraries.TestUtil.*;
45	import java.beans.PropertyChangeListener;
46	import java.beans.PropertyChangeSupport;
47	import java.io.IOException;
48	import java.net.MalformedURLException;	45	import java.net.MalformedURLException;
49	import java.net.URL;	46	import java.net.URL;
50	import java.util.ArrayList;	47	import java.util.ArrayList;
51	import java.util.Arrays;	48	import java.util.Arrays;
52	import java.util.Collections;	49	import java.util.Collections;
53	import java.util.HashMap;
54	import java.util.HashSet;
55	import java.util.List;	50	import java.util.List;
56	import java.util.Map;
57	import java.util.Set;
58	import java.util.StringTokenizer;	51	import java.util.StringTokenizer;
59	import org.netbeans.api.project.TestUtil;
60	import org.netbeans.junit.NbTestCase;	52	import org.netbeans.junit.NbTestCase;
61	import org.netbeans.modules.project.libraries.WritableLibraryProvider;	53	import org.netbeans.modules.project.libraries.ui.LibrariesModel;
62	import org.netbeans.spi.project.libraries.LibraryFactory;	54	import org.netbeans.spi.project.libraries.LibraryFactory;
63	import org.netbeans.spi.project.libraries.LibraryImplementation;	55	import org.netbeans.spi.project.libraries.LibraryImplementation;
64	import org.netbeans.spi.project.libraries.LibraryTypeProvider;	56	import org.netbeans.spi.project.libraries.LibraryTypeProvider;
Lines 68-104 Link Here
68	import org.openide.loaders.DataFolder;	60	import org.openide.loaders.DataFolder;
69	import org.openide.loaders.InstanceDataObject;	61	import org.openide.loaders.InstanceDataObject;
70	import org.openide.util.lookup.Lookups;	62	import org.openide.util.lookup.Lookups;
71	import org.openide.util.lookup.Lookups;	63	import org.openide.util.test.MockLookup;
72	/**	64	import org.openide.util.test.MockPropertyChangeListener;
73	*	65
74	* @author Tomas Zezula
75	*/
76	public class LibraryManagerTest extends NbTestCase {	66	public class LibraryManagerTest extends NbTestCase {
77		67
78	private TestLibraryProvider lp;	68	private WLP lp;
79		69
80	private static final String LIBRARY_TYPE = "j2se"; //NOI18N	70	private static final String LIBRARY_TYPE = "j2se"; //NOI18N
81	private static final String[] VOLUME_TYPES = new String[] {	71	private static final String[] VOLUME_TYPES = new String[] {
82	"bin",	72	"bin",
83	"src",	73	"src",
84	"doc"	74	"doc"
85	};	75	};
86		76
87	/** Creates a new instance of LibraryManagerTest */
88	public LibraryManagerTest (String testName) {	77	public LibraryManagerTest (String testName) {
89	super (testName);	78	super (testName);
90	}	79	}
91		80
92	protected void setUp() throws Exception {	81	protected void setUp() throws Exception {
93	super.setUp();	82	super.setUp();
94	lp = new TestLibraryProvider ();	83	lp = new WLP();
95	TestUtil.setLookup (Lookups.fixed(new Object[] {	84	MockLookup.setLookup(Lookups.singleton(lp));
96	lp
97	}));
98	registerLibraryTypeProvider();	85	registerLibraryTypeProvider();
99	}	86	}
100		87
101
102	private static void registerLibraryTypeProvider () throws Exception {	88	private static void registerLibraryTypeProvider () throws Exception {
103	StringTokenizer tk = new StringTokenizer("org-netbeans-api-project-libraries/LibraryTypeProviders","/");	89	StringTokenizer tk = new StringTokenizer("org-netbeans-api-project-libraries/LibraryTypeProviders","/");
104	FileObject root = Repository.getDefault().getDefaultFileSystem().getRoot();	90	FileObject root = Repository.getDefault().getDefaultFileSystem().getRoot();
Lines 114-143 Link Here
114	InstanceDataObject.create (DataFolder.findFolder(root),"TestLibraryTypeProvider",TestLibraryTypeProvider.class);	100	InstanceDataObject.create (DataFolder.findFolder(root),"TestLibraryTypeProvider",TestLibraryTypeProvider.class);
115	}	101	}
116	}	102	}
117		103
118	public void testGetLibraries () throws Exception {	104	public void testGetLibraries () throws Exception {
119	LibraryManager lm = LibraryManager.getDefault();	105	LibraryManager lm = LibraryManager.getDefault();
120	TestListener tl = new TestListener ();	106	MockPropertyChangeListener pcl = new MockPropertyChangeListener();
121	lm.addPropertyChangeListener(tl);	107	lm.addPropertyChangeListener(pcl);
122	Library[] libs = lm.getLibraries();	108	Library[] libs = lm.getLibraries();
123	assertEquals ("Libraries count", 0, libs.length);	109	assertEquals ("Libraries count", 0, libs.length);
124	LibraryImplementation[] impls = createTestLibs ();	110	LibraryImplementation[] impls = createTestLibs ();
125	lp.setLibraries(impls);	111	lp.set(impls);
126	libs = lm.getLibraries();	112	libs = lm.getLibraries();
127	assertEventsEquals(tl.getEventNames(), new String[] {LibraryManager.PROP_LIBRARIES});	113	pcl.assertEvents(LibraryManager.PROP_LIBRARIES);
128	tl.reset();
129	assertEquals ("Libraries count", 2, libs.length);	114	assertEquals ("Libraries count", 2, libs.length);
130	assertLibsEquals (libs, impls);	115	assertLibsEquals (libs, impls);
131	lp.setLibraries(new LibraryImplementation[0]);	116	lp.set();
132	assertEventsEquals(tl.getEventNames(), new String[] {LibraryManager.PROP_LIBRARIES});	117	pcl.assertEvents(LibraryManager.PROP_LIBRARIES);
133	tl.reset();
134	libs = lm.getLibraries();	118	libs = lm.getLibraries();
135	assertEquals ("Libraries count", 0, libs.length);	119	assertEquals ("Libraries count", 0, libs.length);
136	}	120	}
137		121
138	public void testGetLibrary () throws Exception {	122	public void testGetLibrary () throws Exception {
139	LibraryImplementation[] impls = createTestLibs ();	123	LibraryImplementation[] impls = createTestLibs ();
140	lp.setLibraries(impls);	124	lp.set(impls);
141	LibraryManager lm = LibraryManager.getDefault();	125	LibraryManager lm = LibraryManager.getDefault();
142	Library[] libs = lm.getLibraries();	126	Library[] libs = lm.getLibraries();
143	assertEquals ("Libraries count", 2, libs.length);	127	assertEquals ("Libraries count", 2, libs.length);
Lines 151-160 Link Here
151	lib = lm.getLibrary("Library3");	135	lib = lm.getLibrary("Library3");
152	assertNull ("Nonexisting library", lib);	136	assertNull ("Nonexisting library", lib);
153	}	137	}
154		138
		139	@SuppressWarnings("deprecation")
155	public void testAddRemoveLibrary () throws Exception {	140	public void testAddRemoveLibrary () throws Exception {
156	final LibraryImplementation[] impls = createTestLibs();	141	final LibraryImplementation[] impls = createTestLibs();
157	lp.setLibraries(impls);	142	lp.set(impls);
158	final LibraryManager lm = LibraryManager.getDefault();	143	final LibraryManager lm = LibraryManager.getDefault();
159	Library[] libs = lm.getLibraries();	144	Library[] libs = lm.getLibraries();
160	assertEquals ("Libraries count", 2, libs.length);	145	assertEquals ("Libraries count", 2, libs.length);
Lines 175-185 Link Here
175	assertEquals("Libraries count",2,libs.length);	160	assertEquals("Libraries count",2,libs.length);
176	assertLibsEquals (libs, impls);	161	assertLibsEquals (libs, impls);
177	}	162	}
178		163
		164	public void testCreateRemoveLibrary() throws Exception {
		165	LibraryManager mgr = LibraryManager.getDefault();
		166	URL fooJar = mkJar("foo.jar");
		167	Library lib = mgr.createLibrary(LIBRARY_TYPE, "NewLib", Collections.singletonMap("bin", Arrays.asList(fooJar)));
		168	assertEquals(mgr, lib.getManager());
		169	assertEquals(Collections.singletonList(lib), Arrays.asList(mgr.getLibraries()));
		170	assertEquals(1, lp.libs.size());
		171	assertLibsEquals(new Library[] {lib}, lp.libs.toArray(new LibraryImplementation[1]));
		172	mgr.removeLibrary(lib);
		173	assertEquals(Collections.emptyList(), Arrays.asList(mgr.getLibraries()));
		174	assertEquals(0, lp.libs.size());
		175	}
		176
		177	public void testArealLibraryManagers() throws Exception {
		178	ALP alp = new ALP();
		179	MockLookup.setLookup(Lookups.fixed(lp, alp));
		180	new LibrariesModel().createArea();
		181	Area home = new Area("home");
		182	Area away = new Area("away");
		183	alp.setOpen(home, away);
		184	List<String> locations = new ArrayList<String>(); // use list, not set, to confirm size also
		185	for (LibraryManager mgr : LibraryManager.getOpenManagers()) {
		186	URL loc = mgr.getLocation();
		187	locations.add(loc != null ? loc.toString() : "<none>");
		188	}
		189	Collections.sort(locations);
		190	assertEquals("[<none>, http://nowhere.net/away, http://nowhere.net/home, http://nowhere.net/new]", locations.toString());
		191	alp.setOpen();
		192	try {
		193	LibraryManager.forLocation(new URL("http://even-less-anywhere.net/"));
		194	fail();
		195	} catch (IllegalArgumentException x) {}
		196	LibraryManager mgr = LibraryManager.forLocation(home.getLocation());
		197	assertEquals(home.getLocation(), mgr.getLocation());
		198	assertEquals("home", mgr.getDisplayName());
		199	assertEquals(0, mgr.getLibraries().length);
		200	MockPropertyChangeListener pcl = new MockPropertyChangeListener();
		201	mgr.addPropertyChangeListener(pcl);
		202	URL fooJar = mkJar("foo.jar");
		203	Library lib = mgr.createLibrary(LIBRARY_TYPE, "NewLib", Collections.singletonMap("bin", Arrays.asList(fooJar)));
		204	assertEquals(mgr, lib.getManager());
		205	pcl.assertEvents(LibraryManager.PROP_LIBRARIES);
		206	assertEquals(Collections.singletonList(lib), Arrays.asList(mgr.getLibraries()));
		207	assertEquals(1, alp.libs.get(home).size());
		208	LibraryImplementation impl = alp.libs.get(home).iterator().next();
		209	assertEquals("NewLib", impl.getName());
		210	assertEquals(LIBRARY_TYPE, impl.getType());
		211	assertEquals(Arrays.asList(fooJar), impl.getContent("bin"));
		212	mgr.removeLibrary(lib);
		213	pcl.assertEvents(LibraryManager.PROP_LIBRARIES);
		214	assertEquals(Collections.emptyList(), Arrays.asList(mgr.getLibraries()));
		215	assertEquals(0, alp.libs.get(home).size());
		216	}
		217
179	static LibraryImplementation[] createTestLibs () throws MalformedURLException {	218	static LibraryImplementation[] createTestLibs () throws MalformedURLException {
180	LibraryImplementation[] impls = new LibraryImplementation[] {	219	LibraryImplementation[] impls = {
181	new TestLibraryImplementation (),	220	LibrariesSupport.createLibraryImplementation(LIBRARY_TYPE, VOLUME_TYPES),
182	new TestLibraryImplementation ()	221	LibrariesSupport.createLibraryImplementation(LIBRARY_TYPE, VOLUME_TYPES),
183	};	222	};
184	impls[0].setName ("Library1");	223	impls[0].setName ("Library1");
185	impls[1].setName ("Library2");	224	impls[1].setName ("Library2");
Lines 189-195 Link Here
189	impls[1].setContent("bin", Collections.singletonList(new URL("file:/lib/libest2.so")));	228	impls[1].setContent("bin", Collections.singletonList(new URL("file:/lib/libest2.so")));
190	return impls;	229	return impls;
191	}	230	}
192		231
193	static void assertLibsEquals (Library[] libs, LibraryImplementation[] impls) {	232	static void assertLibsEquals (Library[] libs, LibraryImplementation[] impls) {
194	assertEquals ("libs equals (size)", impls.length, libs.length);	233	assertEquals ("libs equals (size)", impls.length, libs.length);
195	for (int i=0; i< libs.length; i++) {	234	for (int i=0; i< libs.length; i++) {
Lines 206-282 Link Here
206	assertEquals ("libs equals (content doc)", ic, lc);	245	assertEquals ("libs equals (content doc)", ic, lc);
207	}	246	}
208	}	247	}
209		248
210	static void assertEventsEquals (List eventNames, String[] expectedName) {
211	assertEquals ("Events equals", Arrays.asList(expectedName), eventNames);
212	}
213
214
215	static class TestLibraryProvider implements WritableLibraryProvider {
216
217	private PropertyChangeSupport support;
218	private List<LibraryImplementation> libraries;
219
220	public TestLibraryProvider () {
221	this.support = new PropertyChangeSupport (this);
222	this.libraries = new ArrayList<LibraryImplementation>();
223	}
224
225	public void removePropertyChangeListener(PropertyChangeListener listener) {
226	this.support.removePropertyChangeListener(listener);
227	}
228
229	public void addPropertyChangeListener(PropertyChangeListener listener) {
230	this.support.addPropertyChangeListener(listener);
231	}
232
233	public LibraryImplementation[] getLibraries() {
234	return this.libraries.toArray(new LibraryImplementation[libraries.size()]);
235	}
236
237	public void setLibraries (LibraryImplementation[] libraries) {
238	this.libraries = new ArrayList<LibraryImplementation>(Arrays.asList(libraries));
239	this.support.firePropertyChange(PROP_LIBRARIES,null,null);
240	}
241
242	public void addLibrary(LibraryImplementation library) throws IOException {
243	this.libraries.add (library);
244	this.support.firePropertyChange(PROP_LIBRARIES,null,null);
245	}
246
247	public void removeLibrary(LibraryImplementation library) throws IOException {
248	this.libraries.remove (library);
249	this.support.firePropertyChange(PROP_LIBRARIES,null,null);
250	}
251
252	public void updateLibrary(LibraryImplementation oldLibrary, LibraryImplementation newLibrary) throws IOException {
253	this.libraries.remove(oldLibrary);
254	this.libraries.add (newLibrary);
255	this.support.firePropertyChange(PROP_LIBRARIES,null,null);
256	}
257
258	}
259
260	static class TestListener implements PropertyChangeListener {
261
262	private List<String> events = new ArrayList<String>();
263
264	public void propertyChange(PropertyChangeEvent event) {
265	this.events.add(event.getPropertyName());
266	}
267
268	public void reset () {
269	this.events.clear();
270	}
271
272	public List getEventNames () {
273	return this.events;
274	}
275	}
276
277
278	public static class TestLibraryTypeProvider implements LibraryTypeProvider {	249	public static class TestLibraryTypeProvider implements LibraryTypeProvider {
279		250
280		251
281	public String getDisplayName() {	252	public String getDisplayName() {
282	return LIBRARY_TYPE;	253	return LIBRARY_TYPE;
Lines 308-391 Link Here
308	return null;	279	return null;
309	}	280	}
310	}	281	}
311
312	static class TestLibraryImplementation implements LibraryImplementation {
313
314	private static final Set<String> supportedTypes;
315
316	private String name;
317	private String description;
318	private Map<String,List<URL>> contents;
319	private PropertyChangeSupport support;
320
321	static {
322	supportedTypes = Collections.unmodifiableSet(new HashSet<String>(Arrays.asList(VOLUME_TYPES)));
323	}
324
325	public TestLibraryImplementation () {
326	this.contents = new HashMap<String,List<URL>>();
327	this.support = new PropertyChangeSupport (this);
328	}
329
330	public String getType() {
331	return LIBRARY_TYPE;
332	}
333
334	public String getName() {
335	return this.name;
336	}
337
338	public void setName(String name) {
339	this.name = name;
340	this.support.firePropertyChange(PROP_NAME, null, null);
341	}
342
343	public String getLocalizingBundle() {
344	return null;
345	}
346
347	public void setLocalizingBundle(String resourceName) {
348	}
349
350	public String getDescription() {
351	return this.description;
352	}
353
354	public void setDescription(String text) {
355	this.description = text;
356	this.support.firePropertyChange(PROP_DESCRIPTION, null, null);
357	}
358
359	public List<URL> getContent(String volumeType) throws IllegalArgumentException {
360	if (supportedTypes.contains(volumeType)) {
361	List<URL> l = contents.get(volumeType);
362	if (l == null) {
363	l = Collections.emptyList();
364	}
365	return Collections.unmodifiableList(l);
366	}
367	else {
368	throw new IllegalArgumentException ();
369	}
370	}
371
372	public void setContent(String volumeType, List<URL> path) throws IllegalArgumentException {
373	if (supportedTypes.contains(volumeType)) {
374	this.contents.put (volumeType, path);
375	this.support.firePropertyChange(PROP_CONTENT, null, null);
376	}
377	else {
378	throw new IllegalArgumentException ();
379	}
380	}
381
382	public void removePropertyChangeListener(PropertyChangeListener l) {
383	this.support.removePropertyChangeListener(l);
384	}
385		282
386	public void addPropertyChangeListener(PropertyChangeListener l) {
387	this.support.addPropertyChangeListener(l);
388	}
389	}
390
391	}	283	}

Added Link Here

(-)/dev/null (+245 lines)
1	/*
2	* The contents of this file are subject to the terms of the Common Development
3	* and Distribution License (the License). You may not use this file except in
4	* compliance with the License.
5	*
6	* You can obtain a copy of the License at http://www.netbeans.org/cddl.html
7	* or http://www.netbeans.org/cddl.txt.
8	*
9	* When distributing Covered Code, include this CDDL Header Notice in each file
10	* and include the License file at http://www.netbeans.org/cddl.txt.
11	* If applicable, add the following below the CDDL Header, with the fields
12	* enclosed by brackets [] replaced by your own identifying information:
13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.
18	*/
19
20	package org.netbeans.modules.project.libraries;
21
22	import java.beans.PropertyChangeListener;
23	import java.beans.PropertyChangeSupport;
24	import java.io.IOException;
25	import java.net.MalformedURLException;
26	import java.net.URL;
27	import java.util.ArrayList;
28	import java.util.Arrays;
29	import java.util.HashMap;
30	import java.util.HashSet;
31	import java.util.List;
32	import java.util.Map;
33	import java.util.Set;
34	import java.util.regex.Matcher;
35	import java.util.regex.Pattern;
36	import org.netbeans.spi.project.libraries.ArealLibraryProvider;
37	import org.netbeans.spi.project.libraries.LibraryImplementation;
38	import org.netbeans.spi.project.libraries.LibraryProvider;
39	import org.netbeans.spi.project.libraries.LibraryStorageArea;
40	import org.netbeans.spi.project.libraries.support.LibrariesSupport;
41	import org.openide.util.WeakSet;
42
43	/**
44	* Common support classes for unit tests in this module.
45	*/
46	public class TestUtil {
47
48	private TestUtil() {}
49
50	public static class NWLP implements LibraryProvider<LibraryImplementation> {
51
52	public final List<LibraryImplementation> libs = new ArrayList<LibraryImplementation>();
53	final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
54
55	public void set(LibraryImplementation... nue) {
56	libs.clear();
57	libs.addAll(Arrays.asList(nue));
58	pcs.firePropertyChange(PROP_LIBRARIES, null, null);
59	}
60
61	public LibraryImplementation[] getLibraries() {
62	return libs.toArray(new LibraryImplementation[0]);
63	}
64
65	public void addPropertyChangeListener(PropertyChangeListener listener) {
66	pcs.addPropertyChangeListener(listener);
67	}
68
69	public void removePropertyChangeListener(PropertyChangeListener listener) {
70	pcs.removePropertyChangeListener(listener);
71	}
72
73	}
74
75	public static final class WLP extends NWLP implements WritableLibraryProvider<LibraryImplementation> {
76
77	public void addLibrary(LibraryImplementation library) throws IOException {
78	libs.add(library);
79	pcs.firePropertyChange(PROP_LIBRARIES, null, null);
80	}
81
82	public void removeLibrary(LibraryImplementation library) throws IOException {
83	libs.remove(library);
84	pcs.firePropertyChange(PROP_LIBRARIES, null, null);
85	}
86
87	public void updateLibrary(LibraryImplementation oldLibrary, LibraryImplementation newLibrary) throws IOException {
88	libs.remove(oldLibrary);
89	libs.add(newLibrary);
90	pcs.firePropertyChange(PROP_LIBRARIES, null, null);
91	}
92
93	}
94
95	public static final class Area implements LibraryStorageArea {
96
97	final String id;
98
99	public Area(String id) {
100	this.id = id;
101	}
102
103	public URL getLocation() {
104	try {
105	return new URL("http://nowhere.net/" + id);
106	} catch (MalformedURLException x) {
107	throw new AssertionError(x);
108	}
109	}
110
111	public String getDisplayName() {
112	return id;
113	}
114
115	public boolean equals(Object obj) {
116	return obj instanceof Area && ((Area) obj).id.equals(id);
117	}
118
119	public int hashCode() {
120	return id.hashCode();
121	}
122
123	public @Override String toString() {
124	return "Area[" + id + "]";
125	}
126
127	}
128
129	public static final class ALP implements ArealLibraryProvider<Area,LibraryImplementation> {
130
131	final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
132	public final Map<Area,List<LibraryImplementation>> libs = new HashMap<Area,List<LibraryImplementation>>();
133	final Set<LP> lps = new WeakSet<LP>();
134	final Set<Area> open = new HashSet<Area>();
135
136	public void addPropertyChangeListener(PropertyChangeListener listener) {
137	pcs.addPropertyChangeListener(listener);
138	}
139
140	public void removePropertyChangeListener(PropertyChangeListener listener) {
141	pcs.removePropertyChangeListener(listener);
142	}
143
144	public Class<Area> areaType() {
145	return Area.class;
146	}
147
148	public Class<LibraryImplementation> libraryType() {
149	return LibraryImplementation.class;
150	}
151
152	public Area createArea() {
153	return new Area("new");
154	}
155
156	public Area loadArea(URL location) {
157	Matcher m = Pattern.compile("http://nowhere\\.net/(.+)$").matcher(location.toExternalForm());
158	if (m.matches()) {
159	return new Area(m.group(1));
160	} else {
161	return null;
162	}
163	}
164
165	public Set<Area> getOpenAreas() {
166	return open;
167	}
168
169	public void setOpen(Area... areas) {
170	open.clear();
171	open.addAll(Arrays.asList(areas));
172	pcs.firePropertyChange(PROP_OPEN_AREAS, null, null);
173	}
174
175	private class LP implements LibraryProvider<LibraryImplementation> {
176
177	final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
178	final Area area;
179
180	LP(Area area) {
181	this.area = area;
182	lps.add(this);
183	}
184
185	public LibraryImplementation[] getLibraries() {
186	if (libs.containsKey(area)) {
187	return libs.get(area).toArray(new LibraryImplementation[0]);
188	} else {
189	return new LibraryImplementation[0];
190	}
191	}
192
193	public void addPropertyChangeListener(PropertyChangeListener listener) {
194	pcs.addPropertyChangeListener(listener);
195	}
196
197	public void removePropertyChangeListener(PropertyChangeListener listener) {
198	pcs.removePropertyChangeListener(listener);
199	}
200
201	}
202
203	public LibraryProvider<LibraryImplementation> getLibraries(Area area) {
204	return new LP(area);
205	}
206
207	public LibraryImplementation createLibrary(String type, String name, Area area, Map<String,List<URL>> contents) throws IOException {
208	LibraryImplementation lib = LibrariesSupport.createLibraryImplementation(type, contents.keySet().toArray(new String[0]));
209	lib.setName(name);
210	for (Map.Entry<String,List<URL>> entry : contents.entrySet()) {
211	lib.setContent(entry.getKey(), entry.getValue());
212	}
213	List<LibraryImplementation> l = libs.get(area);
214	if (l == null) {
215	l = new ArrayList<LibraryImplementation>();
216	libs.put(area, l);
217	}
218	l.add(lib);
219	for (LP lp : lps) {
220	if (lp.area.equals(area)) {
221	lp.pcs.firePropertyChange(LibraryProvider.PROP_LIBRARIES, null, null);
222	}
223	}
224	return lib;
225	}
226
227	public void remove(LibraryImplementation library) throws IOException {
228	for (Map.Entry<Area,List<LibraryImplementation>> entry : libs.entrySet()) {
229	if (entry.getValue().remove(library)) {
230	for (LP lp : lps) {
231	if (lp.area.equals(entry.getKey())) {
232	lp.pcs.firePropertyChange(LibraryProvider.PROP_LIBRARIES, null, null);
233	}
234	}
235	}
236	}
237	}
238
239	}
240
241	public static URL mkJar(String name) throws MalformedURLException {
242	return new URL("jar:http://nowhere.net/" + name + "!/");
243	}
244
245	}

Added Link Here

(-)/dev/null (+186 lines)
1	/*
2	* The contents of this file are subject to the terms of the Common Development
3	* and Distribution License (the License). You may not use this file except in
4	* compliance with the License.
5	*
6	* You can obtain a copy of the License at http://www.netbeans.org/cddl.html
7	* or http://www.netbeans.org/cddl.txt.
8	*
9	* When distributing Covered Code, include this CDDL Header Notice in each file
10	* and include the License file at http://www.netbeans.org/cddl.txt.
11	* If applicable, add the following below the CDDL Header, with the fields
12	* enclosed by brackets [] replaced by your own identifying information:
13	* "Portions Copyrighted [year] [name of copyright owner]"
14	*
15	* The Original Software is NetBeans. The Initial Developer of the Original
16	* Software is Sun Microsystems, Inc. Portions Copyright 1997-2007 Sun
17	* Microsystems, Inc. All Rights Reserved.
18	*/
19
20	package org.netbeans.modules.project.libraries.ui;
21
22	import static org.netbeans.modules.project.libraries.TestUtil.*;
23	import java.net.URL;
24	import java.util.Arrays;
25	import java.util.Collection;
26	import java.util.Collections;
27	import java.util.List;
28	import java.util.SortedSet;
29	import java.util.TreeSet;
30	import org.netbeans.junit.NbTestCase;
31	import org.netbeans.spi.project.libraries.LibraryImplementation;
32	import org.netbeans.spi.project.libraries.LibraryStorageArea;
33	import org.netbeans.spi.project.libraries.support.LibrariesSupport;
34	import org.openide.util.test.MockChangeListener;
35	import org.openide.util.test.MockLookup;
36
37	public class LibrariesModelTest extends NbTestCase {
38
39	// XXX test:
40	// editing global libs
41	// library editability flag is correct
42	// IOException thrown by providers handled reasonably
43
44	public LibrariesModelTest(String n) {
45	super(n);
46	}
47
48	private LibrariesModel model;
49	private LibraryImplementation lib1, lib2, lib3;
50	private URL jar1, jar2, jar3;
51	private MockChangeListener cl;
52	private WLP wlp;
53	private NWLP nwlp;
54	private ALP alp;
55
56	@Override
57	protected void setUp() throws Exception {
58	super.setUp();
59	wlp = new WLP();
60	nwlp = new NWLP();
61	alp = new ALP();
62	MockLookup.setInstances(wlp, nwlp, alp);
63	LibrariesModel.createdAreas.clear();
64	model = new LibrariesModel();
65	cl = new MockChangeListener();
66	model.addChangeListener(cl);
67	lib1 = mkLib("lib1");
68	lib2 = mkLib("lib2");
69	lib3 = mkLib("lib3");
70	jar1 = mkJar("lib1.jar");
71	jar2 = mkJar("lib2.jar");
72	jar3 = mkJar("lib3.jar");
73	cl.assertNoEvents();
74	assertEquals(0, model.getLibraries().size());
75	}
76
77	public void testNWLP() throws Exception {
78	nwlp.set(lib1, lib2);
79	cl.assertEvent();
80	assertEquals(2, model.getLibraries().size());
81	}
82
83	public void testWLP() throws Exception {
84	model.addLibrary(lib1);
85	cl.assertEvent();
86	assertEquals(1, model.getLibraries().size());
87	model.addLibrary(lib2);
88	cl.assertEvent();
89	assertEquals(2, model.getLibraries().size());
90	model.removeLibrary(lib1);
91	cl.assertEvent();
92	assertEquals(1, model.getLibraries().size());
93	model.apply();
94	assertEquals(1, wlp.libs.size());
95	LibraryImplementation lib = wlp.libs.iterator().next();
96	assertEquals("lib2", lib.getName());
97	}
98
99	public void testAreas() throws Exception {
100	assertEquals("[]", areas2S());
101	alp.setOpen(new Area("o1"), new Area("o2"));
102	cl.assertEvent();
103	assertEquals("[o1, o2]", areas2S());
104	assertEquals("new", model.createArea().getDisplayName());
105	cl.assertEvent();
106	assertEquals("[new, o1, o2]", areas2S());
107	}
108	private String areas2S() {
109	SortedSet<String> names = new TreeSet<String>();
110	for (LibraryStorageArea area : model.getAreas()) {
111	names.add(area.getDisplayName());
112	}
113	return names.toString();
114	}
115
116	public void testArealLibs() throws Exception {
117	Area a = new Area("home");
118	alp.setOpen(a);
119	LibraryImplementation lib1 = model.createArealLibrary("jar", "mylib1", a);
120	assertEquals(a, model.getArea(lib1));
121	model.addLibrary(lib1);
122	LibraryImplementation lib2 = model.createArealLibrary("jar", "mylib2", a);
123	model.addLibrary(lib2);
124	model.removeLibrary(lib2);
125	lib1.setContent("cp", Arrays.asList(jar1, jar2));
126	model.apply();
127	assertEquals(1, alp.libs.size());
128	assertEquals(a, alp.libs.keySet().iterator().next());
129	List<LibraryImplementation> libs = alp.libs.get(a);
130	assertEquals(1, libs.size());
131	LibraryImplementation lib = libs.iterator().next();
132	assertEquals("mylib1", lib.getName());
133	assertEquals(Arrays.asList(jar1, jar2), lib.getContent("cp"));
134	assertEquals(a, model.getArea(lib));
135	model = new LibrariesModel();
136	assertEquals(1, model.getLibraries().size());
137	lib = model.getLibraries().iterator().next();
138	assertEquals(a, model.getArea(lib));
139	lib.setContent("cp", Collections.singletonList(jar3));
140	model.apply();
141	assertEquals(1, alp.libs.size());
142	assertEquals(a, alp.libs.keySet().iterator().next());
143	libs = alp.libs.get(a);
144	assertEquals(1, libs.size());
145	lib = libs.iterator().next();
146	assertEquals("mylib1", lib.getName());
147	assertEquals(Collections.singletonList(jar3), lib.getContent("cp"));
148	assertEquals(a, model.getArea(lib));
149	model = new LibrariesModel();
150	assertEquals(1, model.getLibraries().size());
151	lib = model.getLibraries().iterator().next();
152	model.removeLibrary(lib);
153	model.apply();
154	assertEquals(1, alp.libs.size());
155	assertEquals(a, alp.libs.keySet().iterator().next());
156	libs = alp.libs.get(a);
157	assertEquals(0, libs.size());
158	Area a2 = new Area("away");
159	assertEquals(0, model.getLibraries().size());
160	model.addLibrary(model.createArealLibrary("jar", "generic", a));
161	model.addLibrary(model.createArealLibrary("jar", "generic", a2));
162	assertEquals(2, model.getLibraries().size());
163	}
164
165	public void testLoadLibsAfterCreateArea() throws Exception {
166	LibraryStorageArea a = model.createArea();
167	model.addLibrary(model.createArealLibrary("jar", "foo", a));
168	model.apply();
169	LibrariesModel.createdAreas.clear();
170	model = new LibrariesModel();
171	cl = new MockChangeListener();
172	model.addChangeListener(cl);
173	assertEquals(a, model.createArea());
174	cl.assertEvent();
175	Collection<? extends LibraryImplementation> libs = model.getLibraries();
176	assertEquals(1, libs.size());
177	assertEquals("foo", libs.iterator().next().getName());
178	}
179
180	private LibraryImplementation mkLib(String name) {
181	LibraryImplementation lib = LibrariesSupport.createLibraryImplementation("jar", new String[] {"cp"});
182	lib.setName(name);
183	return lib;
184	}
185
186	}

Added Link Here

(-)/dev/null (+114 lines)
1	/*
2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
3	*
4	* Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
5	*
6	* The contents of this file are subject to the terms of either the GNU
7	* General Public License Version 2 only ("GPL") or the Common
8	* Development and Distribution License("CDDL") (collectively, the
9	* "License"). You may not use this file except in compliance with the
10	* License. You can obtain a copy of the License at
11	* http://www.netbeans.org/cddl-gplv2.html
12	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
13	* specific language governing permissions and limitations under the
14	* License. When distributing the software, include this License Header
15	* Notice in each file and include the License file at
16	* nbbuild/licenses/CDDL-GPL-2-CP. Sun designates this
17	* particular file as subject to the "Classpath" exception as provided
18	* by Sun in the GPL Version 2 section of the License file that
19	* accompanied this code. If applicable, add the following below the
20	* License Header, with the fields enclosed by brackets [] replaced by
21	* your own identifying information:
22	* "Portions Copyrighted [year] [name of copyright owner]"
23	*
24	* If you wish your version of this file to be governed by only the CDDL
25	* or only the GPL Version 2, indicate your decision by adding
26	* "[Contributor] elects to include this software in this distribution
27	* under the [CDDL or GPL Version 2] license." If you do not indicate a
28	* single choice of license, a recipient has the option to distribute
29	* your version of this file under either the CDDL, the GPL Version 2 or
30	* to extend the choice of license to its licensees as provided above.
31	* However, if you add GPL Version 2 code and therefore, elected the GPL
32	* Version 2 license, then the option applies only if the new code is
33	* made subject to such option by the copyright holder.
34	*
35	* Contributor(s):
36	*
37	* Portions Copyrighted 2007 Sun Microsystems, Inc.
38	*/
39
40	package org.netbeans.spi.project.libraries.support;
41
42	import java.io.File;
43	import java.net.MalformedURLException;
44	import java.net.URL;
45	import org.netbeans.junit.NbTestCase;
46	import org.openide.filesystems.FileObject;
47	import org.openide.filesystems.FileUtil;
48
49	/**
50	*/
51	public class LibrariesSupportTest extends NbTestCase {
52
53	public LibrariesSupportTest(String testName) {
54	super(testName);
55	}
56
57	@Override
58	protected void setUp() throws Exception {
59	super.setUp();
60	}
61
62	/**
63	* Test of convertFileToURL method, of class LibrariesSupport.
64	*/
65	public void testConvertFileToURL() {
66	File f = new File("/aa/bb/c c.ext".replace('/', File.separatorChar));
67	URL u = LibrariesSupport.convertFileToURL(f);
68	assertEquals("file:/aa/bb/c%20c.ext", u.toExternalForm());
69	f = new File("../zz/re l.ext".replace('/', File.separatorChar));
70	u = LibrariesSupport.convertFileToURL(f);
71	assertEquals("file:../zz/re%20l.ext", u.toExternalForm());
72	}
73
74	/**
75	* Test of convertURLToFile method, of class LibrariesSupport.
76	*/
77	public void testConvertURLToFile() throws MalformedURLException{
78	URL u = new URL("file:/aa/bb/c%20c.ext");
79	File f = LibrariesSupport.convertURLToFile(u);
80	assertEquals("/aa/bb/c c.ext".replace('/', File.separatorChar), f.getPath());
81	u = new URL("file:../zz/re%20l.ext");
82	f = LibrariesSupport.convertURLToFile(u);
83	assertEquals("../zz/re l.ext".replace('/', File.separatorChar), f.getPath());
84	}
85
86	/**
87	* Test of isAbsoluteURL method, of class LibrariesSupport.
88	*/
89	public void testIsAbsoluteURL() throws MalformedURLException{
90	URL u = new URL("file", null, "/test/absolute");
91	assertTrue(u.toExternalForm(), LibrariesSupport.isAbsoluteURL(u));
92	u = new URL("file", null, "../relative");
93	assertFalse(u.toExternalForm(), LibrariesSupport.isAbsoluteURL(u));
94	}
95
96	/**
97	* Test of resolveLibraryEntryFileObject method, of class LibrariesSupport.
98	*/
99	public void testResolveLibraryEntry() throws Exception {
100	File f = new File(this.getWorkDir(), "knihovna.properties");
101	File f2 = new File(this.getWorkDir(), "bertie.jar");
102	f.createNewFile();
103	f2.createNewFile();
104	FileObject fo = LibrariesSupport.resolveLibraryEntryFileObject(
105	f.toURI().toURL(),
106	new URL("file", null, "bertie.jar"));
107	assertEquals(f2.getPath(), FileUtil.toFile(fo).getPath());
108	fo = LibrariesSupport.resolveLibraryEntryFileObject(
109	null,
110	f2.toURI().toURL());
111	assertEquals(f2.getPath(), FileUtil.toFile(fo).getPath());
112	}
113
114	}