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

Added type= arg to mod:findName tag

Browse source
This commit is contained in:
Vhati 2013-09-02 12:43:48 -04:00
parent 719a5d960a
commit 08cdd0d65e
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/net/vhati/modmanager/core/XMLPatcher.java
View file

@ -94,12 +94,15 @@ public class XMLPatcher {
if ( node.getName().equals( "findName" ) ) { if ( node.getName().equals( "findName" ) ) {
String searchName = node.getAttributeValue( "name" ); String searchName = node.getAttributeValue( "name" );
String searchType = node.getAttributeValue( "type" );
boolean searchReverse = getAttributeBooleanValue( node, "reverse", true ); boolean searchReverse = getAttributeBooleanValue( node, "reverse", true );
int searchStart = getAttributeIntValue( node, "start", 0 ); int searchStart = getAttributeIntValue( node, "start", 0 );
int searchLimit = getAttributeIntValue( node, "limit", 1 ); int searchLimit = getAttributeIntValue( node, "limit", 1 );
if ( searchName == null || searchName.length() == 0 ) if ( searchName == null || searchName.length() == 0 )
throw new IllegalArgumentException( String.format( "<%s> requires a name attribute (%s).", node.getName(), getPathToRoot(node) ) ); throw new IllegalArgumentException( String.format( "<%s> requires a name attribute (%s).", node.getName(), getPathToRoot(node) ) );
if ( searchType != null && searchType.length() == 0 )
throw new IllegalArgumentException( String.format( "<%s> type attribute, when present, can't be empty (%s).", node.getName(), getPathToRoot(node) ) );
if ( searchStart < 0 ) if ( searchStart < 0 )
throw new IllegalArgumentException( String.format( "<%s> 'start' attribute is not >= 0 (%s).", node.getName(), getPathToRoot(node) ) ); throw new IllegalArgumentException( String.format( "<%s> 'start' attribute is not >= 0 (%s).", node.getName(), getPathToRoot(node) ) );
if ( searchLimit < -1 ) if ( searchLimit < -1 )
@ -107,7 +110,7 @@ public class XMLPatcher {
Map<String,String> attrMap = new HashMap<String,String>(); Map<String,String> attrMap = new HashMap<String,String>();
attrMap.put( "name", searchName ); attrMap.put( "name", searchName );
LikeFilter searchFilter = new LikeFilter( null, attrMap, null ); LikeFilter searchFilter = new LikeFilter( searchType, attrMap, null );
List<Element> matchedNodes = new ArrayList<Element>( contextNode.getContent( searchFilter ) ); List<Element> matchedNodes = new ArrayList<Element>( contextNode.getContent( searchFilter ) );
if ( searchReverse ) Collections.reverse( matchedNodes ); if ( searchReverse ) Collections.reverse( matchedNodes );