Fixed advanced find tags not honoring limit=
This commit is contained in:
parent
c544ca9934
commit
b8cd929a6f
2 changed files with 5 additions and 4 deletions
|
@ -3,6 +3,7 @@ Changelog
|
|||
1.5:
|
||||
- Added 'no info... yet' message when mods/ scan is still in-progress
|
||||
- Fixed advanced find tags not honoring start= when greater than match count
|
||||
- Fixed advanced find tags not honoring limit=
|
||||
- Fixed hidden files and directories not appearing when finding resources
|
||||
- Updated log4j2 to 2.0-beta9, fixing a hang when run with Java 1.7.0_25
|
||||
- Changed FTLDat to allow opening dats in read-only mode
|
||||
|
|
|
@ -125,7 +125,7 @@ public class XMLPatcher {
|
|||
|
||||
if ( searchStart < matchedNodes.size() ) {
|
||||
if ( searchLimit > -1 ) {
|
||||
matchedNodes = matchedNodes.subList( searchStart, Math.max( matchedNodes.size(), searchStart + searchLimit ) );
|
||||
matchedNodes = matchedNodes.subList( searchStart, Math.min( matchedNodes.size(), searchStart + searchLimit ) );
|
||||
} else if ( searchStart > 0 ) {
|
||||
matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() );
|
||||
}
|
||||
|
@ -180,7 +180,7 @@ public class XMLPatcher {
|
|||
|
||||
if ( searchStart < matchedNodes.size() ) {
|
||||
if ( searchLimit > -1 ) {
|
||||
matchedNodes = matchedNodes.subList( searchStart, Math.max( matchedNodes.size(), searchStart + searchLimit ) );
|
||||
matchedNodes = matchedNodes.subList( searchStart, Math.min( matchedNodes.size(), searchStart + searchLimit ) );
|
||||
} else if ( searchStart > 0 ) {
|
||||
matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() );
|
||||
}
|
||||
|
@ -235,7 +235,7 @@ public class XMLPatcher {
|
|||
|
||||
if ( searchStart < matchedNodes.size() ) {
|
||||
if ( searchLimit > -1 ) {
|
||||
matchedNodes = matchedNodes.subList( searchStart, Math.max( matchedNodes.size(), searchStart + searchLimit ) );
|
||||
matchedNodes = matchedNodes.subList( searchStart, Math.min( matchedNodes.size(), searchStart + searchLimit ) );
|
||||
} else if ( searchStart > 0 ) {
|
||||
matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() );
|
||||
}
|
||||
|
@ -270,7 +270,7 @@ public class XMLPatcher {
|
|||
|
||||
if ( searchStart < matchedNodes.size() ) {
|
||||
if ( searchLimit > -1 ) {
|
||||
matchedNodes = matchedNodes.subList( searchStart, Math.max( matchedNodes.size(), searchStart + searchLimit ) );
|
||||
matchedNodes = matchedNodes.subList( searchStart, Math.min( matchedNodes.size(), searchStart + searchLimit ) );
|
||||
} else if ( searchStart > 0 ) {
|
||||
matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() );
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue