zzz/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

use DataHelper.split instead of String.split

Browse Source
This commit is contained in:
zab2
2019-03-28 16:58:34 +00:00
parent fd2819c754
commit 84ea533b11
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
apps/i2ptunnel/java/src/net/i2p/i2ptunnel/access/DefinitionParser.java
View File

@@ -5,6 +5,8 @@ import java.util.ArrayList;
import java.io.File; import java.io.File;
import net.i2p.data.DataHelper;
class DefinitionParser { class DefinitionParser {
static FilterDefinition parse(String []definition) throws InvalidDefinitionException { static FilterDefinition parse(String []definition) throws InvalidDefinitionException {
@@ -12,7 +14,7 @@ class DefinitionParser {
DefinitionBuilder builder = new DefinitionBuilder(); DefinitionBuilder builder = new DefinitionBuilder();
for (String line : definition) { for (String line : definition) {
String [] split = line.split(" "); String [] split = DataHelper.split(line," ");
split[0] = split[0].toLowerCase(); split[0] = split[0].toLowerCase();
if ("default".equals(split[0])) if ("default".equals(split[0]))
builder.setDefaultThreshold(parseThreshold(line.substring(7).trim())); builder.setDefaultThreshold(parseThreshold(line.substring(7).trim()));
@@ -31,7 +33,7 @@ class DefinitionParser {
if ("deny".equalsIgnoreCase(s)) if ("deny".equalsIgnoreCase(s))
return Threshold.DENY; return Threshold.DENY;
String [] split = s.split("/"); String [] split = DataHelper.split(s,"/");
if (split.length != 2) if (split.length != 2)
throw new InvalidDefinitionException("Invalid threshold " + s); throw new InvalidDefinitionException("Invalid threshold " + s);
@@ -77,7 +79,7 @@ class DefinitionParser {
String thresholdString = extractThreshold(line); String thresholdString = extractThreshold(line);
Threshold threshold = parseThreshold(thresholdString); Threshold threshold = parseThreshold(thresholdString);
String line2 = line.substring(thresholdString.length()).trim(); String line2 = line.substring(thresholdString.length()).trim();
String[] split = line2.split(" "); String[] split = DataHelper.split(line2," ");
if (split.length < 2) if (split.length < 2)
throw new InvalidDefinitionException("invalid definition "+line); throw new InvalidDefinitionException("invalid definition "+line);
if ("explicit".equalsIgnoreCase(split[0])) if ("explicit".equalsIgnoreCase(split[0]))