From 840fbd15af4ee5edc1ce7fb69ff10b05fa43717b Mon Sep 17 00:00:00 2001 From: Vhati Date: Wed, 22 Oct 2014 22:12:38 -0400 Subject: [PATCH] Fixed validate 'doesn't append, it clobbers' warning when *.rawappend is present --- .../net/vhati/modmanager/core/ModUtilities.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/main/java/net/vhati/modmanager/core/ModUtilities.java b/src/main/java/net/vhati/modmanager/core/ModUtilities.java index db97ff2..25b038b 100644 --- a/src/main/java/net/vhati/modmanager/core/ModUtilities.java +++ b/src/main/java/net/vhati/modmanager/core/ModUtilities.java @@ -464,12 +464,16 @@ public class ModUtilities { boolean isTxt = innerPath.matches( "^.*(?:[.]txt)$" ); boolean isXML = innerPath.matches( "^.*(?:[.]xml[.]append|[.]append[.]xml|[.]xml)$" ); - boolean isXMLAppend = innerPath.matches( "^.*(?:[.]xml[.]append|[.]append[.]xml)$" ); - if ( innerPath.matches( "^.*(?:[.]xml[.]rawappend|[.]rawappend[.]xml)$" ) || - innerPath.matches( "^.*(?:[.]xml[.]rawclobber|[.]rawclobber[.]xml)$" ) ) { - - isXML = false; // Raw xml is exempt from normal processing. + if ( innerPath.matches( "^.*(?:[.]xml[.]append|[.]append[.]xml)$" ) ) { + seenAppend = true; + } + else if ( innerPath.matches( "^.*(?:[.]xml[.]rawappend|[.]rawappend[.]xml)$" ) ) { + isXML = false; // Raw XML is exempt from normal processing. + seenAppend = true; + } + else if ( innerPath.matches( "^.*(?:[.]xml[.]rawclobber|[.]rawclobber[.]xml)$" ) ) { + isXML = false; } DecodeResult decodeResult = ModUtilities.decodeText( zis, modFile.getName()+":"+innerPath ); @@ -555,8 +559,6 @@ public class ModUtilities { // TODO: Nag if there are chars FTL can't show. if ( isXML ) { - if ( isXMLAppend ) seenAppend = true; - Report xmlReport = validateModXML( decodeResult.text ); if ( xmlReport.messages.size() > 0 ) {