Attachment #5492 for bug #22612

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




import org.netbeans.core.projects.ModuleLayeredFileSystem;
import org.netbeans.core.perftool.StartLog;
import org.netbeans.core.modules.ModuleSystem;
import org.netbeans.core.xml.XML;
import org.netbeans.core.execution.ExecutionSettings;
import org.netbeans.core.execution.TopSecurityManager;


        }
        StartLog.logProgress ("Upgrade wizzard consulted"); // NOI18N
        
        // 8 1/2 XML stuff
        XML.init();
        StartLog.logProgress ("XML stuff initialized"); // NOI18N

        // -----------------------------------------------------------------------------------------------------
        // 9. Modules


Lines 23-29 Link Here

(-)core/src/org/netbeans/core/Plain.java (-2 lines)
23	import org.netbeans.core.modules.ModuleSystem;	23	import org.netbeans.core.modules.ModuleSystem;
24	import org.netbeans.core.projects.ModuleLayeredFileSystem;	24	import org.netbeans.core.projects.ModuleLayeredFileSystem;
25	import org.netbeans.core.xml.NbSAXParserFactoryImpl;	25	import org.netbeans.core.xml.NbSAXParserFactoryImpl;
26	import org.netbeans.core.xml.XML;
27		26
28	/** Default implementation of TopManager that is used when	27	/** Default implementation of TopManager that is used when
29	* the system is used without initialization.	28	* the system is used without initialization.
Lines 103-109 Link Here
103	/** Initializaton of modules if user directory provided.	102	/** Initializaton of modules if user directory provided.
104	*/	103	*/
105	public void run() {	104	public void run() {
106	XML.init();
107	String userDir = System.getProperty("modules.dir"); // NOI18N	105	String userDir = System.getProperty("modules.dir"); // NOI18N
108	FileSystem fs = getRepository().getDefaultFileSystem();	106	FileSystem fs = getRepository().getDefaultFileSystem();
109	try {	107	try {





// XXX is it OK to make use of core classes from here?
import org.netbeans.core.NbTopManager;
import org.netbeans.core.xml.FileEntityResolver;

/** Lookup that is based on the implementation of top manager.
 *

            throw new InternalError ();
        }
        pairs.add (new R());
        pairs.add(new FER());
        
        setPairs (pairs);
        

            return getId ();
        }
        
    }

    private static final class FER extends Pair {
        public boolean instanceOf(Class clazz) {
            return clazz.isAssignableFrom(FileEntityResolver.class);
        }
        public Object getInstance() {
            return new FileEntityResolver();
        }
        public String getId() {
            return "TM[FileEntityResolver"; // NOI18N
        }
        protected boolean creatorOf(Object o) {
            return o instanceof FileEntityResolver;
        }
        public Class getType() {
            return FileEntityResolver.class;
        }
        public String getDisplayName() {
            return getId();
        }
    }
}

Return to bug 22612

Lines 52-58 Link Here

(-)core/src/org/netbeans/core/NonGui.java (-5 lines)
52	import org.netbeans.core.projects.ModuleLayeredFileSystem;	52	import org.netbeans.core.projects.ModuleLayeredFileSystem;
53	import org.netbeans.core.perftool.StartLog;	53	import org.netbeans.core.perftool.StartLog;
54	import org.netbeans.core.modules.ModuleSystem;	54	import org.netbeans.core.modules.ModuleSystem;
55	import org.netbeans.core.xml.XML;
56	import org.netbeans.core.execution.ExecutionSettings;	55	import org.netbeans.core.execution.ExecutionSettings;
57	import org.netbeans.core.execution.TopSecurityManager;	56	import org.netbeans.core.execution.TopSecurityManager;
58		57
Lines 490-499 Link Here
490	}	489	}
491	StartLog.logProgress ("Upgrade wizzard consulted"); // NOI18N	490	StartLog.logProgress ("Upgrade wizzard consulted"); // NOI18N
492		491
493	// 8 1/2 XML stuff
494	XML.init();
495	StartLog.logProgress ("XML stuff initialized"); // NOI18N
496
497	// -----------------------------------------------------------------------------------------------------	492	// -----------------------------------------------------------------------------------------------------
498	// 9. Modules	493	// 9. Modules
499		494

Lines 23-28 Link Here

(-)core/src/org/netbeans/core/lookup/TMLookup.java (+23 lines)
23		23
24	// XXX is it OK to make use of core classes from here?	24	// XXX is it OK to make use of core classes from here?
25	import org.netbeans.core.NbTopManager;	25	import org.netbeans.core.NbTopManager;
		26	import org.netbeans.core.xml.FileEntityResolver;
26		27
27	/** Lookup that is based on the implementation of top manager.	28	/** Lookup that is based on the implementation of top manager.
28	*	29	*
Lines 57-62 Link Here
57	throw new InternalError ();	58	throw new InternalError ();
58	}	59	}
59	pairs.add (new R());	60	pairs.add (new R());
		61	pairs.add(new FER());
60		62
61	setPairs (pairs);	63	setPairs (pairs);
62		64
Lines 251-255 Link Here
251	return getId ();	253	return getId ();
252	}	254	}
253		255
		256	}
		257
		258	private static final class FER extends Pair {
		259	public boolean instanceOf(Class clazz) {
		260	return clazz.isAssignableFrom(FileEntityResolver.class);
		261	}
		262	public Object getInstance() {
		263	return new FileEntityResolver();
		264	}
		265	public String getId() {
		266	return "TM[FileEntityResolver"; // NOI18N
		267	}
		268	protected boolean creatorOf(Object o) {
		269	return o instanceof FileEntityResolver;
		270	}
		271	public Class getType() {
		272	return FileEntityResolver.class;
		273	}
		274	public String getDisplayName() {
		275	return getId();
		276	}
254	}	277	}
255	}	278	}