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

Fixed advanced find tags not honoring limit=

Browse source
This commit is contained in:
Vhati 2014-04-26 17:28:06 -04:00
parent c544ca9934
commit b8cd929a6f
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
skel_common/readme_changelog.txt
View file

@ -3,6 +3,7 @@ Changelog
1.5: 1.5:
- Added 'no info... yet' message when mods/ scan is still in-progress - 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 start= when greater than match count
- Fixed advanced find tags not honoring limit=
- Fixed hidden files and directories not appearing when finding resources - 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 - 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 - Changed FTLDat to allow opening dats in read-only mode

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

@ -125,7 +125,7 @@ public class XMLPatcher {
if ( searchStart < matchedNodes.size() ) { if ( searchStart < matchedNodes.size() ) {
if ( searchLimit > -1 ) { 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 ) { } else if ( searchStart > 0 ) {
matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() ); matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() );
} }
@ -180,7 +180,7 @@ public class XMLPatcher {
if ( searchStart < matchedNodes.size() ) { if ( searchStart < matchedNodes.size() ) {
if ( searchLimit > -1 ) { 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 ) { } else if ( searchStart > 0 ) {
matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() ); matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() );
} }
@ -235,7 +235,7 @@ public class XMLPatcher {
if ( searchStart < matchedNodes.size() ) { if ( searchStart < matchedNodes.size() ) {
if ( searchLimit > -1 ) { 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 ) { } else if ( searchStart > 0 ) {
matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() ); matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() );
} }
@ -270,7 +270,7 @@ public class XMLPatcher {
if ( searchStart < matchedNodes.size() ) { if ( searchStart < matchedNodes.size() ) {
if ( searchLimit > -1 ) { 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 ) { } else if ( searchStart > 0 ) {
matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() ); matchedNodes = matchedNodes.subList( searchStart, matchedNodes.size() );
} }