diff --git a/CHANGES b/CHANGES index 5b8f88f..3f165b3 100644 --- a/CHANGES +++ b/CHANGES @@ -32,5 +32,5 @@ Le 08/01/2018 à 01:07, aeris a écrit : * change Java version to 1.8 * anonymized Twitter API key -* eplaced Maven with Ant +* replaced Maven with Ant * no more code injection \ No newline at end of file diff --git a/src/org/april/hebdobot/model/Hebdobot.java b/src/org/april/hebdobot/bot/Hebdobot.java similarity index 98% rename from src/org/april/hebdobot/model/Hebdobot.java rename to src/org/april/hebdobot/bot/Hebdobot.java index e48305a..3477c64 100644 --- a/src/org/april/hebdobot/model/Hebdobot.java +++ b/src/org/april/hebdobot/bot/Hebdobot.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model; +package org.april.hebdobot.bot; import java.io.File; import java.io.IOException; @@ -33,18 +33,18 @@ import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.StringUtils; import org.april.hebdobot.HebdobotException; +import org.april.hebdobot.bot.review.CollectiveTopic; +import org.april.hebdobot.bot.review.IndividualTopic; +import org.april.hebdobot.bot.review.Message; +import org.april.hebdobot.bot.review.Review; +import org.april.hebdobot.bot.review.Topic; +import org.april.hebdobot.bot.stats.ReviewData; +import org.april.hebdobot.bot.stats.ReviewDatas; +import org.april.hebdobot.bot.stats.ReviewDatasFile; +import org.april.hebdobot.bot.stats.ReviewStatsReporter; import org.april.hebdobot.cron.CronManager; import org.april.hebdobot.cron.CronSettings; import org.april.hebdobot.identica.IdenticaSettings; -import org.april.hebdobot.model.review.CollectiveTopic; -import org.april.hebdobot.model.review.IndividualTopic; -import org.april.hebdobot.model.review.Message; -import org.april.hebdobot.model.review.Review; -import org.april.hebdobot.model.review.Topic; -import org.april.hebdobot.model.stats.ReviewData; -import org.april.hebdobot.model.stats.ReviewDatas; -import org.april.hebdobot.model.stats.ReviewDatasFile; -import org.april.hebdobot.model.stats.ReviewStatsReporter; import org.april.hebdobot.pastebin.PastebinClient; import org.april.hebdobot.pastebin.PastebinSettings; import org.april.hebdobot.pastebin.Private; diff --git a/src/org/april/hebdobot/model/UserAliases.java b/src/org/april/hebdobot/bot/UserAliases.java similarity index 99% rename from src/org/april/hebdobot/model/UserAliases.java rename to src/org/april/hebdobot/bot/UserAliases.java index 790ce1b..987a13e 100644 --- a/src/org/april/hebdobot/model/UserAliases.java +++ b/src/org/april/hebdobot/bot/UserAliases.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model; +package org.april.hebdobot.bot; import java.io.File; import java.io.FileNotFoundException; diff --git a/src/org/april/hebdobot/model/review/CollectiveTopic.java b/src/org/april/hebdobot/bot/review/CollectiveTopic.java similarity index 98% rename from src/org/april/hebdobot/model/review/CollectiveTopic.java rename to src/org/april/hebdobot/bot/review/CollectiveTopic.java index 425e830..416a2d1 100644 --- a/src/org/april/hebdobot/model/review/CollectiveTopic.java +++ b/src/org/april/hebdobot/bot/review/CollectiveTopic.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.review; +package org.april.hebdobot.bot.review; import java.util.HashSet; import java.util.List; diff --git a/src/org/april/hebdobot/model/review/IndividualTopic.java b/src/org/april/hebdobot/bot/review/IndividualTopic.java similarity index 98% rename from src/org/april/hebdobot/model/review/IndividualTopic.java rename to src/org/april/hebdobot/bot/review/IndividualTopic.java index 95b773b..160ebda 100644 --- a/src/org/april/hebdobot/model/review/IndividualTopic.java +++ b/src/org/april/hebdobot/bot/review/IndividualTopic.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.review; +package org.april.hebdobot.bot.review; import java.util.HashMap; import java.util.Map; diff --git a/src/org/april/hebdobot/model/review/Message.java b/src/org/april/hebdobot/bot/review/Message.java similarity index 97% rename from src/org/april/hebdobot/model/review/Message.java rename to src/org/april/hebdobot/bot/review/Message.java index 19c19cf..a50d98b 100644 --- a/src/org/april/hebdobot/model/review/Message.java +++ b/src/org/april/hebdobot/bot/review/Message.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.review; +package org.april.hebdobot.bot.review; import java.time.LocalDateTime; diff --git a/src/org/april/hebdobot/model/review/MessageList.java b/src/org/april/hebdobot/bot/review/MessageList.java similarity index 96% rename from src/org/april/hebdobot/model/review/MessageList.java rename to src/org/april/hebdobot/bot/review/MessageList.java index 6097e33..bd8c512 100644 --- a/src/org/april/hebdobot/model/review/MessageList.java +++ b/src/org/april/hebdobot/bot/review/MessageList.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.review; +package org.april.hebdobot.bot.review; import java.util.ArrayList; diff --git a/src/org/april/hebdobot/model/review/Messages.java b/src/org/april/hebdobot/bot/review/Messages.java similarity index 96% rename from src/org/april/hebdobot/model/review/Messages.java rename to src/org/april/hebdobot/bot/review/Messages.java index 5a21b97..e710ede 100644 --- a/src/org/april/hebdobot/model/review/Messages.java +++ b/src/org/april/hebdobot/bot/review/Messages.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.review; +package org.april.hebdobot.bot.review; import java.util.LinkedList; diff --git a/src/org/april/hebdobot/model/review/Review.java b/src/org/april/hebdobot/bot/review/Review.java similarity index 99% rename from src/org/april/hebdobot/model/review/Review.java rename to src/org/april/hebdobot/bot/review/Review.java index 3ad6c3d..b133973 100644 --- a/src/org/april/hebdobot/model/review/Review.java +++ b/src/org/april/hebdobot/bot/review/Review.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.review; +package org.april.hebdobot.bot.review; import java.time.Duration; import java.time.LocalDateTime; @@ -29,7 +29,7 @@ import java.util.List; import java.util.Locale; import org.apache.commons.lang3.StringUtils; -import org.april.hebdobot.model.UserAliases; +import org.april.hebdobot.bot.UserAliases; import fr.devinsy.strings.StringSet; diff --git a/src/org/april/hebdobot/model/review/Topic.java b/src/org/april/hebdobot/bot/review/Topic.java similarity index 97% rename from src/org/april/hebdobot/model/review/Topic.java rename to src/org/april/hebdobot/bot/review/Topic.java index eeadcd0..adccb3c 100644 --- a/src/org/april/hebdobot/model/review/Topic.java +++ b/src/org/april/hebdobot/bot/review/Topic.java @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.review; +package org.april.hebdobot.bot.review; import java.util.Set; diff --git a/src/org/april/hebdobot/model/stats/IntegerBoard.java b/src/org/april/hebdobot/bot/stats/IntegerBoard.java similarity index 99% rename from src/org/april/hebdobot/model/stats/IntegerBoard.java rename to src/org/april/hebdobot/bot/stats/IntegerBoard.java index ed054ee..da7857c 100644 --- a/src/org/april/hebdobot/model/stats/IntegerBoard.java +++ b/src/org/april/hebdobot/bot/stats/IntegerBoard.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.stats; +package org.april.hebdobot.bot.stats; import java.util.Collections; import java.util.HashMap; diff --git a/src/org/april/hebdobot/model/stats/IntegerStat.java b/src/org/april/hebdobot/bot/stats/IntegerStat.java similarity index 97% rename from src/org/april/hebdobot/model/stats/IntegerStat.java rename to src/org/april/hebdobot/bot/stats/IntegerStat.java index 38d810a..7232e5f 100644 --- a/src/org/april/hebdobot/model/stats/IntegerStat.java +++ b/src/org/april/hebdobot/bot/stats/IntegerStat.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.stats; +package org.april.hebdobot.bot.stats; /** * The Class Stat. diff --git a/src/org/april/hebdobot/model/stats/IntegerStatComparator.java b/src/org/april/hebdobot/bot/stats/IntegerStatComparator.java similarity index 99% rename from src/org/april/hebdobot/model/stats/IntegerStatComparator.java rename to src/org/april/hebdobot/bot/stats/IntegerStatComparator.java index 09d2c0f..2f49e93 100644 --- a/src/org/april/hebdobot/model/stats/IntegerStatComparator.java +++ b/src/org/april/hebdobot/bot/stats/IntegerStatComparator.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.stats; +package org.april.hebdobot.bot.stats; import java.util.Comparator; diff --git a/src/org/april/hebdobot/model/stats/IntegerStats.java b/src/org/april/hebdobot/bot/stats/IntegerStats.java similarity index 94% rename from src/org/april/hebdobot/model/stats/IntegerStats.java rename to src/org/april/hebdobot/bot/stats/IntegerStats.java index a4bd80a..2a58e35 100644 --- a/src/org/april/hebdobot/model/stats/IntegerStats.java +++ b/src/org/april/hebdobot/bot/stats/IntegerStats.java @@ -16,12 +16,12 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.stats; +package org.april.hebdobot.bot.stats; import java.util.ArrayList; import java.util.Collections; -import org.april.hebdobot.model.stats.IntegerStatComparator.Sorting; +import org.april.hebdobot.bot.stats.IntegerStatComparator.Sorting; /** * The Class Stats. diff --git a/src/org/april/hebdobot/model/stats/ReviewData.java b/src/org/april/hebdobot/bot/stats/ReviewData.java similarity index 98% rename from src/org/april/hebdobot/model/stats/ReviewData.java rename to src/org/april/hebdobot/bot/stats/ReviewData.java index eaf8912..bc23219 100644 --- a/src/org/april/hebdobot/model/stats/ReviewData.java +++ b/src/org/april/hebdobot/bot/stats/ReviewData.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.stats; +package org.april.hebdobot.bot.stats; import java.time.LocalDateTime; diff --git a/src/org/april/hebdobot/model/stats/ReviewDataComparator.java b/src/org/april/hebdobot/bot/stats/ReviewDataComparator.java similarity index 99% rename from src/org/april/hebdobot/model/stats/ReviewDataComparator.java rename to src/org/april/hebdobot/bot/stats/ReviewDataComparator.java index 65566b1..8b6c311 100644 --- a/src/org/april/hebdobot/model/stats/ReviewDataComparator.java +++ b/src/org/april/hebdobot/bot/stats/ReviewDataComparator.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.stats; +package org.april.hebdobot.bot.stats; import java.time.LocalDateTime; import java.util.Comparator; diff --git a/src/org/april/hebdobot/model/stats/ReviewDatas.java b/src/org/april/hebdobot/bot/stats/ReviewDatas.java similarity index 97% rename from src/org/april/hebdobot/model/stats/ReviewDatas.java rename to src/org/april/hebdobot/bot/stats/ReviewDatas.java index bb6b90b..85058bd 100644 --- a/src/org/april/hebdobot/model/stats/ReviewDatas.java +++ b/src/org/april/hebdobot/bot/stats/ReviewDatas.java @@ -16,13 +16,13 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.stats; +package org.april.hebdobot.bot.stats; import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; -import org.april.hebdobot.model.stats.ReviewDataComparator.Sorting; +import org.april.hebdobot.bot.stats.ReviewDataComparator.Sorting; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/april/hebdobot/model/stats/ReviewDatasFile.java b/src/org/april/hebdobot/bot/stats/ReviewDatasFile.java similarity index 99% rename from src/org/april/hebdobot/model/stats/ReviewDatasFile.java rename to src/org/april/hebdobot/bot/stats/ReviewDatasFile.java index e01d162..0a1d677 100644 --- a/src/org/april/hebdobot/model/stats/ReviewDatasFile.java +++ b/src/org/april/hebdobot/bot/stats/ReviewDatasFile.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.stats; +package org.april.hebdobot.bot.stats; import java.io.BufferedReader; import java.io.File; diff --git a/src/org/april/hebdobot/model/stats/ReviewStatsReporter.java b/src/org/april/hebdobot/bot/stats/ReviewStatsReporter.java similarity index 99% rename from src/org/april/hebdobot/model/stats/ReviewStatsReporter.java rename to src/org/april/hebdobot/bot/stats/ReviewStatsReporter.java index d99ce02..68b6cbd 100644 --- a/src/org/april/hebdobot/model/stats/ReviewStatsReporter.java +++ b/src/org/april/hebdobot/bot/stats/ReviewStatsReporter.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.stats; +package org.april.hebdobot.bot.stats; import java.time.format.DateTimeFormatter; import java.util.Locale; diff --git a/src/org/april/hebdobot/model/stats/SimpleIntegerBoard.java b/src/org/april/hebdobot/bot/stats/SimpleIntegerBoard.java similarity index 98% rename from src/org/april/hebdobot/model/stats/SimpleIntegerBoard.java rename to src/org/april/hebdobot/bot/stats/SimpleIntegerBoard.java index e93dac5..dc18a38 100644 --- a/src/org/april/hebdobot/model/stats/SimpleIntegerBoard.java +++ b/src/org/april/hebdobot/bot/stats/SimpleIntegerBoard.java @@ -16,7 +16,7 @@ * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ -package org.april.hebdobot.model.stats; +package org.april.hebdobot.bot.stats; import java.util.ArrayList; import java.util.Collections; diff --git a/src/org/april/hebdobot/cli/HebdobotCLI.java b/src/org/april/hebdobot/cli/HebdobotCLI.java index e0f4559..749e585 100644 --- a/src/org/april/hebdobot/cli/HebdobotCLI.java +++ b/src/org/april/hebdobot/cli/HebdobotCLI.java @@ -31,8 +31,8 @@ import org.apache.commons.lang3.StringUtils; import org.apache.log4j.BasicConfigurator; import org.apache.log4j.PropertyConfigurator; import org.april.hebdobot.HebdobotException; -import org.april.hebdobot.model.Hebdobot; -import org.april.hebdobot.model.UserAliases; +import org.april.hebdobot.bot.Hebdobot; +import org.april.hebdobot.bot.UserAliases; import org.april.hebdobot.util.BuildInformation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/org/april/hebdobot/cron/CronListener.java b/src/org/april/hebdobot/cron/CronListener.java index 86d240c..1fb2986 100644 --- a/src/org/april/hebdobot/cron/CronListener.java +++ b/src/org/april/hebdobot/cron/CronListener.java @@ -20,7 +20,7 @@ package org.april.hebdobot.cron; import org.apache.commons.lang3.StringUtils; -import org.april.hebdobot.model.Hebdobot; +import org.april.hebdobot.bot.Hebdobot; import org.quartz.JobExecutionContext; import org.quartz.Trigger; import org.quartz.Trigger.CompletedExecutionInstruction; diff --git a/src/org/april/hebdobot/cron/CronManager.java b/src/org/april/hebdobot/cron/CronManager.java index 305daba..3e947b1 100644 --- a/src/org/april/hebdobot/cron/CronManager.java +++ b/src/org/april/hebdobot/cron/CronManager.java @@ -19,7 +19,7 @@ */ package org.april.hebdobot.cron; -import org.april.hebdobot.model.Hebdobot; +import org.april.hebdobot.bot.Hebdobot; import org.quartz.CronScheduleBuilder; import org.quartz.JobBuilder; import org.quartz.JobDetail; diff --git a/test/org/april/hebdobot/BotMock.java b/test/org/april/hebdobot/BotMock.java index 64ad892..7bd9619 100644 --- a/test/org/april/hebdobot/BotMock.java +++ b/test/org/april/hebdobot/BotMock.java @@ -21,7 +21,7 @@ package org.april.hebdobot; import java.io.File; -import org.april.hebdobot.model.Hebdobot; +import org.april.hebdobot.bot.Hebdobot; /** * The Class BotMock. diff --git a/test/org/april/hebdobot/reviewstats/ReviewStatsTest.java b/test/org/april/hebdobot/reviewstats/ReviewStatsTest.java index 33c0305..87296e8 100644 --- a/test/org/april/hebdobot/reviewstats/ReviewStatsTest.java +++ b/test/org/april/hebdobot/reviewstats/ReviewStatsTest.java @@ -23,10 +23,10 @@ import java.time.LocalDateTime; import org.apache.commons.lang3.StringUtils; import org.apache.log4j.BasicConfigurator; -import org.april.hebdobot.model.stats.ReviewData; -import org.april.hebdobot.model.stats.ReviewDatas; -import org.april.hebdobot.model.stats.ReviewDatasFile; -import org.april.hebdobot.model.stats.ReviewStatsReporter; +import org.april.hebdobot.bot.stats.ReviewData; +import org.april.hebdobot.bot.stats.ReviewDatas; +import org.april.hebdobot.bot.stats.ReviewDatasFile; +import org.april.hebdobot.bot.stats.ReviewStatsReporter; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test;