Attachment #35039 for bug #86680

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

Lines 1-6 Link Here

(-)freeform/manifest.mf (-1 / +1 lines)
1	Manifest-Version: 1.0	1	Manifest-Version: 1.0
2	OpenIDE-Module: org.netbeans.modules.java.freeform/1	2	OpenIDE-Module: org.netbeans.modules.java.freeform/1
3	OpenIDE-Module-Specification-Version: 1.6	3	OpenIDE-Module-Specification-Version: 1.7
4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/freeform/Bundle.properties	4	OpenIDE-Module-Localizing-Bundle: org/netbeans/modules/java/freeform/Bundle.properties
5	OpenIDE-Module-Layer: org/netbeans/modules/java/freeform/resources/layer.xml	5	OpenIDE-Module-Layer: org/netbeans/modules/java/freeform/resources/layer.xml
6		6

Lines 47-53 Link Here

(-)freeform/nbproject/project.xml (-1 / +1 lines)
47	<compile-dependency/>	47	<compile-dependency/>
48	<run-dependency>	48	<run-dependency>
49	<release-version>1</release-version>	49	<release-version>1</release-version>
50	<specification-version>1.8</specification-version>	50	<specification-version>1.13</specification-version>
51	</run-dependency>	51	</run-dependency>
52	</dependency>	52	</dependency>
53	<dependency>	53	<dependency>




package org.netbeans.modules.java.freeform;

import org.netbeans.api.java.classpath.ClassPath;
import org.netbeans.modules.ant.freeform.spi.LookupMerger;
import org.netbeans.spi.java.classpath.ClassPathProvider;
import org.netbeans.spi.project.LookupMerger;
import org.openide.filesystems.FileObject;
import org.openide.util.Lookup;


 *
 * @author David Konecny
 */
public class LookupMergerImpl implements LookupMerger<ClassPathProvider> {

    public LookupMergerImpl() {}

    public Class<ClassPathProvider> getMergeableClass() {
        return ClassPathProvider.class;
    }

    public ClassPathProvider merge(Lookup lookup) {
        return new ClassPathProviderImpl(lookup);
            return new ClassPathProviderImpl(lookup);
        }
        throw new IllegalArgumentException("merging of "+clazz+" is not supported"); // NOI18N
    }
    
    private static class ClassPathProviderImpl implements ClassPathProvider {

Return to bug 86680

Lines 20-27 Link Here

(-)freeform/src/org/netbeans/modules/java/freeform/LookupMergerImpl.java (-10 / +7 lines)
20	package org.netbeans.modules.java.freeform;	20	package org.netbeans.modules.java.freeform;
21		21
22	import org.netbeans.api.java.classpath.ClassPath;	22	import org.netbeans.api.java.classpath.ClassPath;
23	import org.netbeans.modules.ant.freeform.spi.LookupMerger;
24	import org.netbeans.spi.java.classpath.ClassPathProvider;	23	import org.netbeans.spi.java.classpath.ClassPathProvider;
		24	import org.netbeans.spi.project.LookupMerger;
25	import org.openide.filesystems.FileObject;	25	import org.openide.filesystems.FileObject;
26	import org.openide.util.Lookup;	26	import org.openide.util.Lookup;
27		27
Lines 30-48 Link Here
30	*	30	*
31	* @author David Konecny	31	* @author David Konecny
32	*/	32	*/
33	public class LookupMergerImpl implements LookupMerger {	33	public class LookupMergerImpl implements LookupMerger<ClassPathProvider> {
34		34
35	public LookupMergerImpl() {}	35	public LookupMergerImpl() {}
36		36
37	public Class<?>[] getMergeableClasses() {	37	public Class<ClassPathProvider> getMergeableClass() {
38	return new Class<?>[] {ClassPathProvider.class};	38	return ClassPathProvider.class;
39	}	39	}
40		40
41	public Object merge(Lookup lookup, Class clazz) {	41	public ClassPathProvider merge(Lookup lookup) {
42	if (clazz == ClassPathProvider.class) {	42	return new ClassPathProviderImpl(lookup);
43	return new ClassPathProviderImpl(lookup);
44	}
45	throw new IllegalArgumentException("merging of "+clazz+" is not supported"); // NOI18N
46	}	43	}
47		44
48	private static class ClassPathProviderImpl implements ClassPathProvider {	45	private static class ClassPathProviderImpl implements ClassPathProvider {