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

Sloppy XML parse exceptions now complain about the nearest upcoming non-whitespace character

Browse source
This commit is contained in:
Vhati 2013-09-05 19:36:50 -04:00
parent 0c324fa558
commit 3d109f1b20
1 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -200,7 +200,10 @@ public class SloppyXMLParser {
am.region( am.end(), am.regionEnd() ); am.region( am.end(), am.regionEnd() );
} }
if ( am.regionStart() < attrString.length() ) { if ( am.regionStart() < attrString.length() ) {
int[] lineAndCol = getLineAndCol( s, pos ); int nonspacePos = findNextNonspace( s, pos );
int errorPos = ( (nonspacePos != -1) ? nonspacePos : pos );
int[] lineAndCol = getLineAndCol( s, errorPos );
int lineNum = lineAndCol[0]; int lineNum = lineAndCol[0];
int colNum = lineAndCol[1]; int colNum = lineAndCol[1];
@ -236,7 +239,10 @@ public class SloppyXMLParser {
} }
if ( !matchedChunk ) { if ( !matchedChunk ) {
int[] lineAndCol = getLineAndCol( s, pos ); int nonspacePos = findNextNonspace( s, pos );
int errorPos = ( (nonspacePos != -1) ? nonspacePos : pos );
int[] lineAndCol = getLineAndCol( s, errorPos );
int lineNum = lineAndCol[0]; int lineNum = lineAndCol[0];
int colNum = lineAndCol[1]; int colNum = lineAndCol[1];
@ -304,10 +310,24 @@ public class SloppyXMLParser {
} }
/**
* Returns the position of the next non whitespace character after pos.
*
* Returns -1 if there isn't one.
*/
public int findNextNonspace( CharSequence s, int pos ) {
Matcher nonspaceMatcher = Pattern.compile( "\\S" ).matcher( s );
if ( nonspaceMatcher.find( pos ) )
return nonspaceMatcher.start();
return -1;
}
/** /**
* Returns lineNum and colNum for a position in text. * Returns lineNum and colNum for a position in text.
*/ */
private int[] getLineAndCol( CharSequence s, int pos ) { public int[] getLineAndCol( CharSequence s, int pos ) {
Matcher breakMatcher = Pattern.compile( "\n" ).matcher( s ); Matcher breakMatcher = Pattern.compile( "\n" ).matcher( s );
breakMatcher.region( 0, pos+1 ); breakMatcher.region( 0, pos+1 );
int lastBreakPos = -1; int lastBreakPos = -1;