Attachment #108794 for bug #199253

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

Lines 124-130 Link Here

(-)a/java.j2seplatform/nbproject/project.xml (-1 / +1 lines)
124	<compile-dependency/>	124	<compile-dependency/>
125	<run-dependency>	125	<run-dependency>
126	<release-version>1</release-version>	126	<release-version>1</release-version>
127	<specification-version>1.15</specification-version>	127	<specification-version>1.31</specification-version>
128	</run-dependency>	128	</run-dependency>
129	</dependency>	129	</dependency>
130	<dependency>	130	<dependency>




import java.net.URI;
import java.util.HashSet;
import java.util.logging.Logger;
import org.netbeans.spi.project.libraries.NamedLibraryImplementation;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.NbBundle;

        VOLUME_TYPE_JAVADOC,
    }));

    @Override
    public String getLibraryType() {
        return LIBRARY_TYPE;
    }
    
    @Override
    public String getDisplayName () {
        return NbBundle.getMessage (J2SELibraryTypeProvider.class,"TXT_J2SELibraryType");
    }

    @Override
    public String[] getSupportedVolumeTypes () {
        return VOLUME_TYPES;
    }

    @Override
    public LibraryImplementation createLibrary() {
        return new J2SELibraryImpl ();
    }


    @Override
    public void libraryCreated(final LibraryImplementation libraryImpl) {
        assert libraryImpl != null;
        ProjectManager.mutex().postWriteRequest(
                new Runnable () {
                    @Override
                    public void run () {
                        try {
                            EditableProperties props = PropertyUtils.getGlobalProperties();

        );
    }

    @Override
    public void libraryDeleted(final LibraryImplementation libraryImpl) {
        assert libraryImpl != null;
        ProjectManager.mutex().postWriteRequest(new Runnable () {
                @Override
                public void run() {
                    try {
                        EditableProperties props = PropertyUtils.getGlobalProperties();

            });
    }

    @Override
    public Customizer getCustomizer(String volumeType) {
        if (VOLUME_TYPES[0].equals(volumeType)||
            VOLUME_TYPES[1].equals(volumeType)||

    }
    

    @Override
    public Lookup getLookup() {
        return Lookup.EMPTY;
    }

    }
    
    //Like DefaultLibraryTypeProvider but in addition checks '/' on the end of folder URLs.
    private static class J2SELibraryImpl implements NamedLibraryImplementation {
        private String description;

        private Map<String,List<URL>> contents;

        // library 'binding name' as given by user
        private String name;

        private String displayName;

        private String localizingBundle;

        private List<PropertyChangeListener> listeners;

        }


        @Override
        public String getType() {
            return LIBRARY_TYPE;
        }

        @Override
        public void setName(final String name) throws UnsupportedOperationException {
            String oldName = this.name;
            this.name = name;
            this.firePropertyChange (PROP_NAME, oldName, this.name);
        }

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

        @Override
        public void setDisplayName(String displayName) {
            this.displayName = displayName;
        }

        @Override
        public String getDisplayName() {
            return this.displayName;
        }

        @Override
        public List<URL> getContent(String contentType) throws IllegalArgumentException {
            List<URL> content = contents.get(contentType);
            if (content == null)

            return Collections.unmodifiableList (content);
        }

        @Override
        public void setContent(final String contentType, List<URL> path) throws IllegalArgumentException {
            if (path == null) {
                throw new IllegalArgumentException ();

            return checkedResources;
        }

        @Override
        public String getDescription () {
                return this.description;
        }

        @Override
        public void setDescription (String text) {
            String oldDesc = this.description;
            this.description = text;
            this.firePropertyChange (PROP_DESCRIPTION, oldDesc, this.description);
        }

        @Override
        public String getLocalizingBundle() {
            return this.localizingBundle;
        }

        @Override
        public void setLocalizingBundle(String resourceName) {
            this.localizingBundle = resourceName;
        }

        @Override
        public synchronized void addPropertyChangeListener (PropertyChangeListener l) {
            if (this.listeners == null)
                this.listeners = new ArrayList<PropertyChangeListener>();
            this.listeners.add (l);
        }

        @Override
        public synchronized void removePropertyChangeListener (PropertyChangeListener l) {
            if (this.listeners == null)
                return;
            this.listeners.remove (l);
        }

        @Override
        public String toString() {
            return this.getClass().getName()+"[" + name + "]"; // NOI18N
        }


Lines 125-130 Link Here

(-)a/java.project/nbproject/project.xml (+1 lines)
125	<compile-dependency/>	125	<compile-dependency/>
126	<run-dependency>	126	<run-dependency>
127	<release-version>1</release-version>	127	<release-version>1</release-version>
		128	<specification-version>1.31</specification-version>
128	</run-dependency>	129	</run-dependency>
129	</dependency>	130	</dependency>
130	<dependency>	131	<dependency>




                    NbBundle.getMessage(SharableLibrariesUtils.class, "ERR_LibraryExists", library.getDisplayName()),
                    NotifyDescriptor.WARNING_MESSAGE));
                } else {
                    final String name = library.getName();
                    String displayName = library.getDisplayName();
                    if (name.equals(displayName)) {
                        //No need to set displayName when it's same as name
                        displayName = null;
                    }
                    man.createURILibrary(
                            library.getType(),
                            name,
                            displayName,
                            library.getDescription(),
                            volumes);
                }
            } catch (IOException ex) {
                Exceptions.printStackTrace(ex);

Lines 72-78 Link Here

(-)a/project.ant/nbproject/project.xml (-1 / +1 lines)
72	<compile-dependency/>	72	<compile-dependency/>
73	<run-dependency>	73	<run-dependency>
74	<release-version>1</release-version>	74	<release-version>1</release-version>
75	<specification-version>1.15</specification-version>	75	<specification-version>1.31</specification-version>
76	</run-dependency>	76	</run-dependency>
77	</dependency>	77	</dependency>
78	<dependency>	78	<dependency>




import javax.swing.JFileChooser;
import javax.swing.event.ChangeListener;
import javax.swing.filechooser.FileFilter;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.api.project.Project;
import org.netbeans.api.project.ProjectManager;
import org.netbeans.api.project.libraries.Library;

import org.netbeans.spi.project.libraries.LibraryImplementation2;
import org.netbeans.spi.project.libraries.LibraryProvider;
import org.netbeans.spi.project.libraries.LibraryStorageArea;
import org.netbeans.spi.project.libraries.NamedLibraryImplementation;
import org.netbeans.spi.project.libraries.support.LibrariesSupport;
import org.netbeans.spi.project.support.ant.AntProjectEvent;
import org.netbeans.spi.project.support.ant.AntProjectHelper;

    private static final String NAMESPACE = "http://www.netbeans.org/ns/ant-project-libraries/1"; // NOI18N
    private static final String EL_LIBRARIES = "libraries"; // NOI18N
    private static final String EL_DEFINITIONS = "definitions"; // NOI18N
    private static final String SFX_DISPLAY_NAME = "displayName";   //NOI18N

    private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
    private AntProjectListener apl;

            String name = entry.getKey();
            String type = "j2se"; // NOI18N
            String description = null;
            String displayName = null;
            Map<String,List<URI>> contents = new HashMap<String,List<URI>>();
            for (Map.Entry<String,String> subentry : entry.getValue().entrySet()) {
                String k = subentry.getKey();

                    // XXX currently overriding display name is not supported
                } else if (k.equals("description")) { // NOI18N
                    description = subentry.getValue();
                } else if (k.equals(SFX_DISPLAY_NAME)) {  //NOI18N
                    displayName = subentry.getValue();
                } else {
                    final String[] path = sanitizeHttp(subentry.getKey(), PropertyUtils.tokenizePath(subentry.getValue()));
                    List<URI> volume = new ArrayList<URI>(path.length);

                    contents.put(k, volume);
                }
            }
            libs.put(
                name,
                new ProjectLibraryImplementation(
                    def.mainPropertiesFile,
                    def.privatePropertiesFile,
                    type,
                    name,
                    description,
                    displayName,
                    contents));
        }
        return libs;
    }

        return result.toArray(new String[result.size()]);
    }
    
    static final class ProjectLibraryImplementation implements LibraryImplementation2, NamedLibraryImplementation {

        final File mainPropertiesFile, privatePropertiesFile;
        final String type;
        String name;
        String description;
        String displayName;
        Map<String,List<URI>> contents;
        final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
        

            return null;
        }

        ProjectLibraryImplementation(
                File mainPropertiesFile,
                File privatePropertiesFile,
                String type,
                String name,
                final @NullAllowed String description,
                final @NullAllowed String displayName,
                Map<String,List<URI>> contents) {
            this.mainPropertiesFile = mainPropertiesFile;
            this.privatePropertiesFile = privatePropertiesFile;
            this.type = type;
            this.name = name;
            this.description = description;
            this.displayName = displayName;
            this.contents = contents;
        }


            return null;
        }

        @Override
        public String getDisplayName() {
            return displayName;
        }

        public List<URL> getContent(String volumeType) throws IllegalArgumentException {
            List<URI> uris = getURIContent(volumeType);
            List<URL> resolvedUrls = new ArrayList<URL>(uris.size());

            throw new UnsupportedOperationException();
        }

        @Override
        public void setDisplayName(final @NullAllowed String displayName) {
            if (Utilities.compareObjects(this.displayName, displayName)) {
                return;
            }
            final String oldDisplayName = this.displayName;
            this.displayName = displayName;
            try {
                final String key = String.format("libs.%s.%s",name, SFX_DISPLAY_NAME);  //NOI18N
                replaceProperty(
                    mainPropertiesFile,
                    false,
                    key,
                    displayName == null ? new String[0] : new String[]{displayName});
            } catch (IOException x) {
                throw new IllegalArgumentException(x);
            }
            pcs.firePropertyChange(LibraryImplementation.PROP_CONTENT, oldDisplayName, displayName);
        }

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

                            index++;
                        }
                    }
                    String displayName = lib.getDisplayName();
                    if (name.equals(displayName)) {
                        //No need to set displayName when it's same as name
                        displayName = null;
                    }
                    return man.createURILibrary(lib.getType(), name, displayName, lib.getDescription(), content);
                }
            });
        } catch (MutexException ex) {




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

    <change id="library-display-name">
        <api name="general"/>
        <summary>Allow user created library to provide display name</summary>
        <version major="1" minor="31"/>
        <date day="14" month="6" year="2011"/>
        <author login="tzezula"/>
        <compatibility addition="yes"/>
        <description>
            Added <code>displayName</code> property into the <code>Library</code>'s SPI
            allowing an implementor to provide the a display name of the <code>Library</code>
            which differs from the system (identifying) name.
        </description>
        <class package="org.netbeans.api.project.libraries" name="LibraryManager"/>
        <class package="org.netbeans.spi.project.libraries" name="NamedLibraryImplementation"/>
        <issue number="46863"/>
    </change>
    <change id="use-uri-for-relative-paths">
        <api name="general"/>
        <summary>URI used for relative library entries instead of URL</summary>

Lines 2-8 Link Here

(-)a/project.libraries/manifest.mf (-1 / +1 lines)
2	OpenIDE-Module: org.netbeans.modules.project.libraries/1	2	OpenIDE-Module: org.netbeans.modules.project.libraries/1
3	OpenIDE-Module-Install: org/netbeans/modules/project/libraries/LibrariesModule.class	3	OpenIDE-Module-Install: org/netbeans/modules/project/libraries/LibrariesModule.class
4	OpenIDE-Module-Layer: org/netbeans/modules/project/libraries/resources/mf-layer.xml	4	OpenIDE-Module-Layer: org/netbeans/modules/project/libraries/resources/mf-layer.xml
5	OpenIDE-Module-Specification-Version: 1.30	5	OpenIDE-Module-Specification-Version: 1.31
6	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/libraries/resources/Bundle.properties	6	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/project/libraries/resources/Bundle.properties
7	AutoUpdate-Show-In-Client: false	7	AutoUpdate-Show-In-Client: false
8		8

Lines 50-55 Link Here

(-)a/project.libraries/src/org/netbeans/api/project/libraries/LibrariesCustomizer.java (-1 / +9 lines)
50	import java.awt.Dialog;	50	import java.awt.Dialog;
51	import javax.swing.border.EmptyBorder;	51	import javax.swing.border.EmptyBorder;
52	import org.netbeans.modules.project.libraries.LibraryTypeRegistry;	52	import org.netbeans.modules.project.libraries.LibraryTypeRegistry;
		53	import org.netbeans.modules.project.libraries.Util;
53	import org.netbeans.modules.project.libraries.ui.LibrariesModel;	54	import org.netbeans.modules.project.libraries.ui.LibrariesModel;
54	import org.netbeans.modules.project.libraries.ui.NewLibraryPanel;	55	import org.netbeans.modules.project.libraries.ui.NewLibraryPanel;
55	import org.netbeans.spi.project.libraries.LibraryImplementation;	56	import org.netbeans.spi.project.libraries.LibraryImplementation;
Lines 125-133 Link Here
125	setAccessibleDescription(dlg, customizer.getAccessibleContext().getAccessibleDescription());	126	setAccessibleDescription(dlg, customizer.getAccessibleContext().getAccessibleDescription());
126	dlg.setVisible(true);	127	dlg.setVisible(true);
127	if (dd.getValue() == DialogDescriptor.OK_OPTION) {	128	if (dd.getValue() == DialogDescriptor.OK_OPTION) {
		129	final String currentLibraryName = p.getLibraryName();
		130	final String antLibraryName =
		131	org.netbeans.modules.project.libraries.ui.LibrariesCustomizer.createFreeAntLibraryName(
		132	currentLibraryName,
		133	customizer.getModel(),
		134	area);
128	LibraryImplementation impl;	135	LibraryImplementation impl;
129	if (area != LibrariesModel.GLOBAL_AREA) {	136	if (area != LibrariesModel.GLOBAL_AREA) {
130	impl = customizer.getModel().createArealLibrary(p.getLibraryType(), p.getLibraryName(), manager.getArea());	137	impl = customizer.getModel().createArealLibrary(p.getLibraryType(), antLibraryName, manager.getArea());
131	} else {	138	} else {
132	LibraryTypeProvider provider = LibraryTypeRegistry.getDefault().getLibraryTypeProvider(p.getLibraryType());	139	LibraryTypeProvider provider = LibraryTypeRegistry.getDefault().getLibraryTypeProvider(p.getLibraryType());
133	if (provider == null) {	140	if (provider == null) {
Lines 136-141 Link Here
136	impl = provider.createLibrary();	143	impl = provider.createLibrary();
137	impl.setName(p.getLibraryName());	144	impl.setName(p.getLibraryName());
138	}	145	}
		146	Util.setDisplayName(impl, currentLibraryName);
139	customizer.getModel().addLibrary(impl);	147	customizer.getModel().addLibrary(impl);
140	customizer.forceTreeRecreation();	148	customizer.forceTreeRecreation();
141	if (customizeLibrary(customizer, impl)) {	149	if (customizeLibrary(customizer, impl)) {

Lines 54-59 Link Here

(-)a/project.libraries/src/org/netbeans/api/project/libraries/Library.java (-1 / +2 lines)
54	import java.util.ResourceBundle;	54	import java.util.ResourceBundle;
55	import java.util.logging.Logger;	55	import java.util.logging.Logger;
56	import org.netbeans.modules.project.libraries.LibraryAccessor;	56	import org.netbeans.modules.project.libraries.LibraryAccessor;
		57	import org.netbeans.modules.project.libraries.Util;
57	import org.netbeans.modules.project.libraries.ui.LibrariesModel;	58	import org.netbeans.modules.project.libraries.ui.LibrariesModel;
58	import org.netbeans.spi.project.libraries.LibraryImplementation;	59	import org.netbeans.spi.project.libraries.LibraryImplementation;
59	import org.netbeans.spi.project.libraries.LibraryImplementation2;	60	import org.netbeans.spi.project.libraries.LibraryImplementation2;
Lines 176-182 Link Here
176	* @return String the display name, never returns null.	177	* @return String the display name, never returns null.
177	*/	178	*/
178	public String getDisplayName () {	179	public String getDisplayName () {
179	return org.netbeans.modules.project.libraries.ui.LibrariesCustomizer.getLocalizedName(this.impl);	180	return Util.getLocalizedName(this.impl);
180	}	181	}
181		182
182		183

Lines 58-64 Link Here

(-)a/project.libraries/src/org/netbeans/api/project/libraries/LibraryManager.java (-2 / +55 lines)
58	import java.util.List;	58	import java.util.List;
59	import java.util.Map;	59	import java.util.Map;
60	import java.util.Set;	60	import java.util.Set;
		61	import org.netbeans.api.annotations.common.NonNull;
		62	import org.netbeans.api.annotations.common.NullAllowed;
61	import org.netbeans.modules.project.libraries.LibraryAccessor;	63	import org.netbeans.modules.project.libraries.LibraryAccessor;
		64	import org.netbeans.modules.project.libraries.Util;
62	import org.netbeans.modules.project.libraries.WritableLibraryProvider;	65	import org.netbeans.modules.project.libraries.WritableLibraryProvider;
63	import org.netbeans.modules.project.libraries.ui.LibrariesModel;	66	import org.netbeans.modules.project.libraries.ui.LibrariesModel;
64	import org.netbeans.spi.project.libraries.ArealLibraryProvider;	67	import org.netbeans.spi.project.libraries.ArealLibraryProvider;
Lines 286-291 Link Here
286	* @since org.netbeans.modules.project.libraries/1 1.15	289	* @since org.netbeans.modules.project.libraries/1 1.15
287	*/	290	*/
288	public Library createLibrary(String type, String name, Map<String,List<URL>> contents) throws IOException {	291	public Library createLibrary(String type, String name, Map<String,List<URL>> contents) throws IOException {
		292	return createLibrary(type, name, null, null, contents);
		293	}
		294
		295	/**
		296	* Creates a new library definition and adds it to the list.
		297	* @param type the type of library, as in {@link LibraryTypeProvider#getLibraryType} or {@link LibraryImplementation#getType}
		298	* @param name the identifying name of the new library (must not duplicate a name already in use by a library in this manager)
		299	* @param displayName the display name of the library. If null the identifying name is used
		300	* @param description the library description
		301	* @param contents the initial contents of the library's volumes, as a map from volume type to volume content
		302	* @return a newly created library
		303	* @throws IOException if the new definition could not be stored
		304	* @throws IllegalArgumentException if the library type or one of the content volume types is not supported,
		305	* or if a library of the same name already exists in this manager
		306	* @see ArealLibraryProvider#createLibrary
		307	* @since org.netbeans.modules.project.libraries/1 1.31
		308	*/
		309	public Library createLibrary(
		310	@NonNull final String type,
		311	@NonNull final String name,
		312	@NullAllowed final String displayName,
		313	@NullAllowed final String description,
		314	@NonNull final Map<String,List<URL>> contents) throws IOException {
289	if (getLibrary(name) != null) {	315	if (getLibrary(name) != null) {
290	throw new IllegalArgumentException("Name already in use: " + name); // NOI18N	316	throw new IllegalArgumentException("Name already in use: " + name); // NOI18N
291	}	317	}
Lines 297-302 Link Here
297	}	323	}
298	impl = ltp.createLibrary();	324	impl = ltp.createLibrary();
299	impl.setName(name);	325	impl.setName(name);
		326	Util.setDisplayName(impl, displayName);
300	for (Map.Entry<String,List<URL>> entry : contents.entrySet()) {	327	for (Map.Entry<String,List<URL>> entry : contents.entrySet()) {
301	impl.setContent(entry.getKey(), entry.getValue());	328	impl.setContent(entry.getKey(), entry.getValue());
302	}	329	}
Lines 307-312 Link Here
307	cont.put(entry.getKey(), LibrariesModel.convertURLsToURIs(entry.getValue()));	334	cont.put(entry.getKey(), LibrariesModel.convertURLsToURIs(entry.getValue()));
308	}	335	}
309	impl = LibraryAccessor.createLibrary(alp, type, name, area, cont);	336	impl = LibraryAccessor.createLibrary(alp, type, name, area, cont);
		337	Util.setDisplayName(impl, displayName);
310	}	338	}
311	return new Library(impl, this);	339	return new Library(impl, this);
312	}	340	}
Lines 321-329 Link Here
321	* @throws IllegalArgumentException if the library type or one of the content volume types is not supported,	349	* @throws IllegalArgumentException if the library type or one of the content volume types is not supported,
322	* or if a library of the same name already exists in this manager	350	* or if a library of the same name already exists in this manager
323	* @see ArealLibraryProvider#createLibrary	351	* @see ArealLibraryProvider#createLibrary
		352	* @since org.netbeans.modules.project.libraries/1 1.31
		353	*/
		354	public Library createURILibrary(String type, String name, Map<String,List<URI>> contents) throws IOException {
		355	return createURILibrary(type, name, null, null, contents);
		356	}
		357
		358	/**
		359	* Creates a new library definition and adds it to the list.
		360	* @param type the type of library, as in {@link LibraryTypeProvider#getLibraryType} or {@link LibraryImplementation#getType}
		361	* @param name the identifying name of the new library (must not duplicate a name already in use by a library in this manager)
		362	* @param displayName the display name of the library. If null the identifying name is used
		363	* @param description the library description
		364	* @param contents the initial contents of the library's volumes, as a map from volume type to volume content
		365	* @return a newly created library
		366	* @throws IOException if the new definition could not be stored
		367	* @throws IllegalArgumentException if the library type or one of the content volume types is not supported,
		368	* or if a library of the same name already exists in this manager
		369	* @see ArealLibraryProvider#createLibrary
324	* @since org.netbeans.modules.project.libraries/1 1.18	370	* @since org.netbeans.modules.project.libraries/1 1.18
325	*/	371	*/
326	public Library createURILibrary(String type, String name, Map<String,List<URI>> contents) throws IOException {	372	public Library createURILibrary(
		373	@NonNull final String type,
		374	@NonNull final String name,
		375	@NullAllowed final String displayName,
		376	@NullAllowed final String description,
		377	@NonNull final Map<String,List<URI>> contents) throws IOException {
327	if (getLibrary(name) != null) {	378	if (getLibrary(name) != null) {
328	throw new IllegalArgumentException("Name already in use: " + name); // NOI18N	379	throw new IllegalArgumentException("Name already in use: " + name); // NOI18N
329	}	380	}
Lines 335-347 Link Here
335	}	386	}
336	impl = ltp.createLibrary();	387	impl = ltp.createLibrary();
337	impl.setName(name);	388	impl.setName(name);
		389	Util.setDisplayName(impl, displayName);
338	for (Map.Entry<String,List<URI>> entry : contents.entrySet()) {	390	for (Map.Entry<String,List<URI>> entry : contents.entrySet()) {
339	impl.setContent(entry.getKey(), LibrariesModel.convertURIsToURLs(entry.getValue()));	391	impl.setContent(entry.getKey(), LibrariesModel.convertURIsToURLs(entry.getValue()));
340	}	392	}
341	Lookup.getDefault().lookup(WritableLibraryProvider.class).addLibrary(impl);	393	Lookup.getDefault().lookup(WritableLibraryProvider.class).addLibrary(impl);
342	} else {	394	} else {
343	impl = LibraryAccessor.createLibrary(alp, type, name, area, contents);	395	impl = LibraryAccessor.createLibrary(alp, type, name, area, contents);
344	}	396	Util.setDisplayName(impl, displayName);
		397	}
345	return new Library(impl, this);	398	return new Library(impl, this);
346	}	399	}
347		400

Lines 45-56 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/DefaultLibraryImplementation.java (-3 / +28 lines)
45	package org.netbeans.modules.project.libraries;	45	package org.netbeans.modules.project.libraries;
46		46
47	import java.net.URL;	47	import java.net.URL;
48	import org.netbeans.spi.project.libraries.LibraryImplementation;
49	import java.util.*;	48	import java.util.*;
50	import java.beans.PropertyChangeListener;	49	import java.beans.PropertyChangeListener;
51	import java.beans.PropertyChangeEvent;	50	import java.beans.PropertyChangeEvent;
		51	import org.netbeans.api.annotations.common.CheckForNull;
		52	import org.netbeans.api.annotations.common.NullAllowed;
		53	import org.netbeans.spi.project.libraries.NamedLibraryImplementation;
52		54
53	public final class DefaultLibraryImplementation implements LibraryImplementation {	55	public final class DefaultLibraryImplementation implements NamedLibraryImplementation {
54		56
55	private String description;	57	private String description;
56		58
Lines 63-68 Link Here
63		65
64	private String localizingBundle;	66	private String localizingBundle;
65		67
		68	private String displayName;
		69
66	private List<PropertyChangeListener> listeners;	70	private List<PropertyChangeListener> listeners;
67		71
68	/**	72	/**
Lines 78-97 Link Here
78	}	82	}
79		83
80		84
		85	@Override
81	public String getType() {	86	public String getType() {
82	return libraryType;	87	return libraryType;
83	}	88	}
84		89
		90	@Override
85	public void setName(final String name) throws UnsupportedOperationException {	91	public void setName(final String name) throws UnsupportedOperationException {
86	String oldName = this.name;	92	String oldName = this.name;
87	this.name = name;	93	this.name = name;
88	this.firePropertyChange (PROP_NAME, oldName, this.name);	94	this.firePropertyChange (PROP_NAME, oldName, this.name);
89	}	95	}
90		96
		97	@Override
91	public String getName() {	98	public String getName() {
92	return name;	99	return name;
93	}	100	}
94		101
		102	@Override
95	public List<URL> getContent(String contentType) throws IllegalArgumentException {	103	public List<URL> getContent(String contentType) throws IllegalArgumentException {
96	List<URL> content = contents.get(contentType);	104	List<URL> content = contents.get(contentType);
97	if (content == null)	105	if (content == null)
Lines 99-104 Link Here
99	return Collections.unmodifiableList (content);	107	return Collections.unmodifiableList (content);
100	}	108	}
101		109
		110	@Override
102	public void setContent(String contentType, List<URL> path) throws IllegalArgumentException {	111	public void setContent(String contentType, List<URL> path) throws IllegalArgumentException {
103	if (path == null) {	112	if (path == null) {
104	throw new IllegalArgumentException ();	113	throw new IllegalArgumentException ();
Lines 112-148 Link Here
112	}	121	}
113	}	122	}
114		123
		124	@Override
115	public String getDescription () {	125	public String getDescription () {
116	return this.description;	126	return this.description;
117	}	127	}
118		128
		129	@Override
119	public void setDescription (String text) {	130	public void setDescription (String text) {
120	String oldDesc = this.description;	131	String oldDesc = this.description;
121	this.description = text;	132	this.description = text;
122	this.firePropertyChange (PROP_DESCRIPTION, oldDesc, this.description);	133	this.firePropertyChange (PROP_DESCRIPTION, oldDesc, this.description);
123	}	134	}
124		135
		136	@Override
125	public String getLocalizingBundle() {	137	public String getLocalizingBundle() {
126	return this.localizingBundle;	138	return this.localizingBundle;
127	}	139	}
128		140
		141	@Override
129	public void setLocalizingBundle(String resourceName) {	142	public void setLocalizingBundle(String resourceName) {
130	this.localizingBundle = resourceName;	143	this.localizingBundle = resourceName;
131	}	144	}
132		145
		146	@Override
		147	public @CheckForNull String getDisplayName() {
		148	return this.displayName;
		149	}
		150
		151	public void setDisplayName(final @NullAllowed String displayName) {
		152	this.displayName = displayName;
		153	}
		154
		155	@Override
133	public synchronized void addPropertyChangeListener (PropertyChangeListener l) {	156	public synchronized void addPropertyChangeListener (PropertyChangeListener l) {
134	if (this.listeners == null)	157	if (this.listeners == null)
135	this.listeners = new ArrayList<PropertyChangeListener>();	158	this.listeners = new ArrayList<PropertyChangeListener>();
136	this.listeners.add (l);	159	this.listeners.add (l);
137	}	160	}
138		161
		162	@Override
139	public synchronized void removePropertyChangeListener (PropertyChangeListener l) {	163	public synchronized void removePropertyChangeListener (PropertyChangeListener l) {
140	if (this.listeners == null)	164	if (this.listeners == null)
141	return;	165	return;
142	this.listeners.remove (l);	166	this.listeners.remove (l);
143	}	167	}
144		168
145	public @Override String toString() {	169	@Override
		170	public String toString() {
146	return "DefaultLibraryImplementation[" + name + "]"; // NOI18N	171	return "DefaultLibraryImplementation[" + name + "]"; // NOI18N
147	}	172	}
148		173




import java.net.URL;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.ResourceBundle;

import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import javax.xml.parsers.ParserConfigurationException;
import org.netbeans.modules.project.libraries.ui.LibrariesCustomizer;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryTypeProvider;
import org.openide.filesystems.FileChangeAdapter;

import org.openide.filesystems.FileUtil;
import org.openide.util.Exceptions;
import org.openide.util.NbBundle;
import org.openide.xml.XMLUtil;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;


                            }
                            librariesByFileNames.put(descriptorFile.getPath(),impl);
                            libraries.put (impl.getName(),impl);
                            Util.registerSource(impl, descriptorFile);
                        }
                    }
                } catch (SAXException e) {

        final LibraryDeclarationParser parser = new LibraryDeclarationParser(handler,convertor);
        handler.setLibrary (impl);
        readLibrary (descriptorFile, parser);
        Util.registerSource(impl, descriptorFile);
        return handler.getLibrary();
    }


                            return;
                        }
                        FileObject fo = storage.createData (library.getName(),"xml");   //NOI18N
                        LibraryDeclarationParser.writeLibraryDefinition (fo, library, libraryTypeProvider);
                    }
                }
        );
    }
    
    private static void writeLibraryDefinition (final FileObject definitionFile, final LibraryImplementation library, final LibraryTypeProvider libraryTypeProvider) throws IOException {
        Document doc = XMLUtil.createDocument("library", null,
                "-//NetBeans//DTD Library Declaration 1.0//EN",
                "http://www.netbeans.org/dtds/library-declaration-1_0.dtd"); // NOI18N
        Element libraryE = doc.getDocumentElement();
        libraryE.setAttribute("version", "1.0"); // NOI18N
        libraryE.appendChild(doc.createElement("name")).appendChild(doc.createTextNode(library.getName())); // NOI18N
        libraryE.appendChild(doc.createElement("type")).appendChild(doc.createTextNode(library.getType())); // NOI18N
        String description = library.getDescription();
        if (description != null && description.length() > 0) {
            libraryE.appendChild(doc.createElement("description")).appendChild(doc.createTextNode(description)); // NOI18N
        }
        String localizingBundle = library.getLocalizingBundle();
        if (localizingBundle != null && localizingBundle.length() > 0) {
            libraryE.appendChild(doc.createElement("localizing-bundle")).appendChild(doc.createTextNode(localizingBundle)); // NOI18N
        }
        for (String vtype : libraryTypeProvider.getSupportedVolumeTypes()) {
            Element volumeE = (Element) libraryE.appendChild(doc.createElement("volume")); // NOI18N
            volumeE.appendChild(doc.createElement("type")).appendChild(doc.createTextNode(vtype)); // NOI18N
            List<URL> volume = library.getContent(vtype);
            if (volume != null) {
                //If null -> broken library, repair it.
                for (URL url : volume) {
                    volumeE.appendChild(doc.createElement("resource")).appendChild(doc.createTextNode(url.toString())); // NOI18N
                }
            }
        }
        OutputStream os = definitionFile.getOutputStream();
        try {
            XMLUtil.write(doc, os, "UTF-8"); // NOI18N
        } finally {
            os.close();
        }
    }


    private void fireLibrariesChanged () {
        this.support.firePropertyChange(PROP_LIBRARIES,null,null);
    }


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


    @Override
    public final void removePropertyChangeListener (PropertyChangeListener listener) {
        this.support.removePropertyChangeListener(listener);
    }

    /**
     * Return all libraries in memory.
     */
    @Override
    public final LibraryImplementation[] getLibraries() {
        final Libs res = initStorage();
        assert res != null;

    } // end getLibraries


    @Override
    public void addLibrary (LibraryImplementation library) throws IOException {
        this.initStorage();
        assert this.storage != null : "Storage is not initialized";
        writeLibrary(this.storage,library);
    }

    @Override
    public void removeLibrary (LibraryImplementation library) throws IOException {
        final Libs data = this.initStorage();
        assert this.storage != null : "Storage is not initialized";

        }
    }

    @Override
    public void updateLibrary(final LibraryImplementation oldLibrary, final LibraryImplementation newLibrary) throws IOException {
        final Libs data = this.initStorage();
        assert this.storage != null : "Storage is not initialized";

                this.storage.getFileSystem().runAtomicAction(
                        new FileSystem.AtomicAction() {
                            public void run() throws IOException {
                                LibraryDeclarationParser.writeLibraryDefinition (fo, newLibrary, libraryTypeProvider);
                            }
                        }
                );

Lines 91-97 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/LibraryDeclarationHandler.java (-1 / +3 lines)
91	* @param meta attributes	91	* @param meta attributes
92	*	92	*
93	*/	93	*/
94	public void start_library(final Attributes meta) throws SAXException;	94	public String start_library(final String nameSpace, final Attributes meta) throws SAXException;
95		95
96	/**	96	/**
97	* A container element end event handling method.	97	* A container element end event handling method.
Lines 117-121 Link Here
117		117
118	public void handle_localizingBundle (final String data, final Attributes meta) throws SAXException;	118	public void handle_localizingBundle (final String data, final Attributes meta) throws SAXException;
119		119
		120	public void handle_displayName (String data, Attributes meta) throws SAXException;
		121
120	}	122	}
121		123




import java.util.Map;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.logging.Level;
import java.util.regex.Pattern;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryTypeProvider;
import org.openide.util.Utilities;
import org.xml.sax.Attributes;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;



    private LibraryImplementation library;

    private String libraryType;
    private String libraryDescription;
    private String libraryName;
    private String localizingBundle;
    private String displayName;
    private Map<String,List<URL>> contentTypes = new HashMap<String,List<URL>>();

    // last volume

    }

    @Override
    public String start_library(final String nameSpace, final Attributes meta) throws SAXException {
        final String version = meta.getValue("version");
        if (LibraryDeclarationParser.VER_1.equals(version)) {
            return "";  //NOI18N
        } else if (LibraryDeclarationParser.VER_2.equals(version)) {
            return LibraryDeclarationParser.LIBRARY_NS;
        } else {
            throw new SAXException("Invalid librray descriptor version"); // NOI18N
        }
    }

                        library.getType()+" to: " + libraryType, null); //NOI18N
            }
            update = true;
        } else {
        else {
            if (this.libraryType == null) {
                throw new SAXParseException("Unspecified library type for: "+this.libraryName, null); //NOI18N
            }

            update = false;
            LibrariesStorage.LOG.log(Level.FINE, "LibraryDeclarationHandlerImpl library {0} type {1} found", new Object[] { this.libraryName, this.libraryType });
        }
        if (!update || !Utilities.compareObjects(this.library.getLocalizingBundle(), localizingBundle)) {
            this.library.setLocalizingBundle (this.localizingBundle);
        }
        if (!update || !Utilities.compareObjects(this.library.getName(), libraryName)) {
            this.library.setName (this.libraryName);
        }
        if (!update || !Utilities.compareObjects(this.library.getDescription(), libraryDescription)) {
            this.library.setDescription (this.libraryDescription);
        }
        if (!update || !Utilities.compareObjects(this.library.getLocalizingBundle(), displayName)) {
            Util.setDisplayName(this.library,displayName);
        }
        for (Map.Entry<String,List<URL>> entry : contentTypes.entrySet()) {
            String contentType = entry.getKey();
            List<URL> cp = entry.getValue();

        this.localizingBundle = data;
    }

    @Override
    public void handle_displayName (String data, Attributes meta) throws SAXException {
        this.displayName = data;
    }

    public void setLibrary (LibraryImplementation library) {
        this.library = library;
    }

    }


    private static boolean safeEquals (Object o1, Object o2) {
        return o1 == null ? o2 == null : o1.equals (o2);
    }

    private static boolean urlsEqual (final Collection<? extends URL> first, final Collection<? extends URL> second) {
        assert first != null;
        assert second != null;

Lines 47-56 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/LibraryDeclarationParser.java (-27 / +156 lines)
47	import java.io.ByteArrayInputStream;	47	import java.io.ByteArrayInputStream;
48	import java.io.IOException;	48	import java.io.IOException;
49	import java.io.InputStream;	49	import java.io.InputStream;
		50	import java.io.OutputStream;
		51	import java.net.URL;
		52	import java.util.List;
50	import java.util.Stack;	53	import java.util.Stack;
51	import java.util.concurrent.atomic.AtomicBoolean;	54	import java.util.concurrent.atomic.AtomicBoolean;
52	import javax.xml.parsers.ParserConfigurationException;	55	import javax.xml.parsers.ParserConfigurationException;
		56	import org.netbeans.api.annotations.common.NonNull;
		57	import org.netbeans.spi.project.libraries.LibraryImplementation;
		58	import org.netbeans.spi.project.libraries.LibraryTypeProvider;
		59	import org.netbeans.spi.project.libraries.NamedLibraryImplementation;
		60	import org.openide.filesystems.FileObject;
53	import org.openide.xml.XMLUtil;	61	import org.openide.xml.XMLUtil;
		62	import org.w3c.dom.Document;
		63	import org.w3c.dom.Element;
54	import org.xml.sax.Attributes;	64	import org.xml.sax.Attributes;
55	import org.xml.sax.ContentHandler;	65	import org.xml.sax.ContentHandler;
56	import org.xml.sax.EntityResolver;	66	import org.xml.sax.EntityResolver;
Lines 75-84 Link Here
75	*/	85	*/
76	public class LibraryDeclarationParser implements ContentHandler, EntityResolver {	86	public class LibraryDeclarationParser implements ContentHandler, EntityResolver {
77		87
		88	private static final String LIBRARY_DEF_1 = "-//NetBeans//DTD Library Declaration 1.0//EN"; //NOI18N
		89	private static final String LIBRARY_DTD_1 = "http://www.netbeans.org/dtds/library-declaration-1_0.dtd"; //NOI18N
		90	static final String LIBRARY_NS = "http://www.netbeans.org/ns/library-declaration/2"; //NOI18N
		91	static final String VER_1 = "1.0"; //NOI18N
		92	static final String VER_2 = "2.0"; //NOI18N
		93	private static final String LIBRARY = "library"; //NOI18N
		94	private static final String VERSION = "version"; //NOI18N
		95	private static final String VOLUME = "volume"; //NOI18N
		96	private static final String DESCRIPTION = "description"; //NOI18N
		97	private static final String TYPE = "type"; //NOI18N
		98	private static final String RESOURCE = "resource"; //NOI18N
		99	private static final String NAME = "name"; //NOI18N
		100	private static final String BUNDLE = "localizing-bundle"; //NOI18N
		101	private static final String DISPLAY_NAME = "display-name"; //NOI18N
		102
78	private StringBuffer buffer;	103	private StringBuffer buffer;
79	private final LibraryDeclarationConvertor parslet;	104	private final LibraryDeclarationConvertor parslet;
80	private final LibraryDeclarationHandler handler;	105	private final LibraryDeclarationHandler handler;
81	private Stack<Object[]> context;	106	private Stack<Object[]> context;
		107	private String expectedNS;
82	private final AtomicBoolean used = new AtomicBoolean();	108	private final AtomicBoolean used = new AtomicBoolean();
83		109
84	/**	110	/**
Lines 98-103 Link Here
98	* This SAX interface method is implemented by the parser.	124	* This SAX interface method is implemented by the parser.
99	*	125	*
100	*/	126	*/
		127	@Override
101	public final void setDocumentLocator(Locator locator) {	128	public final void setDocumentLocator(Locator locator) {
102	}	129	}
103		130
Lines 105-110 Link Here
105	* This SAX interface method is implemented by the parser.	132	* This SAX interface method is implemented by the parser.
106	*	133	*
107	*/	134	*/
		135	@Override
108	public final void startDocument() throws SAXException {	136	public final void startDocument() throws SAXException {
109	handler.startDocument();	137	handler.startDocument();
110	}	138	}
Lines 113-118 Link Here
113	* This SAX interface method is implemented by the parser.	141	* This SAX interface method is implemented by the parser.
114	*	142	*
115	*/	143	*/
		144	@Override
116	public final void endDocument() throws SAXException {	145	public final void endDocument() throws SAXException {
117	handler.endDocument();	146	handler.endDocument();
118	}	147	}
Lines 121-133 Link Here
121	* This SAX interface method is implemented by the parser.	150	* This SAX interface method is implemented by the parser.
122	*	151	*
123	*/	152	*/
		153	@Override
124	public final void startElement(String ns, String name, String qname, Attributes attrs) throws SAXException {	154	public final void startElement(String ns, String name, String qname, Attributes attrs) throws SAXException {
125	dispatch(true);	155	dispatch(true);
126	context.push(new Object[] {qname, new AttributesImpl(attrs)});	156	context.push(new Object[] {qname, ns, new AttributesImpl(attrs)});
127	if ("volume".equals(qname)) {	157	if (VOLUME.equals(qname)) {
128	handler.start_volume(attrs);	158	handler.start_volume(attrs);
129	} else if ("library".equals(qname)) {	159	} else if (LIBRARY.equals(qname)) {
130	handler.start_library(attrs);	160	expectedNS = handler.start_library(ns, attrs);
131	}	161	}
132	}	162	}
133		163
Lines 135-146 Link Here
135	* This SAX interface method is implemented by the parser.	165	* This SAX interface method is implemented by the parser.
136	*	166	*
137	*/	167	*/
		168	@Override
138	public final void endElement(String ns, String name, String qname) throws SAXException {	169	public final void endElement(String ns, String name, String qname) throws SAXException {
139	dispatch(false);	170	dispatch(false);
140	context.pop();	171	context.pop();
141	if ("volume".equals(qname)) {	172	if (VOLUME.equals(qname)) {
142	handler.end_volume();	173	handler.end_volume();
143	} else if ("library".equals(qname)) {	174	} else if (LIBRARY.equals(qname)) {
144	handler.end_library();	175	handler.end_library();
145	}	176	}
146	}	177	}
Lines 149-154 Link Here
149	* This SAX interface method is implemented by the parser.	180	* This SAX interface method is implemented by the parser.
150	*	181	*
151	*/	182	*/
		183	@Override
152	public final void characters(char[] chars, int start, int len) throws SAXException {	184	public final void characters(char[] chars, int start, int len) throws SAXException {
153	buffer.append(chars, start, len);	185	buffer.append(chars, start, len);
154	}	186	}
Lines 157-162 Link Here
157	* This SAX interface method is implemented by the parser.	189	* This SAX interface method is implemented by the parser.
158	*	190	*
159	*/	191	*/
		192	@Override
160	public final void ignorableWhitespace(char[] chars, int start, int len) throws SAXException {	193	public final void ignorableWhitespace(char[] chars, int start, int len) throws SAXException {
161	}	194	}
162		195
Lines 164-169 Link Here
164	* This SAX interface method is implemented by the parser.	197	* This SAX interface method is implemented by the parser.
165	*	198	*
166	*/	199	*/
		200	@Override
167	public final void processingInstruction(String target, String data) throws SAXException {	201	public final void processingInstruction(String target, String data) throws SAXException {
168	}	202	}
169		203
Lines 171-176 Link Here
171	* This SAX interface method is implemented by the parser.	205	* This SAX interface method is implemented by the parser.
172	*	206	*
173	*/	207	*/
		208	@Override
174	public final void startPrefixMapping(final String prefix, final String uri) throws SAXException {	209	public final void startPrefixMapping(final String prefix, final String uri) throws SAXException {
175	}	210	}
176		211
Lines 178-183 Link Here
178	* This SAX interface method is implemented by the parser.	213	* This SAX interface method is implemented by the parser.
179	*	214	*
180	*/	215	*/
		216	@Override
181	public final void endPrefixMapping(final String prefix) throws SAXException {	217	public final void endPrefixMapping(final String prefix) throws SAXException {
182	}	218	}
183		219
Lines 185-214 Link Here
185	* This SAX interface method is implemented by the parser.	221	* This SAX interface method is implemented by the parser.
186	*	222	*
187	*/	223	*/
		224	@Override
188	public final void skippedEntity(String name) throws SAXException {	225	public final void skippedEntity(String name) throws SAXException {
189	}	226	}
190		227
191	private void dispatch(final boolean fireOnlyIfMixed) throws SAXException {	228	private void dispatch(final boolean fireOnlyIfMixed) throws SAXException {
192	if (fireOnlyIfMixed && buffer.length() == 0) return; //skip it	229	if (fireOnlyIfMixed && buffer.length() == 0) return; //skip it
193		230
194	Object[] ctx = context.peek();	231	final Object[] ctx = context.peek();
195	String here = (String) ctx[0];	232	final String here = (String) ctx[0];
196	Attributes attrs = (Attributes) ctx[1];	233	final String ns = (String) ctx[1];
197	if ("description".equals(here)) {	234	Attributes attrs = (Attributes) ctx[2];
		235	if (!expectedNS.equals(ns)) {
		236	throw new SAXException("Invalid librray descriptor namespace"); // NOI18N
		237	}
		238	if (DESCRIPTION.equals(here)) {
198	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");	239	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");
199	handler.handle_description (buffer.length() == 0 ? null : buffer.toString(), attrs);	240	handler.handle_description (buffer.length() == 0 ? null : buffer.toString(), attrs);
200	} else if ("type".equals(here)) {	241	} else if (TYPE.equals(here)) {
201	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");	242	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");
202	handler.handle_type(buffer.length() == 0 ? null : buffer.toString(), attrs);	243	handler.handle_type(buffer.length() == 0 ? null : buffer.toString(), attrs);
203	} else if ("resource".equals(here)) {	244	} else if (RESOURCE.equals(here)) {
204	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");	245	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");
205	handler.handle_resource(parslet.parseResource(buffer.length() == 0 ? null : buffer.toString()), attrs);	246	handler.handle_resource(parslet.parseResource(buffer.length() == 0 ? null : buffer.toString()), attrs);
206	} else if ("name".equals(here)) {	247	} else if (NAME.equals(here)) {
207	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");	248	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");
208	handler.handle_name(buffer.length() == 0 ? null : buffer.toString(), attrs);	249	handler.handle_name(buffer.length() == 0 ? null : buffer.toString(), attrs);
209	} else if ("localizing-bundle".equals(here)) {	250	} else if (BUNDLE.equals(here)) {
210	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");	251	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");
211	handler.handle_localizingBundle(buffer.length() == 0 ? null : buffer.toString(), attrs);	252	handler.handle_localizingBundle(buffer.length() == 0 ? null : buffer.toString(), attrs);
		253	} else if (DISPLAY_NAME.equals(here) && LIBRARY_NS.equals(ns)) {
		254	if (fireOnlyIfMixed) throw new IllegalStateException("Unexpected characters() event! (Missing DTD?)");
		255	handler.handle_displayName(buffer.length() == 0 ? null : buffer.toString(), attrs);
212	} else {	256	} else {
213	//do not care	257	//do not care
214	}	258	}
Lines 225-251 Link Here
225	*	269	*
226	*/	270	*/
227	public void parse(final InputSource input) throws SAXException, ParserConfigurationException, IOException {	271	public void parse(final InputSource input) throws SAXException, ParserConfigurationException, IOException {
228	parse(input, this);
229	}
230
231	private void parse(final InputSource input, final LibraryDeclarationParser recognizer) throws SAXException, ParserConfigurationException, IOException {
232	if (used.getAndSet(true)) {	272	if (used.getAndSet(true)) {
233	throw new IllegalStateException("The LibraryDeclarationParser was already used, create a new instance"); //NOI18N	273	throw new IllegalStateException("The LibraryDeclarationParser was already used, create a new instance"); //NOI18N
234	}	274	}
235	try {	275	try {
236	XMLReader parser = XMLUtil.createXMLReader(false, false);	276	final XMLReader parser = XMLUtil.createXMLReader(false, true);
237	parser.setContentHandler(recognizer);	277	parser.setContentHandler(this);
238	parser.setErrorHandler(recognizer.getDefaultErrorHandler());	278	parser.setErrorHandler(getDefaultErrorHandler());
239	parser.setEntityResolver(recognizer);	279	parser.setEntityResolver(this);
240	parser.parse(input);	280	parser.parse(input);
241	} finally {	281	} finally {
242	//Recover recognizer internal state from exceptions to be reusable	282	//Recover recognizer internal state from exceptions to be reusable
243	if (!recognizer.context.empty()) {	283	if (!context.empty()) {
244	recognizer.context.clear();	284	context.clear();
245	}	285	}
246	if (recognizer.buffer.length() > 0) {	286	if (buffer.length() > 0) {
247	recognizer.buffer.delete(0, recognizer.buffer.length());	287	buffer.delete(0, buffer.length());
248	}	288	}
		289	expectedNS = null;
249	}	290	}
250	}	291	}
251		292
Lines 256-269 Link Here
256	*/	297	*/
257	protected ErrorHandler getDefaultErrorHandler() {	298	protected ErrorHandler getDefaultErrorHandler() {
258	return new ErrorHandler() {	299	return new ErrorHandler() {
		300	@Override
259	public void error(SAXParseException ex) throws SAXException {	301	public void error(SAXParseException ex) throws SAXException {
260	throw ex;	302	throw ex;
261	}	303	}
262		304
		305	@Override
263	public void fatalError(SAXParseException ex) throws SAXException {	306	public void fatalError(SAXParseException ex) throws SAXException {
264	throw ex;	307	throw ex;
265	}	308	}
266		309
		310	@Override
267	public void warning(SAXParseException ex) throws SAXException {	311	public void warning(SAXParseException ex) throws SAXException {
268	// ignore	312	// ignore
269	}	313	}
Lines 273-285 Link Here
273		317
274	/** Implementation of entity resolver. Points to the local DTD	318	/** Implementation of entity resolver. Points to the local DTD
275	* for our public ID */	319	* for our public ID */
		320	@Override
276	public InputSource resolveEntity (String publicId, String systemId)	321	public InputSource resolveEntity (String publicId, String systemId)
277	throws SAXException {	322	throws SAXException {
278	if ("-//NetBeans//DTD Library Declaration 1.0//EN".equals(publicId)) {	323	if (LIBRARY_DEF_1.equals(publicId)) {
279	InputStream is = new ByteArrayInputStream(new byte[0]);	324	InputStream is = new ByteArrayInputStream(new byte[0]);
280	return new InputSource(is);	325	return new InputSource(is);
281	}	326	}
282	return null; // i.e. follow advice of systemID	327	return null; // i.e. follow advice of systemID
283	}	328	}
		329
		330	static void writeLibraryDefinition (
		331	final @NonNull FileObject definitionFile,
		332	final @NonNull LibraryImplementation library,
		333	final @NonNull LibraryTypeProvider libraryTypeProvider) throws IOException {
		334	final Document doc = Util.supportsDisplayName(library) ?
		335	createLibraryDefinition2(library, libraryTypeProvider) :
		336	createLibraryDefinition1(library, libraryTypeProvider);
		337	final OutputStream os = definitionFile.getOutputStream();
		338	try {
		339	XMLUtil.write(doc, os, "UTF-8"); // NOI18N
		340	} finally {
		341	os.close();
		342	}
		343	}
		344
		345	private static Document createLibraryDefinition1(
		346	final @NonNull LibraryImplementation library,
		347	final @NonNull LibraryTypeProvider libraryTypeProvider) {
		348	final Document doc = XMLUtil.createDocument(LIBRARY, null,
		349	LIBRARY_DEF_1,
		350	LIBRARY_DTD_1);
		351	final Element libraryE = doc.getDocumentElement();
		352	libraryE.setAttribute(VERSION, VER_1); // NOI18N
		353	libraryE.appendChild(doc.createElement(NAME)).appendChild(doc.createTextNode(library.getName())); // NOI18N
		354	libraryE.appendChild(doc.createElement(TYPE)).appendChild(doc.createTextNode(library.getType())); // NOI18N
		355	String description = library.getDescription();
		356	if (description != null && description.length() > 0) {
		357	libraryE.appendChild(doc.createElement(DESCRIPTION)).appendChild(doc.createTextNode(description)); // NOI18N
		358	}
		359	String localizingBundle = library.getLocalizingBundle();
		360	if (localizingBundle != null && localizingBundle.length() > 0) {
		361	libraryE.appendChild(doc.createElement(BUNDLE)).appendChild(doc.createTextNode(localizingBundle)); // NOI18N
		362	}
		363	String displayname = Util.getDisplayName(library);
		364	if (displayname != null) {
		365	libraryE.appendChild(doc.createElement(DISPLAY_NAME)).appendChild(doc.createTextNode(displayname)); // NOI18N
		366	}
		367	for (String vtype : libraryTypeProvider.getSupportedVolumeTypes()) {
		368	Element volumeE = (Element) libraryE.appendChild(doc.createElement(VOLUME)); // NOI18N
		369	volumeE.appendChild(doc.createElement(TYPE)).appendChild(doc.createTextNode(vtype)); // NOI18N
		370	List<URL> volume = library.getContent(vtype);
		371	if (volume != null) {
		372	//If null -> broken library, repair it.
		373	for (URL url : volume) {
		374	volumeE.appendChild(doc.createElement(RESOURCE)).appendChild(doc.createTextNode(url.toString())); // NOI18N
		375	}
		376	}
		377	}
		378	return doc;
		379	}
		380
		381	private static Document createLibraryDefinition2(
		382	final @NonNull LibraryImplementation library,
		383	final @NonNull LibraryTypeProvider libraryTypeProvider) {
		384	final Document doc = XMLUtil.createDocument(LIBRARY, LIBRARY_NS, null, null);
		385	final Element libraryE = doc.getDocumentElement();
		386	libraryE.setAttribute(VERSION, VER_2); // NOI18N
		387	libraryE.appendChild(doc.createElementNS(LIBRARY_NS, NAME)).appendChild(doc.createTextNode(library.getName())); // NOI18N
		388	libraryE.appendChild(doc.createElementNS(LIBRARY_NS, TYPE)).appendChild(doc.createTextNode(library.getType())); // NOI18N
		389	String description = library.getDescription();
		390	if (description != null && description.length() > 0) {
		391	libraryE.appendChild(doc.createElementNS(LIBRARY_NS, DESCRIPTION)).appendChild(doc.createTextNode(description)); // NOI18N
		392	}
393	String localizingBundle = library.getLocalizingBundle();
394	if (localizingBundle != null && localizingBundle.length() > 0) {
395	libraryE.appendChild(doc.createElementNS(LIBRARY_NS, BUNDLE)).appendChild(doc.createTextNode(localizingBundle)); // NOI18N
396	}
397	String displayname = Util.getDisplayName(library);
398	if (displayname != null) {
399	libraryE.appendChild(doc.createElementNS(LIBRARY_NS, DISPLAY_NAME)).appendChild(doc.createTextNode(displayname)); // NOI18N
400	}
401	for (String vtype : libraryTypeProvider.getSupportedVolumeTypes()) {
402	Element volumeE = (Element) libraryE.appendChild(doc.createElementNS(LIBRARY_NS,VOLUME)); // NOI18N
403	volumeE.appendChild(doc.createElementNS(LIBRARY_NS, TYPE)).appendChild(doc.createTextNode(vtype)); // NOI18N
404	List<URL> volume = library.getContent(vtype);
405	if (volume != null) {
406	for (URL url : volume) {
407	volumeE.appendChild(doc.createElementNS(LIBRARY_NS, RESOURCE)).appendChild(doc.createTextNode(url.toString())); // NOI18N
408	}
409	}
410	}
411	return doc;
412	}
284	}	413	}
285		414




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

import java.util.Map;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.modules.project.libraries.ui.ProxyLibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.NamedLibraryImplementation;
import org.openide.filesystems.FileObject;
import org.openide.util.NbBundle;

/**
 *
 * @author Tomas Zezula
 */
public class Util {

    private static final Logger LOG = Logger.getLogger(Util.class.getName());
    private static Map<LibraryImplementation,FileObject> sources = new WeakHashMap<LibraryImplementation,FileObject>();

    private Util(){}

    public static @NonNull String getLocalizedName(LibraryImplementation impl) {
        if (supportsDisplayName(impl) && ((NamedLibraryImplementation)impl).getDisplayName() != null) {
            return ((NamedLibraryImplementation)impl).getDisplayName();
        }
        final FileObject src = sources.get(impl);
        if (src != null) {
            Object obj = src.getAttribute("displayName"); // NOI18N
            if (obj instanceof String) {
                return (String)obj;
            }
        }
        if (impl instanceof ProxyLibraryImplementation) {
            String proxiedName = getLocalizedName(((ProxyLibraryImplementation)impl).getOriginal());
            if (proxiedName != null) {
                return proxiedName;
            }
        }

        return getLocalizedString(impl.getLocalizingBundle(), impl.getName());
    }

    public static boolean supportsDisplayName(final @NonNull LibraryImplementation impl) {
        assert impl != null;
        if (impl instanceof ProxyLibraryImplementation) {
            return supportsDisplayName(((ProxyLibraryImplementation)impl).getOriginal());
        }
        return impl instanceof NamedLibraryImplementation;
    }

    public static @CheckForNull String getDisplayName (final @NonNull LibraryImplementation impl) {
        return supportsDisplayName(impl) ?
                ((NamedLibraryImplementation)impl).getDisplayName() :
                null;
    }

    public static boolean setDisplayName(
            final @NonNull LibraryImplementation impl,
            final @NullAllowed String name) {
        if (supportsDisplayName(impl)) {
            ((NamedLibraryImplementation)impl).setDisplayName(name);
            return true;

        } else {
            return false;
        }
    }

    public static void registerSource(
        final @NonNull LibraryImplementation impl,
        final @NonNull FileObject descriptorFile) {
        sources.put(impl, descriptorFile);
    }


    private static String getLocalizedString (
            final @NullAllowed String bundleResourceName,
            final @NullAllowed String key) {
        if (key == null) {
            return null;
        }
        if (bundleResourceName == null) {
            return key;
        }
        final ResourceBundle bundle;
        try {
            bundle = NbBundle.getBundle(bundleResourceName);
        } catch (MissingResourceException mre) {
            // Bundle should have existed.
            LOG.log(Level.INFO, "Wrong resource bundle", mre);      //NOI18N
            return key;
        }
        try {
            return bundle.getString (key);
        } catch (MissingResourceException mre) {
            // No problem, not specified.
            return key;
        }
    }
}




made subject to such option by the copyright holder.
-->
<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
            targetNamespace="http://www.netbeans.org/ns/library-declaration/2"
            xmlns="http://www.netbeans.org/ns/library-declaration/2"
            elementFormDefault="qualified">
    <xsd:element name="library">
        <xsd:complexType>
            <xsd:sequence>
                <xsd:element name="name" type="xsd:token"/>
                <xsd:element name="type" type="xsd:token"/>
                <xsd:element name="description" type="xsd:string" minOccurs="0" />
                <xsd:element name="localizing-bundle" type="xsd:string" minOccurs="0"/>
                <xsd:element name="display-name" type="xsd:string" minOccurs="0"/>
                <xsd:element name="volume" type="volume" minOccurs="0" maxOccurs="unbounded"/>
                    </xsd:simpleType>
                </xsd:element>
                <xsd:element name="explicit-platform" minOccurs="0">
                    <xsd:complexType>
                        <xsd:attribute name="explicit-source-supported" use="required">
                            <xsd:simpleType>
                                <xsd:restriction base="xsd:NMTOKEN">
                                    <xsd:enumeration value="true"/>
                                    <xsd:enumeration value="false"/>
                                </xsd:restriction>
                            </xsd:simpleType>
                        </xsd:attribute>
                    </xsd:complexType>
                </xsd:element>
            </xsd:sequence>
            <xsd:attribute name="version" use="required">
                <xsd:simpleType>
                    <xsd:restriction base="xsd:NMTOKEN">
                        <xsd:enumeration value="2.0"/>
                    </xsd:restriction>
                </xsd:simpleType>
            </xsd:attribute>
        </xsd:complexType>
    </xsd:element>

    <xsd:complexType name="volume">
        <xsd:sequence>
            <xsd:element name="type" type="xsd:token"/>
            <xsd:element name="resource" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/>
        </xsd:sequence>
    </xsd:complexType>
</xsd:schema>

Lines 56-61 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/resources/mf-layer.xml (+6 lines)
56	</folder>	56	</folder>
57	</folder>	57	</folder>
58		58
		59	<folder name="ProjectXMLCatalog">
		60	<folder name="library-declaration">
		61	<file name="2.xsd" url="library-declaration-2_0.xsd"/>
		62	</folder>
		63	</folder>
		64
59	<!-- Create well known SFS folders. -->	65	<!-- Create well known SFS folders. -->
60	<folder name="org-netbeans-api-project-libraries">	66	<folder name="org-netbeans-api-project-libraries">
61	<folder name="Libraries"/>	67	<folder name="Libraries"/>

Lines 51-57 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/ui/Bundle.properties (-1 lines)
51		51
52	ERR_ExistingName=Library {0} already exists.	52	ERR_ExistingName=Library {0} already exists.
53	ERR_InvalidName=The library name is not valid.	53	ERR_InvalidName=The library name is not valid.
54	ERR_InvalidCharacters=The library name contains invalid characters
55		54
56	CTL_LibrariesManager=&Libraries	55	CTL_LibrariesManager=&Libraries
57		56




import java.util.Collections;
import java.util.Comparator;
import java.util.List;
import java.util.regex.Pattern;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
import java.util.WeakHashMap;
import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.JComponent;
import javax.swing.JPanel;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.netbeans.api.annotations.common.NonNull;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.modules.project.libraries.LibraryTypeRegistry;
import org.netbeans.modules.project.libraries.Util;
import org.netbeans.spi.project.libraries.LibraryCustomizerContext;
import org.netbeans.spi.project.libraries.LibraryImplementation;
import org.netbeans.spi.project.libraries.LibraryStorageArea;

import org.openide.NotifyDescriptor;
import org.openide.explorer.ExplorerManager;
import org.openide.explorer.view.BeanTreeView;
import org.openide.filesystems.FileObject;
import org.openide.filesystems.FileUtil;
import org.openide.loaders.DataFolder;
import org.openide.nodes.AbstractNode;


public final class LibrariesCustomizer extends JPanel implements ExplorerManager.Provider, HelpCtx.Provider {

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

    private ExplorerManager manager;
    private LibrariesModel model;
    private BeanTreeView libraries;

        }
    }

    @Override
    public HelpCtx getHelpCtx() {
        return new HelpCtx( LibrariesCustomizer.class );
    }

        }
    }

    @Override
    public void addNotify() {
        super.addNotify();
        expandTree();
        this.libraries.requestFocus();
    }    
    
    @Override
    public ExplorerManager getExplorerManager () {
        if (this.manager == null) {
            this.manager = new ExplorerManager ();
            this.manager.addPropertyChangeListener (new PropertyChangeListener() {
                @Override
                public void propertyChange (PropertyChangeEvent event) {
                    if (ExplorerManager.PROP_SELECTED_NODES.equals(event.getPropertyName())) {
                        Node[] nodes = (Node[]) event.getNewValue ();

                }
            });
            this.manager.addVetoableChangeListener(new VetoableChangeListener() {
                @Override
                public void vetoableChange(PropertyChangeEvent event) throws PropertyVetoException {
                    if (ExplorerManager.PROP_SELECTED_NODES.equals(event.getPropertyName())) {
                        Node[] nodes = (Node[]) event.getNewValue();

        this.libraryName.setEnabled(false);
        this.libraryName.addActionListener(
                new ActionListener () {
                    @Override
                    public void actionPerformed(ActionEvent e) {
                        nameChanged();
                    }

        boolean editable = model.isLibraryEditable (impl);
        this.libraryName.setEnabled(editable);
        this.deleteButton.setEnabled(editable);
        this.libraryName.setText (Util.getLocalizedName(impl));
        LibraryTypeProvider provider = nodes[0].getLookup().lookup(LibraryTypeProvider.class);
        if (provider == null)
            return;

            dlg = DialogDisplayer.getDefault().createDialog (dd);
            dlg.setVisible(true);
            if (dd.getValue() == DialogDescriptor.OK_OPTION) {
                final String libraryType = p.getLibraryType();
                final String currentLibraryName = p.getLibraryName();
                final String antLibraryName = createFreeAntLibraryName(currentLibraryName, model, area);
                LibraryImplementation impl;
                if (area != LibrariesModel.GLOBAL_AREA) {
                    impl = model.createArealLibrary(libraryType, currentLibraryName, area);

                        return;
                    }
                    impl = provider.createLibrary();
                    impl.setName(antLibraryName);
                }
                Util.setDisplayName(impl, currentLibraryName);
                model.addLibrary (impl);                
                forceTreeRecreation();
                String[] path = {impl.getType(), impl.getName()};

        }
    }//GEN-LAST:event_createLibrary

    static boolean isExistingDisplayName(
            final @NonNull LibrariesModel model,
            final @NonNull String name,
            final @NullAllowed LibraryStorageArea area) {
        for (LibraryImplementation lib : model.getLibraries()) {
            if (Util.getLocalizedName(lib).equals(name) && Utilities.compareObjects(model.getArea(lib), area)) {
                return true;
            }
        }
        return false;
    }

    private static boolean isValidName(
            final @NonNull LibrariesModel model,
            final @NonNull String name,
            final @NullAllowed LibraryStorageArea area) {
        for (LibraryImplementation lib : model.getLibraries()) {
            if (lib.getName().equals(name) && Utilities.compareObjects(model.getArea(lib), area)) {
                return false;

        return true;
    }


    public static String createFreeAntLibraryName(
            @NonNull String name,
            final @NonNull LibrariesModel model,
            final @NullAllowed LibraryStorageArea area) {
        // XXX: there is method in PropertyUtils
        // which should be used here but that would create dependency
        // on ant/project modules which is not desirable.
        if (!VALID_LIBRARY_NAME.matcher(name).matches()) {
            final StringBuilder sb = new StringBuilder(name);
            for (int i=0; i<sb.length(); i++) {
                if (!VALID_LIBRARY_NAME.matcher(sb.substring(i,i+1)).matches()) {
                    sb.replace(i,i+1,"_");
                }
            }
            name = sb.toString();
        }        
        String uniqueName = name;
        for (int i=2; !isValidName(model, uniqueName, area); i++) {
            uniqueName = String.format("%s_%d", name,i);    //NOI18N
        }
        return uniqueName;
    }

        
    public static String getLocalizedName(LibraryImplementation impl) {
        FileObject src = sources.get(impl);
        if (src != null) {
            Object obj = src.getAttribute("displayName"); // NOI18N
            if (obj instanceof String) {
                return (String)obj;
            }
        }
        if (impl instanceof ProxyLibraryImplementation) {
            String proxiedName = getLocalizedName(((ProxyLibraryImplementation)impl).getOriginal());
            if (proxiedName != null) {
                return proxiedName;
            }
        }

        return getLocalizedString(impl.getLocalizingBundle(), impl.getName());
    }

    static String getLocalizedString (String bundleResourceName, String key) {
        if (key == null) {
            return null;
        }
        if (bundleResourceName == null) {
            return key;
        }
        ResourceBundle bundle;
        try {
            bundle = NbBundle.getBundle(bundleResourceName);
        } catch (MissingResourceException mre) {
            // Bundle should have existed.
            LOG.log(Level.INFO, "Wrong resource bundle", mre);      //NOI18N
            return key;
        }
        try {
            return bundle.getString (key);
        } catch (MissingResourceException mre) {
            // No problem, not specified.
            return key;
        }
    }

    // Variables declaration - do not modify//GEN-BEGIN:variables
    private javax.swing.JButton createButton;
    private javax.swing.JButton deleteButton;

        }
        
        public String getDisplayName () {
            return Util.getLocalizedName(this.lib);
        }
        
    }




import java.util.logging.Level;
import java.util.logging.Logger;
import javax.swing.event.ChangeListener;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.modules.project.libraries.LibraryAccessor;
import org.netbeans.modules.project.libraries.Util;
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.LibraryImplementation2;
import org.netbeans.spi.project.libraries.LibraryStorageArea;
import org.netbeans.spi.project.libraries.NamedLibraryImplementation;
import org.openide.util.Exceptions;
import org.openide.util.Lookup;
import org.openide.util.ChangeSupport;

            if (area != null) {
                ArealLibraryProvider alp = area2Storage.get(area);
                assert alp != null : "Unknown area: " + area + " known areas: " + area2Storage.keySet();
                final LibraryImplementation2 createdLib = LibraryAccessor.createLibrary(alp, impl.getType(), impl.getName(), area, ((DummyArealLibrary) impl).contents);
                Util.setDisplayName(createdLib, Util.getDisplayName(impl));
            } else if (writableProvider != null) {
                writableProvider.addLibrary(impl);
            } else {


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

    private static final class DummyArealLibrary implements LibraryImplementation2, NamedLibraryImplementation {

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

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

        @Override
        public String getType() {
            return type;
        }

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

        @Override
        public String getDisplayName() {
            return displayName;
        }

        @Override
        public String getDescription() {
            return null;
        }

        @Override
        public String getLocalizingBundle() {
            return null;
        }

        @Override
        public List<URL> getContent(String volumeType) throws IllegalArgumentException {
            return convertURIsToURLs(getURIContent(volumeType));
        }
        
        @Override
        public List<URI> getURIContent(String volumeType) throws IllegalArgumentException {
            List<URI> content = contents.get(volumeType);
            if (content != null) {

            }
        }

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

        @Override
        public void setDisplayName(final @NullAllowed String displayName) {
            this.displayName = displayName;
        }

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

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

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

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

        @Override
        public void setContent(String volumeType, List<URL> path) throws IllegalArgumentException {
            setURIContent(volumeType, convertURLsToURIs(path));
        }

        @Override
        public void setURIContent(String volumeType, List<URI> path) throws IllegalArgumentException {
            contents.put(volumeType, path);
            pcs.firePropertyChange(LibraryImplementation.PROP_CONTENT, null, null);




import java.awt.Component;
import javax.swing.DefaultListCellRenderer;
import javax.swing.JList;
import org.netbeans.modules.project.libraries.Util;

class LibraryRenderer extends DefaultListCellRenderer {

    public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
        LibraryImplementation impl = (LibraryImplementation) value;
        return super.getListCellRendererComponent(list,
                Util.getLocalizedName(impl),
                index, isSelected, cellHasFocus);
    }





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;

    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) {
        this.model = model;

    private void nameChanged () {
        String name = this.name.getText();
        boolean valid = false;
        String message = "";    //NOI18N
        if (name.length() == 0) {
            message = NbBundle.getMessage(NewLibraryPanel.class,"ERR_InvalidName");
        } else if (LibrariesCustomizer.isExistingDisplayName(model, name, area)){
            message = NbBundle.getMessage(NewLibraryPanel.class, "ERR_ExistingName", name);
        } else {
            valid = true;
                if (isReasonableAntProperty(name)) {
                    message = " ";   //NOI18N
                } else {
                    valid = false;
                    message = NbBundle.getMessage(NewLibraryPanel.class,"ERR_InvalidCharacters");
                }
            }
            else {
                message = NbBundle.getMessage(NewLibraryPanel.class, "ERR_ExistingName", name);
            }
        }
        if (dd != null) {
            dd.setValid(valid);
        }
        this.status.setText(message);
    }
        
    private boolean isReasonableAntProperty(String name) {
        // XXX: there is method in PropertyUtils.isUsablePropertyName()
        // which should be used here but that would create dependency
        // on ant/project modules which is not desirable.
        // XXX: The restriction of display name should be fixed in promo F
        return VALID_LIBRARY_NAME.matcher(name).matches();
    }
    
    /** This method is called from within the constructor to
     * initialize the form.




import java.beans.PropertyChangeSupport;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeEvent;
import org.netbeans.api.annotations.common.NullAllowed;
import org.netbeans.modules.project.libraries.Util;

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

/**
 *
 * @author  tom
 */
public class ProxyLibraryImplementation implements NamedLibraryImplementation, PropertyChangeListener  {

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

    @SuppressWarnings("LeakingThisInConstructor")
    private ProxyLibraryImplementation (LibraryImplementation original, LibrariesModel model) {
        assert original != null && model != null;
        this.original = original;

        return this.original;
    }
    
    @Override
    public void addPropertyChangeListener(PropertyChangeListener l) {
        this.support.addPropertyChangeListener(l);
    }
    
    @Override
    public void removePropertyChangeListener(PropertyChangeListener l) {
        this.support.removePropertyChangeListener(l);
    }
    
    @Override
    public String getType() {
        return this.original.getType ();
    }
    
    
    @Override
    public synchronized List<URL> getContent(String volumeType) throws IllegalArgumentException {
        List<URL> result = null;
        if (newContents == null || (result = newContents.get(volumeType)) == null) {

        }
    }
    
    @Override
    public synchronized String getDescription() {
        if (this.newDescription != null) {
            return this.newDescription;

        }
    }
    
    @Override
    public synchronized String getName() {
        if (this.newName != null) {
            return this.newName;

            return this.original.getName ();
        }
    }

    @Override
    public String getDisplayName() {
        if (!Util.supportsDisplayName(original)) {
            throw new IllegalStateException("Original does not support displayName");   //NOI18N
        }
        synchronized (this) {
            return newDisplayName != null ? newDisplayName : Util.getDisplayName(original);
        }
    }
    
    @Override
    public synchronized void setContent(String volumeType, List<URL> path) throws IllegalArgumentException {
        if (this.newContents == null) {
            this.newContents = new HashMap<String,List<URL>>();

        this.support.firePropertyChange(PROP_CONTENT,null,null);        //NOI18N
    }
    
    @Override
    public synchronized void setDescription(String text) {
        String oldDescription = this.newDescription == null ? this.original.getDescription() : this.newDescription;
        this.newDescription = text;

        this.support.firePropertyChange(PROP_DESCRIPTION,oldDescription,this.newDescription);   //NOI18N
    }
    
    @Override
    public synchronized void setName(String name) {
        String oldName = this.newName == null ? this.original.getName() : this.newName;
        this.newName = name;

        this.support.firePropertyChange(PROP_NAME,oldName,this.newName);       //NOI18N
    }

    @Override
    public void setDisplayName(final @NullAllowed String displayName) {
        final String oldName;
        synchronized (this) {
            oldName = this.newDisplayName != null ? this.newDisplayName : Util.getDisplayName(original);
            this.newName = displayName;
            this.model.modifyLibrary(this);
        }
        this.support.firePropertyChange(PROP_DISPLAY_NAME, oldName, displayName);
    }


    @Override
    public String getLocalizingBundle() {
        return this.original.getLocalizingBundle();
    }

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

    @Override
    public void propertyChange(PropertyChangeEvent evt) {
        this.support.firePropertyChange(evt.getPropertyName(),evt.getOldValue(),evt.getNewValue());
    }


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

    @Override
    public boolean equals(Object obj) {
        if (obj instanceof ProxyLibraryImplementation) {
            return this.original.equals(((ProxyLibraryImplementation)obj).getOriginal());

            return false;
    }

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

    static class ProxyLibraryImplementation2 extends ProxyLibraryImplementation implements LibraryImplementation2, NamedLibraryImplementation {

        Map<String,List<URI>> newURIContents;
        

            return (LibraryImplementation2)getOriginal();
        }
        
        @Override
        public List<URI> getURIContent(String volumeType) throws IllegalArgumentException {
            List<URI> result = null;
            if (newURIContents == null || (result = newURIContents.get(volumeType)) == null) {

            }
        }

        @Override
        public void setURIContent(String volumeType, List<URI> path) throws IllegalArgumentException {
            if (newURIContents == null) {
                newURIContents = new HashMap<String,List<URI>>();

            getSupport().firePropertyChange(PROP_CONTENT,null,null);
        }
        
        @Override
        public final int hashCode() {
            return getOriginal().hashCode();
        }

        @Override
        public final boolean equals(Object obj) {
            if (obj instanceof ProxyLibraryImplementation2) {
                return getOriginal().equals(((ProxyLibraryImplementation2)obj).getOriginal());

                return false;
        }

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




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

import org.netbeans.api.annotations.common.CheckForNull;
import org.netbeans.api.annotations.common.NullAllowed;

/**
 * LibraryImplementation extension allowing setting/getting display name.
 * @author Tomas Zezula
 * @since org.netbeans.modules.project.libraries/1 1.31
 */
public interface NamedLibraryImplementation extends LibraryImplementation {

    /**
     * Name of displayName property.
     */
    String PROP_DISPLAY_NAME = "displayName";   //NOI18N

    /**
     * Sets the display name.
     * @param displayName the new value of the displayName.
     * If null resets the display name to the value provided
     * by the localizing bundle or the identifying name.
     */
    void setDisplayName(@NullAllowed String displayName);

    /**
     * Returns the display name if available or null.
     * @return the display name
     */
    @CheckForNull String getDisplayName();
}




        assertEquals("Libraries count",2,libs.length);
        LibraryImplementation impl = libs[0].getName().equals("Library2") ? libs[0] : libs[1];

        assertEquals("MyName", Util.getLocalizedName(impl));

        LibrariesModel model = new LibrariesModel();
        ProxyLibraryImplementation proxy = ProxyLibraryImplementation.createProxy(impl, model);

        assertEquals("MyName", Util.getLocalizedName(proxy));
    }

    public void testAddLibrary() throws Exception {

Return to bug 199253

Lines 512-518 Link Here

(-)a/java.project/src/org/netbeans/spi/java/project/support/ui/SharableLibrariesUtils.java (-1 / +12 lines)
512	NbBundle.getMessage(SharableLibrariesUtils.class, "ERR_LibraryExists", library.getDisplayName()),	512	NbBundle.getMessage(SharableLibrariesUtils.class, "ERR_LibraryExists", library.getDisplayName()),
513	NotifyDescriptor.WARNING_MESSAGE));	513	NotifyDescriptor.WARNING_MESSAGE));
514	} else {	514	} else {
515	man.createURILibrary(library.getType(), library.getName(), volumes);	515	final String name = library.getName();
		516	String displayName = library.getDisplayName();
		517	if (name.equals(displayName)) {
		518	//No need to set displayName when it's same as name
		519	displayName = null;
		520	}
		521	man.createURILibrary(
		522	library.getType(),
		523	name,
		524	displayName,
		525	library.getDescription(),
		526	volumes);
516	}	527	}
517	} catch (IOException ex) {	528	} catch (IOException ex) {
518	Exceptions.printStackTrace(ex);	529	Exceptions.printStackTrace(ex);

Lines 71-76 Link Here

(-)a/java.j2seplatform/src/org/netbeans/modules/java/j2seplatform/libraries/J2SELibraryTypeProvider.java (-2 / +37 lines)
71	import java.net.URI;	71	import java.net.URI;
72	import java.util.HashSet;	72	import java.util.HashSet;
73	import java.util.logging.Logger;	73	import java.util.logging.Logger;
		74	import org.netbeans.spi.project.libraries.NamedLibraryImplementation;
74	import org.openide.util.Exceptions;	75	import org.openide.util.Exceptions;
75	import org.openide.util.Lookup;	76	import org.openide.util.Lookup;
76	import org.openide.util.NbBundle;	77	import org.openide.util.NbBundle;
Lines 101-127 Link Here
101	VOLUME_TYPE_JAVADOC,	102	VOLUME_TYPE_JAVADOC,
102	}));	103	}));
103		104
		105	@Override
104	public String getLibraryType() {	106	public String getLibraryType() {
105	return LIBRARY_TYPE;	107	return LIBRARY_TYPE;
106	}	108	}
107		109
		110	@Override
108	public String getDisplayName () {	111	public String getDisplayName () {
109	return NbBundle.getMessage (J2SELibraryTypeProvider.class,"TXT_J2SELibraryType");	112	return NbBundle.getMessage (J2SELibraryTypeProvider.class,"TXT_J2SELibraryType");
110	}	113	}
111		114
		115	@Override
112	public String[] getSupportedVolumeTypes () {	116	public String[] getSupportedVolumeTypes () {
113	return VOLUME_TYPES;	117	return VOLUME_TYPES;
114	}	118	}
115		119
		120	@Override
116	public LibraryImplementation createLibrary() {	121	public LibraryImplementation createLibrary() {
117	return new J2SELibraryImpl ();	122	return new J2SELibraryImpl ();
118	}	123	}
119		124
120		125
		126	@Override
121	public void libraryCreated(final LibraryImplementation libraryImpl) {	127	public void libraryCreated(final LibraryImplementation libraryImpl) {
122	assert libraryImpl != null;	128	assert libraryImpl != null;
123	ProjectManager.mutex().postWriteRequest(	129	ProjectManager.mutex().postWriteRequest(
124	new Runnable () {	130	new Runnable () {
		131	@Override
125	public void run () {	132	public void run () {
126	try {	133	try {
127	EditableProperties props = PropertyUtils.getGlobalProperties();	134	EditableProperties props = PropertyUtils.getGlobalProperties();
Lines 137-145 Link Here
137	);	144	);
138	}	145	}
139		146
		147	@Override
140	public void libraryDeleted(final LibraryImplementation libraryImpl) {	148	public void libraryDeleted(final LibraryImplementation libraryImpl) {
141	assert libraryImpl != null;	149	assert libraryImpl != null;
142	ProjectManager.mutex().postWriteRequest(new Runnable () {	150	ProjectManager.mutex().postWriteRequest(new Runnable () {
		151	@Override
143	public void run() {	152	public void run() {
144	try {	153	try {
145	EditableProperties props = PropertyUtils.getGlobalProperties();	154	EditableProperties props = PropertyUtils.getGlobalProperties();
Lines 155-160 Link Here
155	});	164	});
156	}	165	}
157		166
		167	@Override
158	public Customizer getCustomizer(String volumeType) {	168	public Customizer getCustomizer(String volumeType) {
159	if (VOLUME_TYPES[0].equals(volumeType)\|\|	169	if (VOLUME_TYPES[0].equals(volumeType)\|\|
160	VOLUME_TYPES[1].equals(volumeType)\|\|	170	VOLUME_TYPES[1].equals(volumeType)\|\|
Lines 167-172 Link Here
167	}	177	}
168		178
169		179
		180	@Override
170	public Lookup getLookup() {	181	public Lookup getLookup() {
171	return Lookup.EMPTY;	182	return Lookup.EMPTY;
172	}	183	}
Lines 228-234 Link Here
228	}	239	}
229		240
230	//Like DefaultLibraryTypeProvider but in addition checks '/' on the end of folder URLs.	241	//Like DefaultLibraryTypeProvider but in addition checks '/' on the end of folder URLs.
231	private static class J2SELibraryImpl implements LibraryImplementation {	242	private static class J2SELibraryImpl implements NamedLibraryImplementation {
232	private String description;	243	private String description;
233		244
234	private Map<String,List<URL>> contents;	245	private Map<String,List<URL>> contents;
Lines 236-241 Link Here
236	// library 'binding name' as given by user	247	// library 'binding name' as given by user
237	private String name;	248	private String name;
238		249
		250	private String displayName;
		251
239	private String localizingBundle;	252	private String localizingBundle;
240		253
241	private List<PropertyChangeListener> listeners;	254	private List<PropertyChangeListener> listeners;
Lines 251-270 Link Here
251	}	264	}
252		265
253		266
		267	@Override
254	public String getType() {	268	public String getType() {
255	return LIBRARY_TYPE;	269	return LIBRARY_TYPE;
256	}	270	}
257		271
		272	@Override
258	public void setName(final String name) throws UnsupportedOperationException {	273	public void setName(final String name) throws UnsupportedOperationException {
259	String oldName = this.name;	274	String oldName = this.name;
260	this.name = name;	275	this.name = name;
261	this.firePropertyChange (PROP_NAME, oldName, this.name);	276	this.firePropertyChange (PROP_NAME, oldName, this.name);
262	}	277	}
263		278
		279	@Override
264	public String getName() {	280	public String getName() {
265	return name;	281	return name;
266	}	282	}
267		283
		284	@Override
		285	public void setDisplayName(String displayName) {
		286	this.displayName = displayName;
		287	}
		288
		289	@Override
		290	public String getDisplayName() {
		291	return this.displayName;
		292	}
		293
		294	@Override
268	public List<URL> getContent(String contentType) throws IllegalArgumentException {	295	public List<URL> getContent(String contentType) throws IllegalArgumentException {
269	List<URL> content = contents.get(contentType);	296	List<URL> content = contents.get(contentType);
270	if (content == null)	297	if (content == null)
Lines 272-277 Link Here
272	return Collections.unmodifiableList (content);	299	return Collections.unmodifiableList (content);
273	}	300	}
274		301
		302	@Override
275	public void setContent(final String contentType, List<URL> path) throws IllegalArgumentException {	303	public void setContent(final String contentType, List<URL> path) throws IllegalArgumentException {
276	if (path == null) {	304	if (path == null) {
277	throw new IllegalArgumentException ();	305	throw new IllegalArgumentException ();
Lines 311-347 Link Here
311	return checkedResources;	339	return checkedResources;
312	}	340	}
313		341
		342	@Override
314	public String getDescription () {	343	public String getDescription () {
315	return this.description;	344	return this.description;
316	}	345	}
317		346
		347	@Override
318	public void setDescription (String text) {	348	public void setDescription (String text) {
319	String oldDesc = this.description;	349	String oldDesc = this.description;
320	this.description = text;	350	this.description = text;
321	this.firePropertyChange (PROP_DESCRIPTION, oldDesc, this.description);	351	this.firePropertyChange (PROP_DESCRIPTION, oldDesc, this.description);
322	}	352	}
323		353
		354	@Override
324	public String getLocalizingBundle() {	355	public String getLocalizingBundle() {
325	return this.localizingBundle;	356	return this.localizingBundle;
326	}	357	}
327		358
		359	@Override
328	public void setLocalizingBundle(String resourceName) {	360	public void setLocalizingBundle(String resourceName) {
329	this.localizingBundle = resourceName;	361	this.localizingBundle = resourceName;
330	}	362	}
331		363
		364	@Override
332	public synchronized void addPropertyChangeListener (PropertyChangeListener l) {	365	public synchronized void addPropertyChangeListener (PropertyChangeListener l) {
333	if (this.listeners == null)	366	if (this.listeners == null)
334	this.listeners = new ArrayList<PropertyChangeListener>();	367	this.listeners = new ArrayList<PropertyChangeListener>();
335	this.listeners.add (l);	368	this.listeners.add (l);
336	}	369	}
337		370
		371	@Override
338	public synchronized void removePropertyChangeListener (PropertyChangeListener l) {	372	public synchronized void removePropertyChangeListener (PropertyChangeListener l) {
339	if (this.listeners == null)	373	if (this.listeners == null)
340	return;	374	return;
341	this.listeners.remove (l);	375	this.listeners.remove (l);
342	}	376	}
343		377
344	public @Override String toString() {	378	@Override
		379	public String toString() {
345	return this.getClass().getName()+"[" + name + "]"; // NOI18N	380	return this.getClass().getName()+"[" + name + "]"; // NOI18N
346	}	381	}
347		382

Lines 76-81 Link Here

(-)a/project.ant/src/org/netbeans/modules/project/ant/ProjectLibraryProvider.java (-4 / +58 lines)
76	import javax.swing.JFileChooser;	76	import javax.swing.JFileChooser;
77	import javax.swing.event.ChangeListener;	77	import javax.swing.event.ChangeListener;
78	import javax.swing.filechooser.FileFilter;	78	import javax.swing.filechooser.FileFilter;
		79	import org.netbeans.api.annotations.common.NullAllowed;
79	import org.netbeans.api.project.Project;	80	import org.netbeans.api.project.Project;
80	import org.netbeans.api.project.ProjectManager;	81	import org.netbeans.api.project.ProjectManager;
81	import org.netbeans.api.project.libraries.Library;	82	import org.netbeans.api.project.libraries.Library;
Lines 91-96 Link Here
91	import org.netbeans.spi.project.libraries.LibraryImplementation2;	92	import org.netbeans.spi.project.libraries.LibraryImplementation2;
92	import org.netbeans.spi.project.libraries.LibraryProvider;	93	import org.netbeans.spi.project.libraries.LibraryProvider;
93	import org.netbeans.spi.project.libraries.LibraryStorageArea;	94	import org.netbeans.spi.project.libraries.LibraryStorageArea;
		95	import org.netbeans.spi.project.libraries.NamedLibraryImplementation;
94	import org.netbeans.spi.project.libraries.support.LibrariesSupport;	96	import org.netbeans.spi.project.libraries.support.LibrariesSupport;
95	import org.netbeans.spi.project.support.ant.AntProjectEvent;	97	import org.netbeans.spi.project.support.ant.AntProjectEvent;
96	import org.netbeans.spi.project.support.ant.AntProjectHelper;	98	import org.netbeans.spi.project.support.ant.AntProjectHelper;
Lines 130-135 Link Here
130	private static final String NAMESPACE = "http://www.netbeans.org/ns/ant-project-libraries/1"; // NOI18N	132	private static final String NAMESPACE = "http://www.netbeans.org/ns/ant-project-libraries/1"; // NOI18N
131	private static final String EL_LIBRARIES = "libraries"; // NOI18N	133	private static final String EL_LIBRARIES = "libraries"; // NOI18N
132	private static final String EL_DEFINITIONS = "definitions"; // NOI18N	134	private static final String EL_DEFINITIONS = "definitions"; // NOI18N
		135	private static final String SFX_DISPLAY_NAME = "displayName"; //NOI18N
133		136
134	private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);	137	private final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
135	private AntProjectListener apl;	138	private AntProjectListener apl;
Lines 496-501 Link Here
496	String name = entry.getKey();	499	String name = entry.getKey();
497	String type = "j2se"; // NOI18N	500	String type = "j2se"; // NOI18N
498	String description = null;	501	String description = null;
		502	String displayName = null;
499	Map<String,List<URI>> contents = new HashMap<String,List<URI>>();	503	Map<String,List<URI>> contents = new HashMap<String,List<URI>>();
500	for (Map.Entry<String,String> subentry : entry.getValue().entrySet()) {	504	for (Map.Entry<String,String> subentry : entry.getValue().entrySet()) {
501	String k = subentry.getKey();	505	String k = subentry.getKey();
Lines 505-510 Link Here
505	// XXX currently overriding display name is not supported	509	// XXX currently overriding display name is not supported
506	} else if (k.equals("description")) { // NOI18N	510	} else if (k.equals("description")) { // NOI18N
507	description = subentry.getValue();	511	description = subentry.getValue();
		512	} else if (k.equals(SFX_DISPLAY_NAME)) { //NOI18N
		513	displayName = subentry.getValue();
508	} else {	514	} else {
509	final String[] path = sanitizeHttp(subentry.getKey(), PropertyUtils.tokenizePath(subentry.getValue()));	515	final String[] path = sanitizeHttp(subentry.getKey(), PropertyUtils.tokenizePath(subentry.getValue()));
510	List<URI> volume = new ArrayList<URI>(path.length);	516	List<URI> volume = new ArrayList<URI>(path.length);
Lines 535-541 Link Here
535	contents.put(k, volume);	541	contents.put(k, volume);
536	}	542	}
537	}	543	}
538	libs.put(name, new ProjectLibraryImplementation(def.mainPropertiesFile, def.privatePropertiesFile, type, name, description, contents));	544	libs.put(
		545	name,
		546	new ProjectLibraryImplementation(
		547	def.mainPropertiesFile,
		548	def.privatePropertiesFile,
		549	type,
		550	name,
		551	description,
		552	displayName,
		553	contents));
539	}	554	}
540	return libs;	555	return libs;
541	}	556	}
Lines 642-653 Link Here
642	return result.toArray(new String[result.size()]);	657	return result.toArray(new String[result.size()]);
643	}	658	}
644		659
645	static final class ProjectLibraryImplementation implements LibraryImplementation2 {	660	static final class ProjectLibraryImplementation implements LibraryImplementation2, NamedLibraryImplementation {
646		661
647	final File mainPropertiesFile, privatePropertiesFile;	662	final File mainPropertiesFile, privatePropertiesFile;
648	final String type;	663	final String type;
649	String name;	664	String name;
650	String description;	665	String description;
		666	String displayName;
651	Map<String,List<URI>> contents;	667	Map<String,List<URI>> contents;
652	final PropertyChangeSupport pcs = new PropertyChangeSupport(this);	668	final PropertyChangeSupport pcs = new PropertyChangeSupport(this);
653		669
Lines 675-686 Link Here
675	return null;	691	return null;
676	}	692	}
677		693
678	ProjectLibraryImplementation(File mainPropertiesFile, File privatePropertiesFile, String type, String name, String description, Map<String,List<URI>> contents) {	694	ProjectLibraryImplementation(
		695	File mainPropertiesFile,
		696	File privatePropertiesFile,
		697	String type,
		698	String name,
		699	final @NullAllowed String description,
		700	final @NullAllowed String displayName,
		701	Map<String,List<URI>> contents) {
679	this.mainPropertiesFile = mainPropertiesFile;	702	this.mainPropertiesFile = mainPropertiesFile;
680	this.privatePropertiesFile = privatePropertiesFile;	703	this.privatePropertiesFile = privatePropertiesFile;
681	this.type = type;	704	this.type = type;
682	this.name = name;	705	this.name = name;
683	this.description = description;	706	this.description = description;
		707	this.displayName = displayName;
684	this.contents = contents;	708	this.contents = contents;
685	}	709	}
686		710
Lines 704-709 Link Here
704	return null;	728	return null;
705	}	729	}
706		730
		731	@Override
		732	public String getDisplayName() {
		733	return displayName;
		734	}
		735
707	public List<URL> getContent(String volumeType) throws IllegalArgumentException {	736	public List<URL> getContent(String volumeType) throws IllegalArgumentException {
708	List<URI> uris = getURIContent(volumeType);	737	List<URI> uris = getURIContent(volumeType);
709	List<URL> resolvedUrls = new ArrayList<URL>(uris.size());	738	List<URL> resolvedUrls = new ArrayList<URL>(uris.size());
Lines 807-812 Link Here
807	throw new UnsupportedOperationException();	836	throw new UnsupportedOperationException();
808	}	837	}
809		838
		839	@Override
		840	public void setDisplayName(final @NullAllowed String displayName) {
		841	if (Utilities.compareObjects(this.displayName, displayName)) {
		842	return;
		843	}
		844	final String oldDisplayName = this.displayName;
		845	this.displayName = displayName;
		846	try {
		847	final String key = String.format("libs.%s.%s",name, SFX_DISPLAY_NAME); //NOI18N
		848	replaceProperty(
		849	mainPropertiesFile,
		850	false,
		851	key,
		852	displayName == null ? new String[0] : new String[]{displayName});
		853	} catch (IOException x) {
		854	throw new IllegalArgumentException(x);
		855	}
		856	pcs.firePropertyChange(LibraryImplementation.PROP_CONTENT, oldDisplayName, displayName);
		857	}
		858
810	public void addPropertyChangeListener(PropertyChangeListener l) {	859	public void addPropertyChangeListener(PropertyChangeListener l) {
811	pcs.addPropertyChangeListener(l);	860	pcs.addPropertyChangeListener(l);
812	}	861	}
Lines 1169-1175 Link Here
1169	index++;	1218	index++;
1170	}	1219	}
1171	}	1220	}
1172	return man.createURILibrary(lib.getType(), name, content);	1221	String displayName = lib.getDisplayName();
		1222	if (name.equals(displayName)) {
		1223	//No need to set displayName when it's same as name
		1224	displayName = null;
		1225	}
		1226	return man.createURILibrary(lib.getType(), name, displayName, lib.getDescription(), content);
1173	}	1227	}
1174	});	1228	});
1175	} catch (MutexException ex) {	1229	} catch (MutexException ex) {

Lines 107-112 Link Here

(-)a/project.libraries/apichanges.xml (+16 lines)
107	<!-- ACTUAL CHANGES BEGIN HERE: -->	107	<!-- ACTUAL CHANGES BEGIN HERE: -->
108	<changes>	108	<changes>
109		109
		110	<change id="library-display-name">
		111	<api name="general"/>
		112	<summary>Allow user created library to provide display name</summary>
		113	<version major="1" minor="31"/>
		114	<date day="14" month="6" year="2011"/>
		115	<author login="tzezula"/>
		116	<compatibility addition="yes"/>
		117	<description>
		118	Added <code>displayName</code> property into the <code>Library</code>'s SPI
		119	allowing an implementor to provide the a display name of the <code>Library</code>
		120	which differs from the system (identifying) name.
		121	</description>
		122	<class package="org.netbeans.api.project.libraries" name="LibraryManager"/>
		123	<class package="org.netbeans.spi.project.libraries" name="NamedLibraryImplementation"/>
		124	<issue number="46863"/>
		125	</change>
110	<change id="use-uri-for-relative-paths">	126	<change id="use-uri-for-relative-paths">
111	<api name="general"/>	127	<api name="general"/>
112	<summary>URI used for relative library entries instead of URL</summary>	128	<summary>URI used for relative library entries instead of URL</summary>

Line 0 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/Util.java (+148 lines)
		1	/*
		2	* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
		3	*
		4	* Copyright 2011 Oracle and/or its affiliates. All rights reserved.
		5	*
		6	* Oracle and Java are registered trademarks of Oracle and/or its affiliates.
		7	* Other names may be trademarks of their respective owners.
		8	*
		9	* The contents of this file are subject to the terms of either the GNU
		10	* General Public License Version 2 only ("GPL") or the Common
		11	* Development and Distribution License("CDDL") (collectively, the
		12	* "License"). You may not use this file except in compliance with the
		13	* License. You can obtain a copy of the License at
		14	* http://www.netbeans.org/cddl-gplv2.html
		15	* or nbbuild/licenses/CDDL-GPL-2-CP. See the License for the
		16	* specific language governing permissions and limitations under the
		17	* License. When distributing the software, include this License Header
		18	* Notice in each file and include the License file at
		19	* nbbuild/licenses/CDDL-GPL-2-CP. Oracle designates this
		20	* particular file as subject to the "Classpath" exception as provided
		21	* by Oracle in the GPL Version 2 section of the License file that
		22	* accompanied this code. If applicable, add the following below the
		23	* License Header, with the fields enclosed by brackets [] replaced by
		24	* your own identifying information:
		25	* "Portions Copyrighted [year] [name of copyright owner]"
		26	*
		27	* If you wish your version of this file to be governed by only the CDDL
		28	* or only the GPL Version 2, indicate your decision by adding
		29	* "[Contributor] elects to include this software in this distribution
		30	* under the [CDDL or GPL Version 2] license." If you do not indicate a
		31	* single choice of license, a recipient has the option to distribute
		32	* your version of this file under either the CDDL, the GPL Version 2 or
		33	* to extend the choice of license to its licensees as provided above.
		34	* However, if you add GPL Version 2 code and therefore, elected the GPL
		35	* Version 2 license, then the option applies only if the new code is
		36	* made subject to such option by the copyright holder.
		37	*
		38	* Contributor(s):
		39	*
		40	* Portions Copyrighted 2011 Sun Microsystems, Inc.
		41	*/
		42	package org.netbeans.modules.project.libraries;
		43
		44	import java.util.Map;
		45	import java.util.MissingResourceException;
		46	import java.util.ResourceBundle;
		47	import java.util.WeakHashMap;
		48	import java.util.logging.Level;
		49	import java.util.logging.Logger;
		50	import org.netbeans.api.annotations.common.CheckForNull;
		51	import org.netbeans.api.annotations.common.NonNull;
		52	import org.netbeans.api.annotations.common.NullAllowed;
		53	import org.netbeans.modules.project.libraries.ui.ProxyLibraryImplementation;
		54	import org.netbeans.spi.project.libraries.LibraryImplementation;
		55	import org.netbeans.spi.project.libraries.NamedLibraryImplementation;
		56	import org.openide.filesystems.FileObject;
		57	import org.openide.util.NbBundle;
		58
		59	/**
		60	*
		61	* @author Tomas Zezula
		62	*/
		63	public class Util {
		64
65	private static final Logger LOG = Logger.getLogger(Util.class.getName());
66	private static Map<LibraryImplementation,FileObject> sources = new WeakHashMap<LibraryImplementation,FileObject>();
67
68	private Util(){}
69
70	public static @NonNull String getLocalizedName(LibraryImplementation impl) {
71	if (supportsDisplayName(impl) && ((NamedLibraryImplementation)impl).getDisplayName() != null) {
72	return ((NamedLibraryImplementation)impl).getDisplayName();
73	}
74	final FileObject src = sources.get(impl);
75	if (src != null) {
76	Object obj = src.getAttribute("displayName"); // NOI18N
77	if (obj instanceof String) {
78	return (String)obj;
79	}
80	}
81	if (impl instanceof ProxyLibraryImplementation) {
82	String proxiedName = getLocalizedName(((ProxyLibraryImplementation)impl).getOriginal());
83	if (proxiedName != null) {
84	return proxiedName;
85	}
86	}
87
88	return getLocalizedString(impl.getLocalizingBundle(), impl.getName());
89	}
90
91	public static boolean supportsDisplayName(final @NonNull LibraryImplementation impl) {
92	assert impl != null;
93	if (impl instanceof ProxyLibraryImplementation) {
94	return supportsDisplayName(((ProxyLibraryImplementation)impl).getOriginal());
95	}
96	return impl instanceof NamedLibraryImplementation;
97	}
98
99	public static @CheckForNull String getDisplayName (final @NonNull LibraryImplementation impl) {
100	return supportsDisplayName(impl) ?
101	((NamedLibraryImplementation)impl).getDisplayName() :
102	null;
103	}
104
105	public static boolean setDisplayName(
106	final @NonNull LibraryImplementation impl,
107	final @NullAllowed String name) {
108	if (supportsDisplayName(impl)) {
109	((NamedLibraryImplementation)impl).setDisplayName(name);
110	return true;
111
112	} else {
113	return false;
114	}
115	}
116
117	public static void registerSource(
118	final @NonNull LibraryImplementation impl,
119	final @NonNull FileObject descriptorFile) {
120	sources.put(impl, descriptorFile);
121	}
122
123
124	private static String getLocalizedString (
125	final @NullAllowed String bundleResourceName,
126	final @NullAllowed String key) {
127	if (key == null) {
128	return null;
129	}
130	if (bundleResourceName == null) {
131	return key;
132	}
133	final ResourceBundle bundle;
134	try {
135	bundle = NbBundle.getBundle(bundleResourceName);
136	} catch (MissingResourceException mre) {
137	// Bundle should have existed.
138	LOG.log(Level.INFO, "Wrong resource bundle", mre); //NOI18N
139	return key;
140	}
141	try {
142	return bundle.getString (key);
143	} catch (MissingResourceException mre) {
144	// No problem, not specified.
145	return key;
146	}
147	}
148	}

Lines 44-76 Link Here

(-)a/java.j2seproject/src/org/netbeans/modules/java/j2seproject/resources/j2se-project.xsd (-22 / +22 lines)
44	made subject to such option by the copyright holder.	44	made subject to such option by the copyright holder.
45	-->	45	-->
46	<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"	46	<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema"
47	targetNamespace="http://www.netbeans.org/ns/j2se-project/1"	47	targetNamespace="http://www.netbeans.org/ns/library-declaration/2"
48	xmlns="http://www.netbeans.org/ns/j2se-project/1"	48	xmlns="http://www.netbeans.org/ns/library-declaration/2"
49	elementFormDefault="qualified">	49	elementFormDefault="qualified">
50	<xsd:element name="data">	50	<xsd:element name="library">
51	<xsd:complexType>	51	<xsd:complexType>
52	<xsd:sequence>	52	<xsd:sequence>
53	<xsd:element name="name" type="xsd:token"/>	53	<xsd:element name="name" type="xsd:token"/>
54	<xsd:element name="minimum-ant-version" minOccurs="0">	54	<xsd:element name="type" type="xsd:token"/>
55	<xsd:simpleType>	55	<xsd:element name="description" type="xsd:string" minOccurs="0" />
56	<xsd:restriction base="xsd:NMTOKEN">	56	<xsd:element name="localizing-bundle" type="xsd:string" minOccurs="0"/>
57	<xsd:enumeration value="1.6"/>	57	<xsd:element name="display-name" type="xsd:string" minOccurs="0"/>
58	</xsd:restriction>	58	<xsd:element name="volume" type="volume" minOccurs="0" maxOccurs="unbounded"/>
59	</xsd:simpleType>
60	</xsd:element>
61	<xsd:element name="explicit-platform" minOccurs="0">
62	<xsd:complexType>
63	<xsd:attribute name="explicit-source-supported" use="required">
64	<xsd:simpleType>
65	<xsd:restriction base="xsd:NMTOKEN">
66	<xsd:enumeration value="true"/>
67	<xsd:enumeration value="false"/>
68	</xsd:restriction>
69	</xsd:simpleType>
70	</xsd:attribute>
71	</xsd:complexType>
72	</xsd:element>
73	</xsd:sequence>	59	</xsd:sequence>
		60	<xsd:attribute name="version" use="required">
		61	<xsd:simpleType>
		62	<xsd:restriction base="xsd:NMTOKEN">
		63	<xsd:enumeration value="2.0"/>
		64	</xsd:restriction>
		65	</xsd:simpleType>
		66	</xsd:attribute>
74	</xsd:complexType>	67	</xsd:complexType>
75	</xsd:element>	68	</xsd:element>
		69
		70	<xsd:complexType name="volume">
		71	<xsd:sequence>
		72	<xsd:element name="type" type="xsd:token"/>
		73	<xsd:element name="resource" type="xsd:anyURI" minOccurs="0" maxOccurs="unbounded"/>
		74	</xsd:sequence>
		75	</xsd:complexType>
76	</xsd:schema>	76	</xsd:schema>

Lines 66-82 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/ui/LibrariesCustomizer.java (-60 / +57 lines)
66	import java.util.Collections;	66	import java.util.Collections;
67	import java.util.Comparator;	67	import java.util.Comparator;
68	import java.util.List;	68	import java.util.List;
69	import java.util.Map;	69	import java.util.regex.Pattern;
70	import java.util.MissingResourceException;
71	import java.util.ResourceBundle;
72	import java.util.WeakHashMap;
73	import java.util.logging.Level;
74	import java.util.logging.Logger;
75	import javax.swing.JComponent;	70	import javax.swing.JComponent;
76	import javax.swing.JPanel;	71	import javax.swing.JPanel;
77	import javax.swing.event.ChangeEvent;	72	import javax.swing.event.ChangeEvent;
78	import javax.swing.event.ChangeListener;	73	import javax.swing.event.ChangeListener;
		74	import org.netbeans.api.annotations.common.NonNull;
		75	import org.netbeans.api.annotations.common.NullAllowed;
79	import org.netbeans.modules.project.libraries.LibraryTypeRegistry;	76	import org.netbeans.modules.project.libraries.LibraryTypeRegistry;
		77	import org.netbeans.modules.project.libraries.Util;
80	import org.netbeans.spi.project.libraries.LibraryCustomizerContext;	78	import org.netbeans.spi.project.libraries.LibraryCustomizerContext;
81	import org.netbeans.spi.project.libraries.LibraryImplementation;	79	import org.netbeans.spi.project.libraries.LibraryImplementation;
82	import org.netbeans.spi.project.libraries.LibraryStorageArea;	80	import org.netbeans.spi.project.libraries.LibraryStorageArea;
Lines 86-92 Link Here
86	import org.openide.NotifyDescriptor;	84	import org.openide.NotifyDescriptor;
87	import org.openide.explorer.ExplorerManager;	85	import org.openide.explorer.ExplorerManager;
88	import org.openide.explorer.view.BeanTreeView;	86	import org.openide.explorer.view.BeanTreeView;
89	import org.openide.filesystems.FileObject;
90	import org.openide.filesystems.FileUtil;	87	import org.openide.filesystems.FileUtil;
91	import org.openide.loaders.DataFolder;	88	import org.openide.loaders.DataFolder;
92	import org.openide.nodes.AbstractNode;	89	import org.openide.nodes.AbstractNode;
Lines 102-109 Link Here
102		99
103	public final class LibrariesCustomizer extends JPanel implements ExplorerManager.Provider, HelpCtx.Provider {	100	public final class LibrariesCustomizer extends JPanel implements ExplorerManager.Provider, HelpCtx.Provider {
104		101
105	private static final Logger LOG = Logger.getLogger(LibrariesCustomizer.class.getName());	102	private static final Pattern VALID_LIBRARY_NAME = Pattern.compile("[-._a-zA-Z0-9]+"); // NOI18N
106
107	private ExplorerManager manager;	103	private ExplorerManager manager;
108	private LibrariesModel model;	104	private LibrariesModel model;
109	private BeanTreeView libraries;	105	private BeanTreeView libraries;
Lines 196-201 Link Here
196	}	192	}
197	}	193	}
198		194
		195	@Override
199	public HelpCtx getHelpCtx() {	196	public HelpCtx getHelpCtx() {
200	return new HelpCtx( LibrariesCustomizer.class );	197	return new HelpCtx( LibrariesCustomizer.class );
201	}	198	}
Lines 210-225 Link Here
210	}	207	}
211	}	208	}
212		209
		210	@Override
213	public void addNotify() {	211	public void addNotify() {
214	super.addNotify();	212	super.addNotify();
215	expandTree();	213	expandTree();
216	this.libraries.requestFocus();	214	this.libraries.requestFocus();
217	}	215	}
218		216
		217	@Override
219	public ExplorerManager getExplorerManager () {	218	public ExplorerManager getExplorerManager () {
220	if (this.manager == null) {	219	if (this.manager == null) {
221	this.manager = new ExplorerManager ();	220	this.manager = new ExplorerManager ();
222	this.manager.addPropertyChangeListener (new PropertyChangeListener() {	221	this.manager.addPropertyChangeListener (new PropertyChangeListener() {
		222	@Override
223	public void propertyChange (PropertyChangeEvent event) {	223	public void propertyChange (PropertyChangeEvent event) {
224	if (ExplorerManager.PROP_SELECTED_NODES.equals(event.getPropertyName())) {	224	if (ExplorerManager.PROP_SELECTED_NODES.equals(event.getPropertyName())) {
225	Node[] nodes = (Node[]) event.getNewValue ();	225	Node[] nodes = (Node[]) event.getNewValue ();
Lines 229-234 Link Here
229	}	229	}
230	});	230	});
231	this.manager.addVetoableChangeListener(new VetoableChangeListener() {	231	this.manager.addVetoableChangeListener(new VetoableChangeListener() {
		232	@Override
232	public void vetoableChange(PropertyChangeEvent event) throws PropertyVetoException {	233	public void vetoableChange(PropertyChangeEvent event) throws PropertyVetoException {
233	if (ExplorerManager.PROP_SELECTED_NODES.equals(event.getPropertyName())) {	234	if (ExplorerManager.PROP_SELECTED_NODES.equals(event.getPropertyName())) {
234	Node[] nodes = (Node[]) event.getNewValue();	235	Node[] nodes = (Node[]) event.getNewValue();
Lines 255-260 Link Here
255	this.libraryName.setEnabled(false);	256	this.libraryName.setEnabled(false);
256	this.libraryName.addActionListener(	257	this.libraryName.addActionListener(
257	new ActionListener () {	258	new ActionListener () {
		259	@Override
258	public void actionPerformed(ActionEvent e) {	260	public void actionPerformed(ActionEvent e) {
259	nameChanged();	261	nameChanged();
260	}	262	}
Lines 314-320 Link Here
314	boolean editable = model.isLibraryEditable (impl);	316	boolean editable = model.isLibraryEditable (impl);
315	this.libraryName.setEnabled(editable);	317	this.libraryName.setEnabled(editable);
316	this.deleteButton.setEnabled(editable);	318	this.deleteButton.setEnabled(editable);
317	this.libraryName.setText (getLocalizedName(impl));	319	this.libraryName.setText (Util.getLocalizedName(impl));
318	LibraryTypeProvider provider = nodes[0].getLookup().lookup(LibraryTypeProvider.class);	320	LibraryTypeProvider provider = nodes[0].getLookup().lookup(LibraryTypeProvider.class);
319	if (provider == null)	321	if (provider == null)
320	return;	322	return;
Lines 523-530 Link Here
523	dlg = DialogDisplayer.getDefault().createDialog (dd);	525	dlg = DialogDisplayer.getDefault().createDialog (dd);
524	dlg.setVisible(true);	526	dlg.setVisible(true);
525	if (dd.getValue() == DialogDescriptor.OK_OPTION) {	527	if (dd.getValue() == DialogDescriptor.OK_OPTION) {
526	String libraryType = p.getLibraryType();	528	final String libraryType = p.getLibraryType();
527	String currentLibraryName = p.getLibraryName();	529	final String currentLibraryName = p.getLibraryName();
		530	final String antLibraryName = createFreeAntLibraryName(currentLibraryName, model, area);
528	LibraryImplementation impl;	531	LibraryImplementation impl;
529	if (area != LibrariesModel.GLOBAL_AREA) {	532	if (area != LibrariesModel.GLOBAL_AREA) {
530	impl = model.createArealLibrary(libraryType, currentLibraryName, area);	533	impl = model.createArealLibrary(libraryType, currentLibraryName, area);
Lines 534-541 Link Here
534	return;	537	return;
535	}	538	}
536	impl = provider.createLibrary();	539	impl = provider.createLibrary();
537	impl.setName(currentLibraryName);	540	impl.setName(antLibraryName);
538	}	541	}
		542	Util.setDisplayName(impl, currentLibraryName);
539	model.addLibrary (impl);	543	model.addLibrary (impl);
540	forceTreeRecreation();	544	forceTreeRecreation();
541	String[] path = {impl.getType(), impl.getName()};	545	String[] path = {impl.getType(), impl.getName()};
Lines 564-570 Link Here
564	}	568	}
565	}//GEN-LAST:event_createLibrary	569	}//GEN-LAST:event_createLibrary
566		570
567	static boolean isValidName(LibrariesModel model, String name, LibraryStorageArea area) {	571	static boolean isExistingDisplayName(
		572	final @NonNull LibrariesModel model,
		573	final @NonNull String name,
		574	final @NullAllowed LibraryStorageArea area) {
		575	for (LibraryImplementation lib : model.getLibraries()) {
		576	if (Util.getLocalizedName(lib).equals(name) && Utilities.compareObjects(model.getArea(lib), area)) {
		577	return true;
		578	}
		579	}
		580	return false;
		581	}
		582
		583	private static boolean isValidName(
		584	final @NonNull LibrariesModel model,
		585	final @NonNull String name,
		586	final @NullAllowed LibraryStorageArea area) {
568	for (LibraryImplementation lib : model.getLibraries()) {	587	for (LibraryImplementation lib : model.getLibraries()) {
569	if (lib.getName().equals(name) && Utilities.compareObjects(model.getArea(lib), area)) {	588	if (lib.getName().equals(name) && Utilities.compareObjects(model.getArea(lib), area)) {
570	return false;	589	return false;
Lines 573-625 Link Here
573	return true;	592	return true;
574	}	593	}
575		594
576	private static Map<LibraryImplementation,FileObject> sources = new WeakHashMap<LibraryImplementation,FileObject>();	595
577	public static void registerSource(LibraryImplementation impl, FileObject descriptorFile) {	596	public static String createFreeAntLibraryName(
578	sources.put(impl, descriptorFile);	597	@NonNull String name,
		598	final @NonNull LibrariesModel model,
		599	final @NullAllowed LibraryStorageArea area) {
		600	// XXX: there is method in PropertyUtils
		601	// which should be used here but that would create dependency
		602	// on ant/project modules which is not desirable.
		603	if (!VALID_LIBRARY_NAME.matcher(name).matches()) {
		604	final StringBuilder sb = new StringBuilder(name);
		605	for (int i=0; i<sb.length(); i++) {
		606	if (!VALID_LIBRARY_NAME.matcher(sb.substring(i,i+1)).matches()) {
		607	sb.replace(i,i+1,"_");
		608	}
		609	}
		610	name = sb.toString();
		611	}
		612	String uniqueName = name;
		613	for (int i=2; !isValidName(model, uniqueName, area); i++) {
		614	uniqueName = String.format("%s_%d", name,i); //NOI18N
		615	}
		616	return uniqueName;
579	}	617	}
580		618
581		619
582	public static String getLocalizedName(LibraryImplementation impl) {
583	FileObject src = sources.get(impl);
584	if (src != null) {
585	Object obj = src.getAttribute("displayName"); // NOI18N
586	if (obj instanceof String) {
587	return (String)obj;
588	}
589	}
590	if (impl instanceof ProxyLibraryImplementation) {
591	String proxiedName = getLocalizedName(((ProxyLibraryImplementation)impl).getOriginal());
592	if (proxiedName != null) {
593	return proxiedName;
594	}
595	}
596
597	return getLocalizedString(impl.getLocalizingBundle(), impl.getName());
598	}
599
600	static String getLocalizedString (String bundleResourceName, String key) {
601	if (key == null) {
602	return null;
603	}
604	if (bundleResourceName == null) {
605	return key;
606	}
607	ResourceBundle bundle;
608	try {
609	bundle = NbBundle.getBundle(bundleResourceName);
610	} catch (MissingResourceException mre) {
611	// Bundle should have existed.
612	LOG.log(Level.INFO, "Wrong resource bundle", mre); //NOI18N
613	return key;
614	}
615	try {
616	return bundle.getString (key);
617	} catch (MissingResourceException mre) {
618	// No problem, not specified.
619	return key;
620	}
621	}
622
623	// Variables declaration - do not modify//GEN-BEGIN:variables	620	// Variables declaration - do not modify//GEN-BEGIN:variables
624	private javax.swing.JButton createButton;	621	private javax.swing.JButton createButton;
625	private javax.swing.JButton deleteButton;	622	private javax.swing.JButton deleteButton;
Lines 851-857 Link Here
851	}	848	}
852		849
853	public String getDisplayName () {	850	public String getDisplayName () {
854	return getLocalizedName(this.lib);	851	return Util.getLocalizedName(this.lib);
855	}	852	}
856		853
857	}	854	}

Lines 48-60 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/ui/LibraryRenderer.java (-1 / +2 lines)
48	import java.awt.Component;	48	import java.awt.Component;
49	import javax.swing.DefaultListCellRenderer;	49	import javax.swing.DefaultListCellRenderer;
50	import javax.swing.JList;	50	import javax.swing.JList;
		51	import org.netbeans.modules.project.libraries.Util;
51		52
52	class LibraryRenderer extends DefaultListCellRenderer {	53	class LibraryRenderer extends DefaultListCellRenderer {
53		54
54	public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {	55	public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
55	LibraryImplementation impl = (LibraryImplementation) value;	56	LibraryImplementation impl = (LibraryImplementation) value;
56	return super.getListCellRendererComponent(list,	57	return super.getListCellRendererComponent(list,
57	LibrariesCustomizer.getLocalizedName(impl),	58	Util.getLocalizedName(impl),
58	index, isSelected, cellHasFocus);	59	index, isSelected, cellHasFocus);
59	}	60	}
60		61

Lines 52-75 Link Here

(-)a/project.libraries/src/org/netbeans/modules/project/libraries/ui/ProxyLibraryImplementation.java (-4 / +50 lines)
52	import java.beans.PropertyChangeSupport;	52	import java.beans.PropertyChangeSupport;
53	import java.beans.PropertyChangeListener;	53	import java.beans.PropertyChangeListener;
54	import java.beans.PropertyChangeEvent;	54	import java.beans.PropertyChangeEvent;
		55	import org.netbeans.api.annotations.common.NullAllowed;
		56	import org.netbeans.modules.project.libraries.Util;
55		57
56	import org.netbeans.spi.project.libraries.LibraryImplementation;	58	import org.netbeans.spi.project.libraries.LibraryImplementation;
57	import org.netbeans.spi.project.libraries.LibraryImplementation2;	59	import org.netbeans.spi.project.libraries.LibraryImplementation2;
		60	import org.netbeans.spi.project.libraries.NamedLibraryImplementation;
58	import org.openide.util.WeakListeners;	61	import org.openide.util.WeakListeners;
59		62
60	/**	63	/**
61	*	64	*
62	* @author tom	65	* @author tom
63	*/	66	*/
64	public class ProxyLibraryImplementation implements LibraryImplementation, PropertyChangeListener {	67	public class ProxyLibraryImplementation implements NamedLibraryImplementation, PropertyChangeListener {
65		68
66	private final LibraryImplementation original;	69	private final LibraryImplementation original;
67	private final LibrariesModel model;	70	private final LibrariesModel model;
68	Map<String,List<URL>> newContents;	71	Map<String,List<URL>> newContents;
69	private String newName;	72	private String newName;
		73	private String newDisplayName;
70	private String newDescription;	74	private String newDescription;
71	private PropertyChangeSupport support;	75	private PropertyChangeSupport support;
72		76
		77	@SuppressWarnings("LeakingThisInConstructor")
73	private ProxyLibraryImplementation (LibraryImplementation original, LibrariesModel model) {	78	private ProxyLibraryImplementation (LibraryImplementation original, LibrariesModel model) {
74	assert original != null && model != null;	79	assert original != null && model != null;
75	this.original = original;	80	this.original = original;
Lines 98-116 Link Here
98	return this.original;	103	return this.original;
99	}	104	}
100		105
		106	@Override
101	public void addPropertyChangeListener(PropertyChangeListener l) {	107	public void addPropertyChangeListener(PropertyChangeListener l) {
102	this.support.addPropertyChangeListener(l);	108	this.support.addPropertyChangeListener(l);
103	}	109	}
104		110
		111	@Override
105	public void removePropertyChangeListener(PropertyChangeListener l) {	112	public void removePropertyChangeListener(PropertyChangeListener l) {
106	this.support.removePropertyChangeListener(l);	113	this.support.removePropertyChangeListener(l);
107	}	114	}
108		115
		116	@Override
109	public String getType() {	117	public String getType() {
110	return this.original.getType ();	118	return this.original.getType ();
111	}	119	}
112		120
113		121
		122	@Override
114	public synchronized List<URL> getContent(String volumeType) throws IllegalArgumentException {	123	public synchronized List<URL> getContent(String volumeType) throws IllegalArgumentException {
115	List<URL> result = null;	124	List<URL> result = null;
116	if (newContents == null \|\| (result = newContents.get(volumeType)) == null) {	125	if (newContents == null \|\| (result = newContents.get(volumeType)) == null) {
Lines 121-126 Link Here
121	}	130	}
122	}	131	}
123		132
		133	@Override
124	public synchronized String getDescription() {	134	public synchronized String getDescription() {
125	if (this.newDescription != null) {	135	if (this.newDescription != null) {
126	return this.newDescription;	136	return this.newDescription;
Lines 130-135 Link Here
130	}	140	}
131	}	141	}
132		142
		143	@Override
133	public synchronized String getName() {	144	public synchronized String getName() {
134	if (this.newName != null) {	145	if (this.newName != null) {
135	return this.newName;	146	return this.newName;
Lines 138-144 Link Here
138	return this.original.getName ();	149	return this.original.getName ();
139	}	150	}
140	}	151	}
		152
		153	@Override
		154	public String getDisplayName() {
		155	if (!Util.supportsDisplayName(original)) {
		156	throw new IllegalStateException("Original does not support displayName"); //NOI18N
		157	}
		158	synchronized (this) {
		159	return newDisplayName != null ? newDisplayName : Util.getDisplayName(original);
		160	}
		161	}
141		162
		163	@Override
142	public synchronized void setContent(String volumeType, List<URL> path) throws IllegalArgumentException {	164	public synchronized void setContent(String volumeType, List<URL> path) throws IllegalArgumentException {
143	if (this.newContents == null) {	165	if (this.newContents == null) {
144	this.newContents = new HashMap<String,List<URL>>();	166	this.newContents = new HashMap<String,List<URL>>();
Lines 148-153 Link Here
148	this.support.firePropertyChange(PROP_CONTENT,null,null); //NOI18N	170	this.support.firePropertyChange(PROP_CONTENT,null,null); //NOI18N
149	}	171	}
150		172
		173	@Override
151	public synchronized void setDescription(String text) {	174	public synchronized void setDescription(String text) {
152	String oldDescription = this.newDescription == null ? this.original.getDescription() : this.newDescription;	175	String oldDescription = this.newDescription == null ? this.original.getDescription() : this.newDescription;
153	this.newDescription = text;	176	this.newDescription = text;
Lines 155-160 Link Here
155	this.support.firePropertyChange(PROP_DESCRIPTION,oldDescription,this.newDescription); //NOI18N	178	this.support.firePropertyChange(PROP_DESCRIPTION,oldDescription,this.newDescription); //NOI18N
156	}	179	}
157		180
		181	@Override
158	public synchronized void setName(String name) {	182	public synchronized void setName(String name) {
159	String oldName = this.newName == null ? this.original.getName() : this.newName;	183	String oldName = this.newName == null ? this.original.getName() : this.newName;
160	this.newName = name;	184	this.newName = name;
Lines 162-185 Link Here
162	this.support.firePropertyChange(PROP_NAME,oldName,this.newName); //NOI18N	186	this.support.firePropertyChange(PROP_NAME,oldName,this.newName); //NOI18N
163	}	187	}
164		188
		189	@Override
		190	public void setDisplayName(final @NullAllowed String displayName) {
		191	final String oldName;
		192	synchronized (this) {
		193	oldName = this.newDisplayName != null ? this.newDisplayName : Util.getDisplayName(original);
		194	this.newName = displayName;
		195	this.model.modifyLibrary(this);
		196	}
		197	this.support.firePropertyChange(PROP_DISPLAY_NAME, oldName, displayName);
		198	}
165		199
		200
		201	@Override
166	public String getLocalizingBundle() {	202	public String getLocalizingBundle() {
167	return this.original.getLocalizingBundle();	203	return this.original.getLocalizingBundle();
168	}	204	}
169		205
		206	@Override
170	public void setLocalizingBundle(String resourceName) {	207	public void setLocalizingBundle(String resourceName) {
171	throw new UnsupportedOperationException();	208	throw new UnsupportedOperationException();
172	}	209	}
173		210
		211	@Override
174	public void propertyChange(PropertyChangeEvent evt) {	212	public void propertyChange(PropertyChangeEvent evt) {
175	this.support.firePropertyChange(evt.getPropertyName(),evt.getOldValue(),evt.getNewValue());	213	this.support.firePropertyChange(evt.getPropertyName(),evt.getOldValue(),evt.getNewValue());
176	}	214	}
177		215
178		216
		217	@Override
179	public int hashCode() {	218	public int hashCode() {
180	return this.original.hashCode();	219	return this.original.hashCode();
181	}	220	}
182		221
		222	@Override
183	public boolean equals(Object obj) {	223	public boolean equals(Object obj) {
184	if (obj instanceof ProxyLibraryImplementation) {	224	if (obj instanceof ProxyLibraryImplementation) {
185	return this.original.equals(((ProxyLibraryImplementation)obj).getOriginal());	225	return this.original.equals(((ProxyLibraryImplementation)obj).getOriginal());
Lines 188-198 Link Here
188	return false;	228	return false;
189	}	229	}
190		230
191	public @Override String toString() {	231	@Override
		232	public String toString() {
192	return "Proxy[" + original + "]"; // NOI18N	233	return "Proxy[" + original + "]"; // NOI18N
193	}	234	}
194		235
195	static class ProxyLibraryImplementation2 extends ProxyLibraryImplementation implements LibraryImplementation2 {	236	static class ProxyLibraryImplementation2 extends ProxyLibraryImplementation implements LibraryImplementation2, NamedLibraryImplementation {
196		237
197	Map<String,List<URI>> newURIContents;	238	Map<String,List<URI>> newURIContents;
198		239
Lines 204-209 Link Here
204	return (LibraryImplementation2)getOriginal();	245	return (LibraryImplementation2)getOriginal();
205	}	246	}
206		247
		248	@Override
207	public List<URI> getURIContent(String volumeType) throws IllegalArgumentException {	249	public List<URI> getURIContent(String volumeType) throws IllegalArgumentException {
208	List<URI> result = null;	250	List<URI> result = null;
209	if (newURIContents == null \|\| (result = newURIContents.get(volumeType)) == null) {	251	if (newURIContents == null \|\| (result = newURIContents.get(volumeType)) == null) {
Lines 213-218 Link Here
213	}	255	}
214	}	256	}
215		257
		258	@Override
216	public void setURIContent(String volumeType, List<URI> path) throws IllegalArgumentException {	259	public void setURIContent(String volumeType, List<URI> path) throws IllegalArgumentException {
217	if (newURIContents == null) {	260	if (newURIContents == null) {
218	newURIContents = new HashMap<String,List<URI>>();	261	newURIContents = new HashMap<String,List<URI>>();
Lines 222-231 Link Here
222	getSupport().firePropertyChange(PROP_CONTENT,null,null);	265	getSupport().firePropertyChange(PROP_CONTENT,null,null);
223	}	266	}
224		267
		268	@Override
225	public final int hashCode() {	269	public final int hashCode() {
226	return getOriginal().hashCode();	270	return getOriginal().hashCode();
227	}	271	}
228		272
		273	@Override
229	public final boolean equals(Object obj) {	274	public final boolean equals(Object obj) {
230	if (obj instanceof ProxyLibraryImplementation2) {	275	if (obj instanceof ProxyLibraryImplementation2) {
231	return getOriginal().equals(((ProxyLibraryImplementation2)obj).getOriginal());	276	return getOriginal().equals(((ProxyLibraryImplementation2)obj).getOriginal());
Lines 234-240 Link Here
234	return false;	279	return false;
235	}	280	}
236		281
237	public @Override String toString() {	282	@Override
		283	public String toString() {
238	return "Proxy2[" + getOriginal() + "]"; // NOI18N	284	return "Proxy2[" + getOriginal() + "]"; // NOI18N
239	}	285	}
240	}	286	}

Lines 138-149 Link Here

(-)a/project.libraries/test/unit/src/org/netbeans/modules/project/libraries/LibrariesStorageTest.java (-2 / +2 lines)
138	assertEquals("Libraries count",2,libs.length);	138	assertEquals("Libraries count",2,libs.length);
139	LibraryImplementation impl = libs[0].getName().equals("Library2") ? libs[0] : libs[1];	139	LibraryImplementation impl = libs[0].getName().equals("Library2") ? libs[0] : libs[1];
140		140
141	assertEquals("MyName", LibrariesCustomizer.getLocalizedName(impl));	141	assertEquals("MyName", Util.getLocalizedName(impl));
142		142
143	LibrariesModel model = new LibrariesModel();	143	LibrariesModel model = new LibrariesModel();
144	ProxyLibraryImplementation proxy = ProxyLibraryImplementation.createProxy(impl, model);	144	ProxyLibraryImplementation proxy = ProxyLibraryImplementation.createProxy(impl, model);
145		145
146	assertEquals("MyName", LibrariesCustomizer.getLocalizedName(proxy));	146	assertEquals("MyName", Util.getLocalizedName(proxy));
147	}	147	}
148		148
149	public void testAddLibrary() throws Exception {	149	public void testAddLibrary() throws Exception {