Attachment #18947 for bug #51545

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

Lines 13-18 Link Here

(-)src/org/netbeans/api/java/classpath/GlobalPathRegistry.java (+16 lines)
13		13
14	package org.netbeans.api.java.classpath;	14	package org.netbeans.api.java.classpath;
15		15
		16	import java.beans.PropertyChangeEvent;
		17	import java.beans.PropertyChangeListener;
16	import java.util.ArrayList;	18	import java.util.ArrayList;
17	import java.util.Arrays;	19	import java.util.Arrays;
18	import java.util.Collection;	20	import java.util.Collection;
Lines 97-102 Link Here
97	}	99	}
98	}	100	}
99	};	101	};
		102	private PropertyChangeListener classpathListener = new PropertyChangeListener() {
		103	public void propertyChange(PropertyChangeEvent evt) {
		104	synchronized (GlobalPathRegistry.this) {
		105	//Reset cache
		106	GlobalPathRegistry.this.resetSourceRootsCache ();
		107	}
		108	}
		109	};
100		110
101	private GlobalPathRegistry() {}	111	private GlobalPathRegistry() {}
102		112
Lines 148-153 Link Here
148	if (added != null && !added.contains(paths[i]) && !l.contains(paths[i])) {	158	if (added != null && !added.contains(paths[i]) && !l.contains(paths[i])) {
149	added.add(paths[i]);	159	added.add(paths[i]);
150	}	160	}
		161	if (!l.contains(paths[i])) {
		162	paths[i].addPropertyChangeListener(classpathListener);
		163	}
151	l.add(paths[i]);	164	l.add(paths[i]);
152	}	165	}
153	if (added != null && !added.isEmpty()) {	166	if (added != null && !added.isEmpty()) {
Lines 193-198 Link Here
193	}	206	}
194	if (removed != null && !removed.contains(paths[i]) && !l2.contains(paths[i])) {	207	if (removed != null && !removed.contains(paths[i]) && !l2.contains(paths[i])) {
195	removed.add(paths[i]);	208	removed.add(paths[i]);
		209	}
		210	if (!l2.contains(paths[i])) {
		211	paths[i].removePropertyChangeListener(classpathListener);
196	}	212	}
197	}	213	}
198	this.paths.put(id, l2);	214	this.paths.put(id, l2);

Lines 252-258 Link Here

(-)test/unit/src/org/netbeans/api/java/classpath/ClassPathTest.java (-1 / +1 lines)
252	cp = null;	252	cp = null;
253	}	253	}
254		254
255	private static final class TestClassPathImplementation implements ClassPathImplementation, PropertyChangeListener {	255	static final class TestClassPathImplementation implements ClassPathImplementation, PropertyChangeListener {
256		256
257	private PropertyChangeSupport support = new PropertyChangeSupport (this);	257	private PropertyChangeSupport support = new PropertyChangeSupport (this);
258	private List resources = new ArrayList ();	258	private List resources = new ArrayList ();





package org.netbeans.api.java.classpath;

import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.net.URL;
import java.util.ArrayList;
import java.util.Arrays;

import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
import java.util.Map;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.netbeans.api.java.queries.SourceForBinaryQuery;
import org.netbeans.junit.NbTestCase;
import org.netbeans.spi.java.classpath.ClassPathImplementation;
import org.netbeans.spi.java.classpath.support.ClassPathSupport;
import org.netbeans.spi.java.queries.SourceForBinaryQueryImplementation;
import org.openide.filesystems.FileObject;
import org.netbeans.api.project.TestUtil;
import org.netbeans.spi.java.classpath.ClassPathFactory;
import org.openide.filesystems.FileUtil;
import org.openide.util.Lookup;
import org.openide.util.lookup.Lookups;

    }
    
    
    public void testGetSourceRoots () throws Exception {
        SFBQImpl query = (SFBQImpl) Lookup.getDefault().lookup(SFBQImpl.class);
        assertNotNull ("SourceForBinaryQueryImplementation not found in lookup",query);                
        query.addPair(cp3.getRoots()[0].getURL(),new FileObject[0]);
        ClassPathTest.TestClassPathImplementation cpChangingImpl = new ClassPathTest.TestClassPathImplementation();
        ClassPath cpChanging = ClassPathFactory.createClassPath(cpChangingImpl);
        assertEquals("cpChangingImpl is empty", 0, cpChanging.getRoots().length);
        r.register(ClassPath.SOURCE, new ClassPath[] {cp1, cp2, cpChanging});
        r.register (ClassPath.COMPILE, new ClassPath[] {cp3});
        Set result = r.getSourceRoots();
        assertEquals ("Wrong number of source roots",result.size(),cp1.getRoots().length + cp2.getRoots().length);
        assertTrue ("Missing roots from cp1",result.containsAll (Arrays.asList(cp1.getRoots())));
        assertTrue ("Missing roots from cp2",result.containsAll (Arrays.asList(cp2.getRoots())));                
        // simulate classpath change:
        URL u = ((ClassPath.Entry)cp5.entries().get(0)).getURL();
        cpChangingImpl.addResource(u);
        assertEquals("cpChangingImpl is not empty", 1, cpChanging.getRoots().length);
        result = r.getSourceRoots();
        assertEquals ("Wrong number of source roots",result.size(),cp1.getRoots().length + cp2.getRoots().length + cpChanging.getRoots().length);
        assertTrue ("Missing roots from cp1",result.containsAll (Arrays.asList(cp1.getRoots())));
        assertTrue ("Missing roots from cp2",result.containsAll (Arrays.asList(cp2.getRoots())));                
        cpChangingImpl.removeResource(u);
        
        query.addPair(cp3.getRoots()[0].getURL(),cp4.getRoots());       
        result = r.getSourceRoots();
        assertEquals ("Wrong number of source roots",result.size(),cp1.getRoots().length + cp2.getRoots().length+cp4.getRoots().length);

Return to bug 51545