jan-leila/Slipstream-Mod-Manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added sloppy parser patterns to recognize empty XML comments and CDATA

Browse source
This commit is contained in:
Vhati 2013-09-08 04:03:50 -04:00
parent f3825d3bd8
commit b070c65845
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/net/vhati/modmanager/core/SloppyXMLParser.java
View file

@ -57,7 +57,9 @@ import org.jdom2.input.JDOMParseException;
public class SloppyXMLParser {
private Pattern declPtn = Pattern.compile( "(\\s*)<[?]xml [^?]*[?]>" );
private Pattern emptyCommentPtn = Pattern.compile( "(\\s*)<!---->" );
private Pattern commentPtn = Pattern.compile( "(?s)(\\s*)<!--((?:.(?!-->))*.)-->" );
private Pattern emptyCDATAPtn = Pattern.compile( "(\\s*)<!\\[CDATA\\[\\]\\]>" );
private Pattern cdataPtn = Pattern.compile( "(?s)(\\s*)<!\\[CDATA\\[((?:.(?!\\]\\]>))*.)\\]\\]>" );
private Pattern sTagPtn = Pattern.compile( "(\\s*)<(?:([\\w.-]+):)?([\\w.-]+)((?: [^>]+?)??)\\s*(/?)>" );
private Pattern eTagPtn = Pattern.compile( "([^<]*)</\\s*([^>]+)>" );
@ -84,7 +86,9 @@ public class SloppyXMLParser {
this.factory = factory;
chunkPtns.add( declPtn );
chunkPtns.add( emptyCommentPtn );
chunkPtns.add( commentPtn );
chunkPtns.add( emptyCDATAPtn );
chunkPtns.add( cdataPtn );
chunkPtns.add( sTagPtn );
chunkPtns.add( eTagPtn );
@ -123,6 +127,13 @@ public class SloppyXMLParser {
// Don't care.
addLineAndCol( lastLineAndCol, m.group(0) );
}
else if ( chunkPtn == emptyCommentPtn ) {
String whitespace = m.group( 1 );
if ( whitespace.length() > 0 )
factory.addContent( parentNode, factory.text( whitespace ) );
addLineAndCol( lastLineAndCol, s, m.start(), m.end() );
}
else if ( chunkPtn == commentPtn ) {
String whitespace = m.group( 1 );
if ( whitespace.length() > 0 )
@ -159,6 +170,13 @@ public class SloppyXMLParser {
addLineAndCol( lastLineAndCol, s, m.start(), m.end() );
}
else if ( chunkPtn == emptyCDATAPtn ) {
String whitespace = m.group( 1 );
if ( whitespace.length() > 0 )
factory.addContent( parentNode, factory.text( whitespace ) );
addLineAndCol( lastLineAndCol, s, m.start(), m.end() );
}
else if ( chunkPtn == cdataPtn ) {
String whitespace = m.group( 1 );
if ( whitespace.length() > 0 )