Attachment #4655 for bug #20270

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

Lines 37-42 Link Here

(-)build.xml (+1 lines)
37	</fileset>	37	</fileset>
38	<!--<pathelement location="../core/netbeans/lib/core.jar"/>-->	38	<!--<pathelement location="../core/netbeans/lib/core.jar"/>-->
39	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>	39	<pathelement location="${binroot}/core/release/lib/ext/jh.jar"/>
		40	<!-- Needed: DOM/SAX/JAXP APIs; Xerces serializer package: -->
40	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>	41	<pathelement location="${binroot}/core/release/lib/ext/xerces.jar"/>
41	</classpath>	42	</classpath>
42	<exclude name="org/netbeans/modules/apisupport/ant/"/>	43	<exclude name="org/netbeans/modules/apisupport/ant/"/>

Lines 6-12 Link Here

(-)manifest.mf (-1 / +1 lines)
6	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@	6	OpenIDE-Module-Implementation-Version: @BUILD_NUMBER_SUBST@
7	OpenIDE-Module-Module-Dependencies: org.netbeans.modules.apisupport.lite/1 > 0.1, org.netbeans.modules.jarpackager/2 > 1.8, org.netbeans.modules.javahelp/1 > 1.0	7	OpenIDE-Module-Module-Dependencies: org.netbeans.modules.apisupport.lite/1 > 0.1, org.netbeans.modules.jarpackager/2 > 1.8, org.netbeans.modules.javahelp/1 > 1.0
8	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3	8	OpenIDE-Module-IDE-Dependencies: IDE/1 > 2.3
9	OpenIDE-Module-Package-Dependencies: [org.apache.xerces.parsers.DOMParser]	9	OpenIDE-Module-Package-Dependencies: [org.apache.xml.serialize.EncodingInfo]
10	Class-Path: docs/apisupport-manual.zip	10	Class-Path: docs/apisupport-manual.zip
11		11
12	Name: org/netbeans/modules/apisupport/ManifestDataLoader.class	12	Name: org/netbeans/modules/apisupport/ManifestDataLoader.class




import org.xml.sax.*;
import org.w3c.dom.*;
import org.w3c.dom.events.*;
import org.apache.xerces.parsers.*;
import org.apache.xml.serialize.*;

import org.openide.*;

        FileObject fo = getFileObject ();
        LayerDataNode.err.log ("ParseRegen.parseDocument: fo=" + fo);
        try {
            /*
            DOMParser parser = new DOMParser ();
            parser.setFeature ("http://xml.org/sax/features/validation", true); // NOI18N
            parser.setFeature ("http://apache.org/xml/features/dom/defer-node-expansion", false); // NOI18N
            parser.setEntityResolver (EntityCatalog.getDefault ());
            parser.setErrorHandler (this);
             */
            Reader rd;
            EditorCookie editor = getEditor ();
            if (editor != null) {

                        LayerDataNode.err.notify(mfue);
                    }
                }
                /*
                parser.parse (in);
                Document doc = parser.getDocument ();
                 */
                Document doc = XMLUtil.parse(in, true, false, this, EntityCatalog.getDefault());
                if (editor != null) {
                    //LayerDataNode.err.log ("doc=" + doc);
                    EventTarget targ = (EventTarget) doc;

Return to bug 20270

Lines 24-30 Link Here

(-)src/org/netbeans/modules/apisupport/layers/ParseRegen.java (-1 / +5 lines)
24	import org.xml.sax.*;	24	import org.xml.sax.*;
25	import org.w3c.dom.*;	25	import org.w3c.dom.*;
26	import org.w3c.dom.events.*;	26	import org.w3c.dom.events.*;
27	import org.apache.xerces.parsers.*;
28	import org.apache.xml.serialize.*;	27	import org.apache.xml.serialize.*;
29		28
30	import org.openide.*;	29	import org.openide.*;
Lines 143-153 Link Here
143	FileObject fo = getFileObject ();	142	FileObject fo = getFileObject ();
144	LayerDataNode.err.log ("ParseRegen.parseDocument: fo=" + fo);	143	LayerDataNode.err.log ("ParseRegen.parseDocument: fo=" + fo);
145	try {	144	try {
		145	/*
146	DOMParser parser = new DOMParser ();	146	DOMParser parser = new DOMParser ();
147	parser.setFeature ("http://xml.org/sax/features/validation", true); // NOI18N	147	parser.setFeature ("http://xml.org/sax/features/validation", true); // NOI18N
148	parser.setFeature ("http://apache.org/xml/features/dom/defer-node-expansion", false); // NOI18N	148	parser.setFeature ("http://apache.org/xml/features/dom/defer-node-expansion", false); // NOI18N
149	parser.setEntityResolver (EntityCatalog.getDefault ());	149	parser.setEntityResolver (EntityCatalog.getDefault ());
150	parser.setErrorHandler (this);	150	parser.setErrorHandler (this);
		151	*/
151	Reader rd;	152	Reader rd;
152	EditorCookie editor = getEditor ();	153	EditorCookie editor = getEditor ();
153	if (editor != null) {	154	if (editor != null) {
Lines 170-177 Link Here
170	LayerDataNode.err.notify(mfue);	171	LayerDataNode.err.notify(mfue);
171	}	172	}
172	}	173	}
		174	/*
173	parser.parse (in);	175	parser.parse (in);
174	Document doc = parser.getDocument ();	176	Document doc = parser.getDocument ();
		177	*/
		178	Document doc = XMLUtil.parse(in, true, false, this, EntityCatalog.getDefault());
175	if (editor != null) {	179	if (editor != null) {
176	//LayerDataNode.err.log ("doc=" + doc);	180	//LayerDataNode.err.log ("doc=" + doc);
177	EventTarget targ = (EventTarget) doc;	181	EventTarget targ = (EventTarget) doc;