diff --git a/.classpath b/.classpath index 6380a2e..314ec86 100644 --- a/.classpath +++ b/.classpath @@ -13,10 +13,7 @@ - - - @@ -29,7 +26,6 @@ - @@ -39,5 +35,9 @@ + + + + diff --git a/lib/Logs/slf4j-api-1.7.25-sources.jar b/lib/Logs/slf4j-api-1.7.25-sources.jar new file mode 100644 index 0000000..b2a3d83 Binary files /dev/null and b/lib/Logs/slf4j-api-1.7.25-sources.jar differ diff --git a/lib/Logs/slf4j-api-1.7.25.jar b/lib/Logs/slf4j-api-1.7.25.jar new file mode 100644 index 0000000..7e62f13 Binary files /dev/null and b/lib/Logs/slf4j-api-1.7.25.jar differ diff --git a/lib/Logs/slf4j-api-1.7.5-sources.jar b/lib/Logs/slf4j-api-1.7.5-sources.jar deleted file mode 100644 index 51abe2b..0000000 Binary files a/lib/Logs/slf4j-api-1.7.5-sources.jar and /dev/null differ diff --git a/lib/Logs/slf4j-api-1.7.5.jar b/lib/Logs/slf4j-api-1.7.5.jar deleted file mode 100644 index 8766455..0000000 Binary files a/lib/Logs/slf4j-api-1.7.5.jar and /dev/null differ diff --git a/lib/Logs/slf4j-log4j12-1.7.25-sources.jar b/lib/Logs/slf4j-log4j12-1.7.25-sources.jar new file mode 100644 index 0000000..0cd5be7 Binary files /dev/null and b/lib/Logs/slf4j-log4j12-1.7.25-sources.jar differ diff --git a/lib/Logs/slf4j-log4j12-1.7.25.jar b/lib/Logs/slf4j-log4j12-1.7.25.jar new file mode 100644 index 0000000..4a44e06 Binary files /dev/null and b/lib/Logs/slf4j-log4j12-1.7.25.jar differ diff --git a/lib/Logs/slf4j-log4j12-1.7.5-sources.jar b/lib/Logs/slf4j-log4j12-1.7.5-sources.jar deleted file mode 100644 index ea1b93b..0000000 Binary files a/lib/Logs/slf4j-log4j12-1.7.5-sources.jar and /dev/null differ diff --git a/lib/Logs/slf4j-log4j12-1.7.5.jar b/lib/Logs/slf4j-log4j12-1.7.5.jar deleted file mode 100644 index afce5c2..0000000 Binary files a/lib/Logs/slf4j-log4j12-1.7.5.jar and /dev/null differ diff --git a/lib/UnitTesting/junit-4.11-sources.jar b/lib/UnitTesting/junit-4.11-sources.jar deleted file mode 100644 index bab4cdd..0000000 Binary files a/lib/UnitTesting/junit-4.11-sources.jar and /dev/null differ diff --git a/lib/UnitTesting/junit-4.11.jar b/lib/UnitTesting/junit-4.11.jar deleted file mode 100644 index aaf7444..0000000 Binary files a/lib/UnitTesting/junit-4.11.jar and /dev/null differ diff --git a/lib/UnitTesting/junit-4.12-sources.jar b/lib/UnitTesting/junit-4.12-sources.jar new file mode 100644 index 0000000..884f92f Binary files /dev/null and b/lib/UnitTesting/junit-4.12-sources.jar differ diff --git a/lib/UnitTesting/junit-4.12.jar b/lib/UnitTesting/junit-4.12.jar new file mode 100644 index 0000000..3a7fc26 Binary files /dev/null and b/lib/UnitTesting/junit-4.12.jar differ diff --git a/lib/devinsy-strings-0.4.4-sources.zip b/lib/devinsy-strings-0.4.4-sources.zip deleted file mode 100644 index 8ccb845..0000000 Binary files a/lib/devinsy-strings-0.4.4-sources.zip and /dev/null differ diff --git a/lib/devinsy-strings-0.4.4.jar b/lib/devinsy-strings-0.4.4.jar deleted file mode 100644 index 01ced79..0000000 Binary files a/lib/devinsy-strings-0.4.4.jar and /dev/null differ diff --git a/lib/devinsy-strings-0.8.2-sources.zip b/lib/devinsy-strings-0.8.2-sources.zip new file mode 100644 index 0000000..815e0b8 Binary files /dev/null and b/lib/devinsy-strings-0.8.2-sources.zip differ diff --git a/lib/devinsy-strings-0.8.2.jar b/lib/devinsy-strings-0.8.2.jar new file mode 100644 index 0000000..1e95075 Binary files /dev/null and b/lib/devinsy-strings-0.8.2.jar differ diff --git a/src/org/april/hebdobot/cli/HebdobotCLI.java b/src/org/april/hebdobot/cli/HebdobotCLI.java index d7a589e..e0f4559 100644 --- a/src/org/april/hebdobot/cli/HebdobotCLI.java +++ b/src/org/april/hebdobot/cli/HebdobotCLI.java @@ -37,7 +37,7 @@ import org.april.hebdobot.util.BuildInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import fr.devinsy.util.strings.StringList; +import fr.devinsy.strings.StringList; /** * The Class Launcher. diff --git a/src/org/april/hebdobot/cli/HebdobotConfigFile.java b/src/org/april/hebdobot/cli/HebdobotConfigFile.java index 8e1626b..c7df8ab 100644 --- a/src/org/april/hebdobot/cli/HebdobotConfigFile.java +++ b/src/org/april/hebdobot/cli/HebdobotConfigFile.java @@ -33,7 +33,7 @@ import org.april.hebdobot.util.HebdobotUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import fr.devinsy.util.strings.StringSet; +import fr.devinsy.strings.StringSet; /** * The Class Launcher. diff --git a/src/org/april/hebdobot/model/Hebdobot.java b/src/org/april/hebdobot/model/Hebdobot.java index a080022..0716bc2 100644 --- a/src/org/april/hebdobot/model/Hebdobot.java +++ b/src/org/april/hebdobot/model/Hebdobot.java @@ -58,7 +58,7 @@ import org.quartz.SchedulerException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import fr.devinsy.util.strings.StringsUtils; +import fr.devinsy.strings.StringsUtils; import twitter4j.TwitterException; /** @@ -101,7 +101,8 @@ public class Hebdobot extends PircBot * @param reviewDirectory * the review directory */ - public Hebdobot(final String host, final int port, final String nickname, final String channel, final File homeDirectory, final File reviewDirectory) + public Hebdobot(final String host, final int port, final String nickname, final String channel, final File homeDirectory, + final File reviewDirectory) { this.homeDirectory = homeDirectory; this.host = host; diff --git a/src/org/april/hebdobot/model/UserAliases.java b/src/org/april/hebdobot/model/UserAliases.java index cc9bd79..790ce1b 100644 --- a/src/org/april/hebdobot/model/UserAliases.java +++ b/src/org/april/hebdobot/model/UserAliases.java @@ -1,6 +1,6 @@ /** * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON + * Copyright (C) 2017-2018 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * @@ -32,7 +32,7 @@ import org.april.hebdobot.HebdobotException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import fr.devinsy.util.strings.StringList; +import fr.devinsy.strings.StringList; /** * The Class UserAliases. diff --git a/src/org/april/hebdobot/model/review/Review.java b/src/org/april/hebdobot/model/review/Review.java index 1d80401..3ad6c3d 100644 --- a/src/org/april/hebdobot/model/review/Review.java +++ b/src/org/april/hebdobot/model/review/Review.java @@ -31,7 +31,7 @@ import java.util.Locale; import org.apache.commons.lang3.StringUtils; import org.april.hebdobot.model.UserAliases; -import fr.devinsy.util.strings.StringSet; +import fr.devinsy.strings.StringSet; /** * The Class Review. @@ -61,8 +61,8 @@ public class Review public Review(final String owner, final UserAliases aliases) { this.participants = new StringSet(); - this.individualTopics = new LinkedList(); - this.collectiveTopics = new LinkedList(); + this.individualTopics = new LinkedList<>(); + this.collectiveTopics = new LinkedList<>(); this.messages = new MessageList(); this.owner = owner; @@ -230,7 +230,7 @@ public class Review { Collection result; - result = new HashSet(); + result = new HashSet<>(); for (final Topic topic : this.individualTopics) { diff --git a/src/org/april/hebdobot/model/stats/IntegerBoard.java b/src/org/april/hebdobot/model/stats/IntegerBoard.java index d7e88d2..ed054ee 100644 --- a/src/org/april/hebdobot/model/stats/IntegerBoard.java +++ b/src/org/april/hebdobot/model/stats/IntegerBoard.java @@ -23,7 +23,7 @@ import java.util.HashMap; import java.util.Iterator; import java.util.Map; -import fr.devinsy.util.strings.StringList; +import fr.devinsy.strings.StringList; /** * The Class Integers. @@ -39,7 +39,7 @@ public class IntegerBoard implements Iterable */ public IntegerBoard() { - this.integers = new HashMap(30); + this.integers = new HashMap<>(30); this.isUptodate = false; this.board = new IntegerStats(this.integers.size()); } diff --git a/src/org/april/hebdobot/model/stats/ReviewDatasFile.java b/src/org/april/hebdobot/model/stats/ReviewDatasFile.java index 1665576..e01d162 100644 --- a/src/org/april/hebdobot/model/stats/ReviewDatasFile.java +++ b/src/org/april/hebdobot/model/stats/ReviewDatasFile.java @@ -34,8 +34,8 @@ import org.april.hebdobot.HebdobotException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import fr.devinsy.util.strings.StringList; -import fr.devinsy.util.strings.StringsUtils; +import fr.devinsy.strings.StringList; +import fr.devinsy.strings.StringsUtils; /** * The Class StatsFile. diff --git a/src/org/april/hebdobot/model/stats/SimpleIntegerBoard.java b/src/org/april/hebdobot/model/stats/SimpleIntegerBoard.java index 1e4557c..e93dac5 100644 --- a/src/org/april/hebdobot/model/stats/SimpleIntegerBoard.java +++ b/src/org/april/hebdobot/model/stats/SimpleIntegerBoard.java @@ -25,7 +25,7 @@ import java.util.Iterator; import java.util.List; import java.util.Set; -import fr.devinsy.util.strings.StringList; +import fr.devinsy.strings.StringList; /** * The Class Integers. @@ -41,9 +41,9 @@ public class SimpleIntegerBoard implements Iterable */ public SimpleIntegerBoard() { - this.integers = new HashSet(30); + this.integers = new HashSet<>(30); this.isUptodate = false; - this.board = new ArrayList(30); + this.board = new ArrayList<>(30); } /**