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

asciiEncoder.reset().canEncode(...)

Browse source
This commit is contained in:
Vhati 2017-12-30 09:32:52 -05:00
parent d8c22515a0
commit 505f57f43e
3 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/net/vhati/ftldat/FTLPack.java
View file

@ -329,7 +329,7 @@ public class FTLPack extends AbstractPack {
if ( pathToIndexMap.containsKey( innerPath ) ) { if ( pathToIndexMap.containsKey( innerPath ) ) {
throw new IOException( "InnerPath already exists: "+ innerPath ); throw new IOException( "InnerPath already exists: "+ innerPath );
} }
if ( !asciiEncoder.canEncode( innerPath ) ) { if ( !asciiEncoder.reset().canEncode( innerPath ) ) {
throw new IllegalArgumentException( "InnerPath contains non-ascii characters: "+ innerPath ); throw new IllegalArgumentException( "InnerPath contains non-ascii characters: "+ innerPath );
} }

6
src/main/java/net/vhati/ftldat/PkgPack.java
View file

@ -266,7 +266,7 @@ public class PkgPack extends AbstractPack {
char c = (char)srcBuf.get(); char c = (char)srcBuf.get();
if ( c == '\0' ) break; if ( c == '\0' ) break;
if ( !asciiEncoder.canEncode( c ) ) { if ( !asciiEncoder.reset().canEncode( c ) ) {
throw new IOException( String.format( "Unexpected non-ASCII char in null-terminated string: %X", c ) ); throw new IOException( String.format( "Unexpected non-ASCII char in null-terminated string: %X", c ) );
} }
@ -276,7 +276,7 @@ public class PkgPack extends AbstractPack {
} }
private int writeNullTerminatedString( ByteBuffer dstBuf, CharSequence s ) throws IOException { private int writeNullTerminatedString( ByteBuffer dstBuf, CharSequence s ) throws IOException {
if ( !asciiEncoder.canEncode( s ) ) { if ( !asciiEncoder.reset().canEncode( s ) ) {
throw new IllegalArgumentException( "The PKG format does not support non-ascii characters: "+ s ); throw new IllegalArgumentException( "The PKG format does not support non-ascii characters: "+ s );
} }
@ -577,7 +577,7 @@ public class PkgPack extends AbstractPack {
if ( pathToIndexMap.containsKey( innerPath ) ) { if ( pathToIndexMap.containsKey( innerPath ) ) {
throw new IOException( "InnerPath already exists: "+ innerPath ); throw new IOException( "InnerPath already exists: "+ innerPath );
} }
if ( !asciiEncoder.canEncode( innerPath ) ) { if ( !asciiEncoder.reset().canEncode( innerPath ) ) {
throw new IllegalArgumentException( "InnerPath contains non-ascii characters: "+ innerPath ); throw new IllegalArgumentException( "InnerPath contains non-ascii characters: "+ innerPath );
} }

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

@ -459,7 +459,7 @@ public class ModUtilities {
innerPath = innerPath.replace( '\\', '/' ); innerPath = innerPath.replace( '\\', '/' );
} }
if ( !asciiEncoder.canEncode( innerPath ) ) { if ( !asciiEncoder.reset().canEncode( innerPath ) ) {
pendingMsgs.add( new ReportMessage( pendingMsgs.add( new ReportMessage(
ReportMessage.ERROR, ReportMessage.ERROR,
String.format( "Non-ASCII characters in path." ) String.format( "Non-ASCII characters in path." )
@ -576,6 +576,7 @@ public class ModUtilities {
modValid = false; modValid = false;
} }
// Found chars unique to windows-1252.
if ( decodeResult.encoding.equalsIgnoreCase( "windows-1252" ) ) { if ( decodeResult.encoding.equalsIgnoreCase( "windows-1252" ) ) {
pendingMsgs.add( new ReportMessage( pendingMsgs.add( new ReportMessage(
ReportMessage.WARNING, ReportMessage.WARNING,