From d52d3589842e74c31f67f29f154d57e637403a9e Mon Sep 17 00:00:00 2001 From: "Christian P. MOMON" Date: Fri, 21 Sep 2018 22:29:51 +0200 Subject: [PATCH] Reversed copyright line order (because it will be easier to detect un-updated headers). --- src/org/april/hebdobot/HebdobotLauncher.java | 2 +- src/org/april/hebdobot/bot/Hebdobot.java | 2 +- src/org/april/hebdobot/bot/UserAliases.java | 2 +- .../hebdobot/bot/review/CollectiveTopic.java | 4 +-- .../hebdobot/bot/review/IndividualTopic.java | 4 +-- .../april/hebdobot/bot/review/Message.java | 2 +- .../hebdobot/bot/review/MessageList.java | 2 +- .../april/hebdobot/bot/review/Messages.java | 2 +- src/org/april/hebdobot/bot/review/Review.java | 2 +- src/org/april/hebdobot/bot/review/Topic.java | 2 +- src/org/april/hebdobot/cli/HebdobotCLI.java | 2 +- src/org/april/hebdobot/cron/CronManager.java | 2 +- src/org/april/hebdobot/cron/NotifyJob.java | 2 +- .../april/hebdobot/identica/IdentiCaApi.java | 2 +- .../hebdobot/identica/IdentiCaClient.java | 28 +++++++++---------- .../hebdobot/identica/IdenticaSettings.java | 2 +- .../hebdobot/identica/StatusNetClient.java | 2 +- .../april/hebdobot/pastebin/APIException.java | 2 +- .../april/hebdobot/pastebin/Expiration.java | 2 +- src/org/april/hebdobot/pastebin/Format.java | 2 +- src/org/april/hebdobot/pastebin/Option.java | 2 +- .../hebdobot/pastebin/PastebinClient.java | 6 ++-- .../hebdobot/pastebin/PastebinSettings.java | 2 +- src/org/april/hebdobot/pastebin/Private.java | 2 +- test/org/april/hebdobot/BotMock.java | 2 +- .../hebdobot/pastebin/PastebinClientTest.java | 4 +-- 26 files changed, 43 insertions(+), 45 deletions(-) diff --git a/src/org/april/hebdobot/HebdobotLauncher.java b/src/org/april/hebdobot/HebdobotLauncher.java index e49191e..6ad6c49 100644 --- a/src/org/april/hebdobot/HebdobotLauncher.java +++ b/src/org/april/hebdobot/HebdobotLauncher.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/bot/Hebdobot.java b/src/org/april/hebdobot/bot/Hebdobot.java index 51e9ba3..ffda692 100644 --- a/src/org/april/hebdobot/bot/Hebdobot.java +++ b/src/org/april/hebdobot/bot/Hebdobot.java @@ -1,6 +1,6 @@ /** - * Copyright (C) 2011-2013,2017 Nicolas Vinot * Copyright (C) 2017-2018 Christian Pierre MOMON + * Copyright (C) 2011-2013,2017 Nicolas Vinot * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/bot/UserAliases.java b/src/org/april/hebdobot/bot/UserAliases.java index 987a13e..fc5a8f5 100644 --- a/src/org/april/hebdobot/bot/UserAliases.java +++ b/src/org/april/hebdobot/bot/UserAliases.java @@ -1,6 +1,6 @@ /** - * Copyright (C) 2011-2013 Nicolas Vinot * Copyright (C) 2017-2018 Christian Pierre MOMON + * Copyright (C) 2011-2013 Nicolas Vinot * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/bot/review/CollectiveTopic.java b/src/org/april/hebdobot/bot/review/CollectiveTopic.java index 416a2d1..33a230c 100644 --- a/src/org/april/hebdobot/bot/review/CollectiveTopic.java +++ b/src/org/april/hebdobot/bot/review/CollectiveTopic.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * @@ -68,7 +68,7 @@ public class CollectiveTopic extends Topic @Override public Set getParticipants() { - final Set participants = new HashSet(); + final Set participants = new HashSet<>(); for (final Message message : this.messages) { participants.add(message.getAuthor()); diff --git a/src/org/april/hebdobot/bot/review/IndividualTopic.java b/src/org/april/hebdobot/bot/review/IndividualTopic.java index 160ebda..4309ba0 100644 --- a/src/org/april/hebdobot/bot/review/IndividualTopic.java +++ b/src/org/april/hebdobot/bot/review/IndividualTopic.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * @@ -40,7 +40,7 @@ public class IndividualTopic extends Topic { super(title); - this.messages = new HashMap(); + this.messages = new HashMap<>(); } /* (non-Javadoc) diff --git a/src/org/april/hebdobot/bot/review/Message.java b/src/org/april/hebdobot/bot/review/Message.java index a50d98b..2315d4f 100644 --- a/src/org/april/hebdobot/bot/review/Message.java +++ b/src/org/april/hebdobot/bot/review/Message.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/bot/review/MessageList.java b/src/org/april/hebdobot/bot/review/MessageList.java index bd8c512..567d579 100644 --- a/src/org/april/hebdobot/bot/review/MessageList.java +++ b/src/org/april/hebdobot/bot/review/MessageList.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2017 Christian Pierre MOMON + * Copyright (C) 2017-2018 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/bot/review/Messages.java b/src/org/april/hebdobot/bot/review/Messages.java index e710ede..432eb2e 100644 --- a/src/org/april/hebdobot/bot/review/Messages.java +++ b/src/org/april/hebdobot/bot/review/Messages.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2017 Christian Pierre MOMON + * Copyright (C) 2017-2018 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/bot/review/Review.java b/src/org/april/hebdobot/bot/review/Review.java index b133973..4340f96 100644 --- a/src/org/april/hebdobot/bot/review/Review.java +++ b/src/org/april/hebdobot/bot/review/Review.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/bot/review/Topic.java b/src/org/april/hebdobot/bot/review/Topic.java index adccb3c..16a1c96 100644 --- a/src/org/april/hebdobot/bot/review/Topic.java +++ b/src/org/april/hebdobot/bot/review/Topic.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/cli/HebdobotCLI.java b/src/org/april/hebdobot/cli/HebdobotCLI.java index 749e585..2c5690f 100644 --- a/src/org/april/hebdobot/cli/HebdobotCLI.java +++ b/src/org/april/hebdobot/cli/HebdobotCLI.java @@ -1,6 +1,6 @@ /** - * Copyright (C) 2011-2013 Nicolas Vinot * Copyright (C) 2017-2018 Christian Pierre MOMON + * Copyright (C) 2011-2013 Nicolas Vinot * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/cron/CronManager.java b/src/org/april/hebdobot/cron/CronManager.java index 711aa35..936f4d1 100644 --- a/src/org/april/hebdobot/cron/CronManager.java +++ b/src/org/april/hebdobot/cron/CronManager.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013,2017 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/cron/NotifyJob.java b/src/org/april/hebdobot/cron/NotifyJob.java index 956e8b5..89000e6 100644 --- a/src/org/april/hebdobot/cron/NotifyJob.java +++ b/src/org/april/hebdobot/cron/NotifyJob.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013,2017 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/identica/IdentiCaApi.java b/src/org/april/hebdobot/identica/IdentiCaApi.java index 3028193..33cb451 100644 --- a/src/org/april/hebdobot/identica/IdentiCaApi.java +++ b/src/org/april/hebdobot/identica/IdentiCaApi.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/identica/IdentiCaClient.java b/src/org/april/hebdobot/identica/IdentiCaClient.java index 3686ab4..571aeb6 100644 --- a/src/org/april/hebdobot/identica/IdentiCaClient.java +++ b/src/org/april/hebdobot/identica/IdentiCaClient.java @@ -1,19 +1,19 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON - * + * * This file is part of (April) Hebdobot. - * + * * Hebdobot is free software: you can redistribute it and/or modify * it under the terms of the GNU Affero General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. - * + * * Hebdobot is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU Affero General Public License for more details. - * + * * You should have received a copy of the GNU Affero General Public License * along with Hebdobot. If not, see */ @@ -44,6 +44,15 @@ public class IdentiCaClient extends StatusNetClient super(API_CLASS, apiKey, apiSecret, tokenKey, tokenSecret); } + /* (non-Javadoc) + * @see org.april.hebdobot.statusnet.StatusNetClient#getApiUrl() + */ + @Override + protected String getApiUrl() + { + return IDENTICA_API_URL; + } + /** * Register. * @@ -56,13 +65,4 @@ public class IdentiCaClient extends StatusNetClient { StatusNetClient.register(API_CLASS, apiKey, apiSecret); } - - /* (non-Javadoc) - * @see org.april.hebdobot.statusnet.StatusNetClient#getApiUrl() - */ - @Override - protected String getApiUrl() - { - return IDENTICA_API_URL; - } } diff --git a/src/org/april/hebdobot/identica/IdenticaSettings.java b/src/org/april/hebdobot/identica/IdenticaSettings.java index ad9a258..c317e88 100644 --- a/src/org/april/hebdobot/identica/IdenticaSettings.java +++ b/src/org/april/hebdobot/identica/IdenticaSettings.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/identica/StatusNetClient.java b/src/org/april/hebdobot/identica/StatusNetClient.java index 0f98256..c1142a2 100644 --- a/src/org/april/hebdobot/identica/StatusNetClient.java +++ b/src/org/april/hebdobot/identica/StatusNetClient.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/pastebin/APIException.java b/src/org/april/hebdobot/pastebin/APIException.java index e4ba850..136d434 100644 --- a/src/org/april/hebdobot/pastebin/APIException.java +++ b/src/org/april/hebdobot/pastebin/APIException.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/pastebin/Expiration.java b/src/org/april/hebdobot/pastebin/Expiration.java index 2e32510..c9fd15b 100644 --- a/src/org/april/hebdobot/pastebin/Expiration.java +++ b/src/org/april/hebdobot/pastebin/Expiration.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/pastebin/Format.java b/src/org/april/hebdobot/pastebin/Format.java index ddc3ede..8d0ef55 100644 --- a/src/org/april/hebdobot/pastebin/Format.java +++ b/src/org/april/hebdobot/pastebin/Format.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/pastebin/Option.java b/src/org/april/hebdobot/pastebin/Option.java index 2eeaa1e..1c9960f 100644 --- a/src/org/april/hebdobot/pastebin/Option.java +++ b/src/org/april/hebdobot/pastebin/Option.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/pastebin/PastebinClient.java b/src/org/april/hebdobot/pastebin/PastebinClient.java index 433b442..ffa6c6f 100644 --- a/src/org/april/hebdobot/pastebin/PastebinClient.java +++ b/src/org/april/hebdobot/pastebin/PastebinClient.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * @@ -87,7 +87,7 @@ public class PastebinClient { try { - final List params = new LinkedList(); + final List params = new LinkedList<>(); setParameter(params, API_DEV_KEY, this.apiKey); setParameter(params, API_USER_NAME, name); setParameter(params, API_USER_PASSWORD, password); @@ -412,7 +412,7 @@ public class PastebinClient try { - List params = new LinkedList(); + List params = new LinkedList<>(); setParameter(params, API_DEV_KEY, this.apiKey); setParameter(params, API_USER_KEY, this.apiUserKey); setParameter(params, API_OPTION, Option.PASTE.getValue()); diff --git a/src/org/april/hebdobot/pastebin/PastebinSettings.java b/src/org/april/hebdobot/pastebin/PastebinSettings.java index 8f2d7ef..020471f 100644 --- a/src/org/april/hebdobot/pastebin/PastebinSettings.java +++ b/src/org/april/hebdobot/pastebin/PastebinSettings.java @@ -1,5 +1,5 @@ /** - * Copyright (C) 2017 Christian Pierre MOMON + * Copyright (C) 2017-2018 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/src/org/april/hebdobot/pastebin/Private.java b/src/org/april/hebdobot/pastebin/Private.java index b770d40..0fe3620 100644 --- a/src/org/april/hebdobot/pastebin/Private.java +++ b/src/org/april/hebdobot/pastebin/Private.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * diff --git a/test/org/april/hebdobot/BotMock.java b/test/org/april/hebdobot/BotMock.java index 7bd9619..b5f4067 100644 --- a/test/org/april/hebdobot/BotMock.java +++ b/test/org/april/hebdobot/BotMock.java @@ -1,6 +1,6 @@ /** - * Copyright (C) 2011-2013,2017 Nicolas Vinot * Copyright (C) 2017-2018 Christian Pierre MOMON + * Copyright (C) 2011-2013,2017 Nicolas Vinot * * This file is part of (April) Hebdobot. * diff --git a/test/org/april/hebdobot/pastebin/PastebinClientTest.java b/test/org/april/hebdobot/pastebin/PastebinClientTest.java index db0b9b3..c0f5aef 100644 --- a/test/org/april/hebdobot/pastebin/PastebinClientTest.java +++ b/test/org/april/hebdobot/pastebin/PastebinClientTest.java @@ -1,6 +1,6 @@ /** + * Copyright (C) 2017-2018 Christian Pierre MOMON * Copyright (C) 2011-2013 Nicolas Vinot - * Copyright (C) 2017 Christian Pierre MOMON * * This file is part of (April) Hebdobot. * @@ -19,8 +19,6 @@ */ package org.april.hebdobot.pastebin; -import org.april.hebdobot.pastebin.Expiration; -import org.april.hebdobot.pastebin.PastebinClient; import org.junit.Test; /**