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

Repeated Validate warning for xml with multiple declaration tags

Browse source
This commit is contained in:
Vhati 2013-08-24 20:10:24 -04:00
parent e05e0347d3
commit d8fd3ac738
1 changed files with 11 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

24
src/main/java/net/vhati/modmanager/core/ModUtilities.java
View file

@ -475,28 +475,26 @@ public class ModUtilities {
// Wrap everything in a root tag, while mindful of the xml declaration. // Wrap everything in a root tag, while mindful of the xml declaration.
Pattern xmlDeclPtn = Pattern.compile( "<[?]xml version=\"1.0\" encoding=\"[^\"]+?\"[?]>" ); Pattern xmlDeclPtn = Pattern.compile( "<[?]xml version=\"1.0\" encoding=\"[^\"]+?\"[?]>" );
m = xmlDeclPtn.matcher( srcBuf ); m = xmlDeclPtn.matcher( srcBuf );
if ( m.find() ) { boolean foundTopDecl = false;
while ( m.find() ) {
if ( m.start() == 0 ) { if ( m.start() == 0 ) {
dstBuf.append( srcBuf.subSequence( 0, m.end() ) ); foundTopDecl = true;
dstBuf.append( "\n<wrapper>\n" ); m.appendReplacement( dstBuf, "$0\n<wrapper>\n" );
dstBuf.append( srcBuf.subSequence( m.end(), srcBuf.length() ) );
} }
else { else {
messages.add( new ReportMessage( messages.add( new ReportMessage(
ReportMessage.ERROR, ReportMessage.ERROR,
"<?xml... ?> should only occur on the first line." "<?xml... ?> should only occur on the first line."
) ); ) );
dstBuf.append( "<wrapper>\n" ); m.appendReplacement( dstBuf, "" );
dstBuf.append( srcBuf.subSequence( 0, m.start() ) );
dstBuf.append( srcBuf.subSequence( m.end(), srcBuf.length() ) );
} }
dstBuf.append( "\n</wrapper>" );
} }
else { m.appendTail( dstBuf );
dstBuf.append( "\n</wrapper>" );
if ( !foundTopDecl )
dstBuf.insert( 0, "<wrapper>\n" ); dstBuf.insert( 0, "<wrapper>\n" );
dstBuf.append( srcBuf );
dstBuf.append( "\n</wrapper>" );
}
tmpBuf = srcBuf; srcBuf = dstBuf; dstBuf = tmpBuf; dstBuf.setLength(0); tmpBuf = srcBuf; srcBuf = dstBuf; dstBuf = tmpBuf; dstBuf.setLength(0);
// Comments with long tails or double-dashes. // Comments with long tails or double-dashes.
@ -661,7 +659,7 @@ public class ModUtilities {
int badStart = -1; int badStart = -1;
int badEnd = -1; int badEnd = -1;
String badLine = "???"; String badLine = "???";
m = Pattern.compile( "\n" ).matcher( srcBuf ); m = Pattern.compile( "\n|\\z" ).matcher( srcBuf );
for ( int i=1; i <= lineNum && m.find(); i++) { for ( int i=1; i <= lineNum && m.find(); i++) {
if ( i == lineNum-1 ) { if ( i == lineNum-1 ) {
badStart = m.end(); badStart = m.end();