Failing to handle unrecognized character entities in XML files w/o DOCTYPEs (e.g. fragments included from master
docs), but at least printing parse errors in log file for diagnostic purposes.
1.1 --- a/xmlnavigation/nbproject/project.properties Fri Aug 05 12:30:48 2005 -0400
1.2 +++ b/xmlnavigation/nbproject/project.properties Mon Aug 08 16:39:26 2005 -0400
1.3 @@ -0,0 +1,2 @@
1.4 +test.unit.cp.extra=\
1.5 + ${xml/api.dir}/modules/org-netbeans-api-xml.jar
2.1 --- a/xmlnavigation/nbproject/project.xml Fri Aug 05 12:30:48 2005 -0400
2.2 +++ b/xmlnavigation/nbproject/project.xml Mon Aug 08 16:39:26 2005 -0400
2.3 @@ -32,6 +32,14 @@
2.4 </run-dependency>
2.5 </dependency>
2.6 <dependency>
2.7 + <code-name-base>org.openide.filesystems</code-name-base>
2.8 + <build-prerequisite/>
2.9 + <compile-dependency/>
2.10 + <run-dependency>
2.11 + <specification-version>6.2</specification-version>
2.12 + </run-dependency>
2.13 + </dependency>
2.14 + <dependency>
2.15 <code-name-base>org.openide.loaders</code-name-base>
2.16 <build-prerequisite/>
2.17 <compile-dependency/>
3.1 --- a/xmlnavigation/src/org/netbeans/modules/xmlnavigation/XMLNavigatorPanel.java Fri Aug 05 12:30:48 2005 -0400
3.2 +++ b/xmlnavigation/src/org/netbeans/modules/xmlnavigation/XMLNavigatorPanel.java Mon Aug 08 16:39:26 2005 -0400
3.3 @@ -42,8 +42,10 @@
3.4 import org.netbeans.api.xml.services.UserCatalog;
3.5 import org.netbeans.spi.navigator.NavigatorPanel;
3.6 import org.netbeans.spi.xml.cookies.DataObjectAdapters;
3.7 +import org.openide.ErrorManager;
3.8 import org.openide.awt.MouseUtils;
3.9 import org.openide.cookies.LineCookie;
3.10 +import org.openide.filesystems.FileUtil;
3.11 import org.openide.loaders.DataObject;
3.12 import org.openide.text.Line;
3.13 import org.openide.util.Lookup;
3.14 @@ -155,7 +157,8 @@
3.15 }
3.16 });
3.17 } catch (Exception e) { // IOException, SAXParseException
3.18 - // ignore for now
3.19 + ErrorManager.getDefault().log(ErrorManager.WARNING,
3.20 + "Could not parse " + FileUtil.getFileDisplayName(d.getPrimaryFile()) + ": " + e.toString());
3.21 }
3.22 }
3.23 });
3.24 @@ -204,6 +207,8 @@
3.25 SAXParser parser = factory.newSAXParser();
3.26 class Handler extends DefaultHandler {
3.27 private Locator locator;
3.28 + // XXX besides line, need to know file: if a complex doc includes others w/
3.29 + // entity refs, need to jump to subfiles!
3.30 private int line = -1;
3.31 private String element = null;
3.32 private StringBuffer text = null;