From cb7aebca2a351028dd4fdd00dcd637c6aafac79b Mon Sep 17 00:00:00 2001 From: =?utf8?q?David=20=E2=80=98Bombe=E2=80=99=20Roden?= Date: Wed, 16 Oct 2013 08:15:57 +0200 Subject: [PATCH] Remove javadoc comments from overriding methods. --- .../java/net/pterodactylus/sone/core/Core.java | 20 -- .../pterodactylus/sone/core/FreenetInterface.java | 18 -- .../java/net/pterodactylus/sone/core/Options.java | 18 -- .../pterodactylus/sone/core/SoneDownloader.java | 3 - .../net/pterodactylus/sone/core/SoneInserter.java | 9 +- .../net/pterodactylus/sone/core/SoneRescuer.java | 3 - .../pterodactylus/sone/core/WebOfTrustUpdater.java | 15 -- .../sone/data/impl/AbstractPostBuilder.java | 12 - .../sone/data/impl/AbstractReplyBuilder.java | 9 - .../pterodactylus/sone/data/impl/DefaultPost.java | 33 --- .../sone/data/impl/DefaultPostBuilder.java | 1 - .../sone/data/impl/DefaultPostReply.java | 2 - .../sone/data/impl/DefaultPostReplyBuilder.java | 3 - .../pterodactylus/sone/data/impl/DefaultReply.java | 9 - .../pterodactylus/sone/data/impl/DefaultSone.java | 298 --------------------- .../sone/database/memory/MemoryDatabase.java | 23 -- .../sone/fcp/AbstractSoneCommand.java | 9 +- .../pterodactylus/sone/fcp/CreatePostCommand.java | 3 - .../pterodactylus/sone/fcp/CreateReplyCommand.java | 3 - .../pterodactylus/sone/fcp/DeletePostCommand.java | 3 - .../pterodactylus/sone/fcp/DeleteReplyCommand.java | 3 - .../sone/fcp/GetLocalSonesCommand.java | 3 - .../net/pterodactylus/sone/fcp/GetPostCommand.java | 3 - .../pterodactylus/sone/fcp/GetPostFeedCommand.java | 9 +- .../pterodactylus/sone/fcp/GetPostsCommand.java | 3 - .../net/pterodactylus/sone/fcp/GetSoneCommand.java | 7 +- .../pterodactylus/sone/fcp/GetSonesCommand.java | 3 - .../pterodactylus/sone/fcp/LikePostCommand.java | 3 - .../pterodactylus/sone/fcp/LikeReplyCommand.java | 3 - .../net/pterodactylus/sone/fcp/VersionCommand.java | 3 - .../net/pterodactylus/sone/freenet/L10nFilter.java | 3 - .../freenet/PluginStoreConfigurationBackend.java | 33 --- .../pterodactylus/sone/freenet/StringBucket.java | 33 +-- .../sone/freenet/plugin/PluginConnector.java | 9 +- .../sone/freenet/wot/DefaultIdentity.java | 57 ---- .../sone/freenet/wot/DefaultOwnIdentity.java | 3 - .../sone/freenet/wot/IdentityManager.java | 3 - .../net/pterodactylus/sone/freenet/wot/Trust.java | 3 - .../net/pterodactylus/sone/main/SonePlugin.java | 54 +--- .../sone/notify/ListNotification.java | 9 - .../pterodactylus/sone/template/AlbumAccessor.java | 3 - .../sone/template/CollectionAccessor.java | 3 - .../sone/template/CssClassNameFilter.java | 3 - .../pterodactylus/sone/template/GetPagePlugin.java | 3 - .../sone/template/HttpRequestAccessor.java | 3 - .../sone/template/IdentityAccessor.java | 3 - .../pterodactylus/sone/template/ImageAccessor.java | 3 - .../sone/template/ImageLinkFilter.java | 3 - .../sone/template/JavascriptFilter.java | 3 - .../pterodactylus/sone/template/ParserFilter.java | 3 - .../pterodactylus/sone/template/PostAccessor.java | 3 - .../sone/template/ProfileAccessor.java | 3 - .../pterodactylus/sone/template/ReplyAccessor.java | 3 - .../sone/template/ReplyGroupFilter.java | 3 - .../sone/template/RequestChangeFilter.java | 3 - .../pterodactylus/sone/template/SoneAccessor.java | 3 - .../sone/template/SubstringFilter.java | 3 - .../pterodactylus/sone/template/TrustAccessor.java | 3 - .../sone/template/UniqueElementFilter.java | 3 - .../sone/template/UnknownDateFilter.java | 3 - .../java/net/pterodactylus/sone/text/LinkPart.java | 5 - .../net/pterodactylus/sone/text/PartContainer.java | 6 - .../net/pterodactylus/sone/text/PlainTextPart.java | 5 - .../java/net/pterodactylus/sone/text/PostPart.java | 3 - .../java/net/pterodactylus/sone/text/SonePart.java | 3 - .../pterodactylus/sone/text/SoneTextParser.java | 3 - .../sone/utils/IntegerRangePredicate.java | 3 - .../java/net/pterodactylus/sone/web/AboutPage.java | 3 - .../net/pterodactylus/sone/web/BookmarkPage.java | 3 - .../net/pterodactylus/sone/web/BookmarksPage.java | 3 - .../pterodactylus/sone/web/CreateAlbumPage.java | 3 - .../net/pterodactylus/sone/web/CreatePostPage.java | 3 - .../pterodactylus/sone/web/CreateReplyPage.java | 3 - .../net/pterodactylus/sone/web/CreateSonePage.java | 6 - .../pterodactylus/sone/web/DeleteAlbumPage.java | 3 - .../pterodactylus/sone/web/DeleteImagePage.java | 3 - .../net/pterodactylus/sone/web/DeletePostPage.java | 7 +- .../sone/web/DeleteProfileFieldPage.java | 3 - .../pterodactylus/sone/web/DeleteReplyPage.java | 3 - .../net/pterodactylus/sone/web/DeleteSonePage.java | 3 - .../sone/web/DismissNotificationPage.java | 3 - .../net/pterodactylus/sone/web/DistrustPage.java | 7 +- .../net/pterodactylus/sone/web/EditAlbumPage.java | 3 - .../net/pterodactylus/sone/web/EditImagePage.java | 3 - .../sone/web/EditProfileFieldPage.java | 3 - .../pterodactylus/sone/web/EditProfilePage.java | 3 - .../net/pterodactylus/sone/web/FollowSonePage.java | 7 +- .../net/pterodactylus/sone/web/GetImagePage.java | 12 - .../pterodactylus/sone/web/ImageBrowserPage.java | 6 - .../java/net/pterodactylus/sone/web/IndexPage.java | 3 - .../net/pterodactylus/sone/web/KnownSonesPage.java | 3 - .../java/net/pterodactylus/sone/web/LikePage.java | 3 - .../net/pterodactylus/sone/web/LockSonePage.java | 3 - .../java/net/pterodactylus/sone/web/LoginPage.java | 9 - .../net/pterodactylus/sone/web/LogoutPage.java | 6 - .../pterodactylus/sone/web/MarkAsKnownPage.java | 3 - .../java/net/pterodactylus/sone/web/NewPage.java | 7 +- .../net/pterodactylus/sone/web/OptionsPage.java | 3 - .../net/pterodactylus/sone/web/RescuePage.java | 3 - .../net/pterodactylus/sone/web/SearchPage.java | 18 -- .../pterodactylus/sone/web/SoneTemplatePage.java | 30 +-- .../java/net/pterodactylus/sone/web/TrustPage.java | 7 +- .../net/pterodactylus/sone/web/UnbookmarkPage.java | 3 - .../pterodactylus/sone/web/UnfollowSonePage.java | 3 - .../net/pterodactylus/sone/web/UnlikePage.java | 3 - .../net/pterodactylus/sone/web/UnlockSonePage.java | 3 - .../net/pterodactylus/sone/web/UntrustPage.java | 7 +- .../pterodactylus/sone/web/UploadImagePage.java | 3 - .../net/pterodactylus/sone/web/ViewPostPage.java | 13 +- .../net/pterodactylus/sone/web/ViewSonePage.java | 9 - .../sone/web/ajax/BookmarkAjaxPage.java | 6 - .../sone/web/ajax/CreatePostAjaxPage.java | 3 - .../sone/web/ajax/CreateReplyAjaxPage.java | 3 - .../sone/web/ajax/DeletePostAjaxPage.java | 7 +- .../sone/web/ajax/DeleteProfileFieldAjaxPage.java | 3 - .../sone/web/ajax/DeleteReplyAjaxPage.java | 7 +- .../sone/web/ajax/DismissNotificationAjaxPage.java | 6 - .../sone/web/ajax/DistrustAjaxPage.java | 7 +- .../sone/web/ajax/EditAlbumAjaxPage.java | 3 - .../sone/web/ajax/EditImageAjaxPage.java | 3 - .../sone/web/ajax/EditProfileFieldAjaxPage.java | 3 - .../sone/web/ajax/FollowSoneAjaxPage.java | 7 +- .../sone/web/ajax/GetLikesAjaxPage.java | 6 - .../sone/web/ajax/GetNotificationsAjaxPage.java | 9 - .../sone/web/ajax/GetPostAjaxPage.java | 10 +- .../sone/web/ajax/GetReplyAjaxPage.java | 10 +- .../sone/web/ajax/GetStatusAjaxPage.java | 9 - .../sone/web/ajax/GetTimesAjaxPage.java | 9 - .../sone/web/ajax/GetTranslationPage.java | 9 - .../net/pterodactylus/sone/web/ajax/JsonPage.java | 15 +- .../pterodactylus/sone/web/ajax/LikeAjaxPage.java | 3 - .../sone/web/ajax/LockSoneAjaxPage.java | 6 - .../sone/web/ajax/MarkAsKnownAjaxPage.java | 6 - .../sone/web/ajax/MoveProfileFieldAjaxPage.java | 3 - .../pterodactylus/sone/web/ajax/TrustAjaxPage.java | 7 +- .../sone/web/ajax/UnbookmarkAjaxPage.java | 6 - .../sone/web/ajax/UnfollowSoneAjaxPage.java | 3 - .../sone/web/ajax/UnlikeAjaxPage.java | 3 - .../sone/web/ajax/UnlockSoneAjaxPage.java | 6 - .../sone/web/ajax/UntrustAjaxPage.java | 7 +- .../sone/web/page/FreenetTemplatePage.java | 15 -- .../pterodactylus/sone/web/page/PageToadlet.java | 12 - 142 files changed, 62 insertions(+), 1214 deletions(-) diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java index 9a8b7f9..ed75f5e 100644 --- a/src/main/java/net/pterodactylus/sone/core/Core.java +++ b/src/main/java/net/pterodactylus/sone/core/Core.java @@ -333,7 +333,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } - /** {@inheritDocs} */ @Override public Collection getSones() { synchronized (sones) { @@ -341,15 +340,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } - /** - * Returns the Sone with the given ID, regardless whether it’s local or - * remote. - * - * @param id - * The ID of the Sone to get - * @return The Sone with the given ID, or {@code null} if there is no such - * Sone - */ @Override public Optional getSone(String id) { synchronized (sones) { @@ -357,7 +347,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } - /** {@inheritDocs} */ @Override public Collection getLocalSones() { synchronized (sones) { @@ -382,7 +371,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, return from(database.getSone(id).asSet()).firstMatch(LOCAL_SONE_FILTER); } - /** {@inheritDocs} */ @Override public Collection getRemoteSones() { synchronized (sones) { @@ -449,32 +437,27 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, return trustedIdentities.containsEntry(origin.getIdentity(), target.getIdentity()); } - /** {@inheritDoc} */ @Override public Optional getPost(String postId) { return database.getPost(postId); } - /** {@inheritDocs} */ @Override public Collection getPosts(String soneId) { return database.getPosts(soneId); } - /** {@inheritDoc} */ @Override public Collection getDirectedPosts(final String recipientId) { checkNotNull(recipientId, "recipient must not be null"); return database.getDirectedPosts(recipientId); } - /** {@inheritDoc} */ @Override public Optional getPostReply(String replyId) { return database.getPostReply(replyId); } - /** {@inheritDoc} */ @Override public List getReplies(final String postId) { return database.getReplies(postId); @@ -1419,7 +1402,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, // SERVICE METHODS // - /** Starts the core. */ @Override public void serviceStart() { loadConfiguration(); @@ -1430,7 +1412,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, database.start(); } - /** {@inheritDoc} */ @Override public void serviceRun() { long lastSaved = System.currentTimeMillis(); @@ -1447,7 +1428,6 @@ public class Core extends AbstractService implements SoneProvider, PostProvider, } } - /** Stops the core. */ @Override public void serviceStop() { localElementTicker.shutdownNow(); diff --git a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java index 6d857c6..af9aa5a 100644 --- a/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java +++ b/src/main/java/net/pterodactylus/sone/core/FreenetInterface.java @@ -465,17 +465,11 @@ public class FreenetInterface { // INTERFACE ClientPutCallback // - /** - * {@inheritDoc} - */ @Override public void onMajorProgress(ObjectContainer objectContainer) { /* ignore, we don’t care. */ } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("synthetic-access") public void onFailure(InsertException insertException, BaseClientPutter clientPutter, ObjectContainer objectContainer) { @@ -486,33 +480,21 @@ public class FreenetInterface { } } - /** - * {@inheritDoc} - */ @Override public void onFetchable(BaseClientPutter clientPutter, ObjectContainer objectContainer) { /* ignore, we don’t care. */ } - /** - * {@inheritDoc} - */ @Override public void onGeneratedMetadata(Bucket metadata, BaseClientPutter clientPutter, ObjectContainer objectContainer) { /* ignore, we don’t care. */ } - /** - * {@inheritDoc} - */ @Override public void onGeneratedURI(FreenetURI generatedUri, BaseClientPutter clientPutter, ObjectContainer objectContainer) { resultingUri = generatedUri; } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("synthetic-access") public void onSuccess(BaseClientPutter clientPutter, ObjectContainer objectContainer) { diff --git a/src/main/java/net/pterodactylus/sone/core/Options.java b/src/main/java/net/pterodactylus/sone/core/Options.java index c8e3589..83444bb 100644 --- a/src/main/java/net/pterodactylus/sone/core/Options.java +++ b/src/main/java/net/pterodactylus/sone/core/Options.java @@ -181,44 +181,26 @@ public class Options { this.optionWatcher = optionWatcher; } - /** - * {@inheritDoc} - */ @Override public T getDefault() { return defaultValue; } - /** - * {@inheritDoc} - */ @Override public T get() { return (value != null) ? value : defaultValue; } - /** - * Returns the real value of the option. This will also return an unset - * value (usually {@code null})! - * - * @return The real value of the option - */ @Override public T getReal() { return value; } - /** - * {@inheritDoc} - */ @Override public boolean validate(T value) { return (validator == null) || (value == null) || validator.apply(value); } - /** - * {@inheritDoc} - */ @Override public void set(T value) { if ((value != null) && (validator != null) && (!validator.apply(value))) { diff --git a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java index d52e580..dea7402 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneDownloader.java @@ -519,9 +519,6 @@ public class SoneDownloader extends AbstractService { // SERVICE METHODS // - /** - * {@inheritDoc} - */ @Override protected void serviceStop() { for (Sone sone : sones) { diff --git a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java index a1bb903..4fd6504 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneInserter.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneInserter.java @@ -51,13 +51,13 @@ import net.pterodactylus.util.template.TemplateException; import net.pterodactylus.util.template.TemplateParser; import net.pterodactylus.util.template.XmlFilter; +import freenet.client.async.ManifestElement; +import freenet.keys.FreenetURI; + import com.google.common.collect.FluentIterable; import com.google.common.collect.Ordering; import com.google.common.eventbus.EventBus; -import freenet.client.async.ManifestElement; -import freenet.keys.FreenetURI; - /** * A Sone inserter is responsible for inserting a Sone if it has changed. * @@ -183,9 +183,6 @@ public class SoneInserter extends AbstractService { // SERVICE METHODS // - /** - * {@inheritDoc} - */ @Override protected void serviceRun() { long lastModificationTime = 0; diff --git a/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java b/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java index ed3d819..d3924aa 100644 --- a/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java +++ b/src/main/java/net/pterodactylus/sone/core/SoneRescuer.java @@ -146,9 +146,6 @@ public class SoneRescuer extends AbstractService { // SERVICE METHODS // - /** - * {@inheritDoc} - */ @Override protected void serviceRun() { while (!shouldStop()) { diff --git a/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java b/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java index dd3de58..e0a1ff6 100644 --- a/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java +++ b/src/main/java/net/pterodactylus/sone/core/WebOfTrustUpdater.java @@ -223,7 +223,6 @@ public class WebOfTrustUpdater extends AbstractService { // SERVICE METHODS // - /** {@inheritDoc} */ @Override protected void serviceRun() { while (!shouldStop()) { @@ -243,7 +242,6 @@ public class WebOfTrustUpdater extends AbstractService { } } - /** {@inheritDoc} */ @Override protected void serviceStop() { try { @@ -363,7 +361,6 @@ public class WebOfTrustUpdater extends AbstractService { this.comment = comment; } - /** {@inheritDoc} */ @Override @SuppressWarnings("synthetic-access") public void run() { @@ -390,7 +387,6 @@ public class WebOfTrustUpdater extends AbstractService { // OBJECT METHODS // - /** {@inheritDoc} */ @Override public boolean equals(Object object) { if ((object == null) || !object.getClass().equals(getClass())) { @@ -400,13 +396,11 @@ public class WebOfTrustUpdater extends AbstractService { return ((truster == null) ? (updateJob.truster == null) : updateJob.truster.equals(truster)) && ((trustee == null) ? (updateJob.trustee == null) : updateJob.trustee.equals(trustee)); } - /** {@inheritDoc} */ @Override public int hashCode() { return getClass().hashCode() ^ ((truster == null) ? 0 : truster.hashCode()) ^ ((trustee == null) ? 0 : trustee.hashCode()); } - /** {@inheritDoc} */ @Override public String toString() { return String.format("%s[truster=%s,trustee=%s]", getClass().getSimpleName(), (truster == null) ? null : truster.getId(), (trustee == null) ? null : trustee.getId()); @@ -445,7 +439,6 @@ public class WebOfTrustUpdater extends AbstractService { // OBJECT METHODS // - /** {@inheritDoc} */ @Override public boolean equals(Object object) { if ((object == null) || !object.getClass().equals(getClass())) { @@ -455,13 +448,11 @@ public class WebOfTrustUpdater extends AbstractService { return updateJob.ownIdentity.equals(ownIdentity) && updateJob.context.equals(context); } - /** {@inheritDoc} */ @Override public int hashCode() { return getClass().hashCode() ^ ownIdentity.hashCode() ^ context.hashCode(); } - /** {@inheritDoc} */ @Override public String toString() { return String.format("%s[ownIdentity=%s,context=%s]", getClass().getSimpleName(), ownIdentity, context); @@ -488,7 +479,6 @@ public class WebOfTrustUpdater extends AbstractService { super(ownIdentity, context); } - /** {@inheritDoc} */ @Override @SuppressWarnings("synthetic-access") public void run() { @@ -523,7 +513,6 @@ public class WebOfTrustUpdater extends AbstractService { super(ownIdentity, context); } - /** {@inheritDoc} */ @Override @SuppressWarnings("synthetic-access") public void run() { @@ -571,7 +560,6 @@ public class WebOfTrustUpdater extends AbstractService { this.propertyValue = propertyValue; } - /** {@inheritDoc} */ @Override @SuppressWarnings("synthetic-access") public void run() { @@ -594,7 +582,6 @@ public class WebOfTrustUpdater extends AbstractService { // OBJECT METHODS // - /** {@inheritDoc} */ @Override public boolean equals(Object object) { if ((object == null) || !object.getClass().equals(getClass())) { @@ -604,13 +591,11 @@ public class WebOfTrustUpdater extends AbstractService { return updateJob.ownIdentity.equals(ownIdentity) && updateJob.propertyName.equals(propertyName); } - /** {@inheritDoc} */ @Override public int hashCode() { return getClass().hashCode() ^ ownIdentity.hashCode() ^ propertyName.hashCode(); } - /** {@inheritDoc} */ @Override public String toString() { return String.format("%s[ownIdentity=%s,propertyName=%s]", getClass().getSimpleName(), ownIdentity, propertyName); diff --git a/src/main/java/net/pterodactylus/sone/data/impl/AbstractPostBuilder.java b/src/main/java/net/pterodactylus/sone/data/impl/AbstractPostBuilder.java index 1e45609..6504558 100644 --- a/src/main/java/net/pterodactylus/sone/data/impl/AbstractPostBuilder.java +++ b/src/main/java/net/pterodactylus/sone/data/impl/AbstractPostBuilder.java @@ -63,36 +63,24 @@ public abstract class AbstractPostBuilder implements PostBuilder { // POSTBUILDER METHODS // - /** - * {@inheritDoc} - */ @Override public PostBuilder withId(String id) { this.id = fromNullable(id); return this; } - /** - * {@inheritDoc} - */ @Override public PostBuilder withTime(long time) { this.time = of(time); return this; } - /** - * {@inheritDoc} - */ @Override public PostBuilder withText(String text) { this.text = text; return this; } - /** - * {@inheritDoc} - */ @Override public PostBuilder to(Optional recipientId) { this.recipientId = recipientId; diff --git a/src/main/java/net/pterodactylus/sone/data/impl/AbstractReplyBuilder.java b/src/main/java/net/pterodactylus/sone/data/impl/AbstractReplyBuilder.java index 389eb85..f42d6dd 100644 --- a/src/main/java/net/pterodactylus/sone/data/impl/AbstractReplyBuilder.java +++ b/src/main/java/net/pterodactylus/sone/data/impl/AbstractReplyBuilder.java @@ -47,9 +47,6 @@ public class AbstractReplyBuilder> implements ReplyBui this.senderId = senderId; } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public B withId(String id) { @@ -57,9 +54,6 @@ public class AbstractReplyBuilder> implements ReplyBui return (B) this; } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public B withTime(long time) { @@ -67,9 +61,6 @@ public class AbstractReplyBuilder> implements ReplyBui return (B) this; } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public B withText(String text) { diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultPost.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultPost.java index c4dcb62..cb8fa2f 100644 --- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultPost.java +++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultPost.java @@ -82,65 +82,41 @@ public class DefaultPost implements Post { // ACCESSORS // - /** - * {@inheritDoc} - */ @Override public String getId() { return id.toString(); } - /** - * {@inheritDoc} - */ @Override public Sone getSone() { return database.getSone(soneId).get(); } - /** - * {@inheritDocs} - */ @Override public Optional getRecipientId() { return Optional.fromNullable(recipientId); } - /** - * {@inheritDoc} - */ @Override public Optional getRecipient() { return database.getSone(recipientId); } - /** - * {@inheritDoc} - */ @Override public long getTime() { return time; } - /** - * {@inheritDoc} - */ @Override public String getText() { return text; } - /** - * {@inheritDoc} - */ @Override public boolean isKnown() { return known; } - /** - * {@inheritDoc} - */ @Override public DefaultPost setKnown(boolean known) { this.known = known; @@ -151,17 +127,11 @@ public class DefaultPost implements Post { // OBJECT METHODS // - /** - * {@inheritDoc} - */ @Override public int hashCode() { return id.hashCode(); } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object object) { if (!(object instanceof DefaultPost)) { @@ -171,9 +141,6 @@ public class DefaultPost implements Post { return post.id.equals(id); } - /** - * {@inheritDoc} - */ @Override public String toString() { return String.format("%s[id=%s,sone=%s,recipient=%s,time=%d,text=%s]", getClass().getName(), id, soneId, recipientId, time, text); diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostBuilder.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostBuilder.java index 0d4c71c..f73245d 100644 --- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostBuilder.java +++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostBuilder.java @@ -39,7 +39,6 @@ public class DefaultPostBuilder extends AbstractPostBuilder { super(database, soneId); } - /** {@inheritDoc} */ @Override public Post build(Optional postCreated) { validate(); diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostReply.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostReply.java index 6c08106..ef275ff 100644 --- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostReply.java +++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostReply.java @@ -57,13 +57,11 @@ public class DefaultPostReply extends DefaultReply implements PostRep // ACCESSORS // - /** {@inheritDocs} */ @Override public String getPostId() { return postId; } - /** {@inheritDoc} */ @Override public Optional getPost() { return database.getPost(postId); diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostReplyBuilder.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostReplyBuilder.java index 8213faa..1e84f10 100644 --- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostReplyBuilder.java +++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultPostReplyBuilder.java @@ -38,9 +38,6 @@ public class DefaultPostReplyBuilder extends AbstractPostReplyBuilder { this.database = database; } - /** - * {@inheritDoc} - */ @Override public PostReply build(Optional postReplyCreated) { validate(); diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultReply.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultReply.java index 13bd5bc..655d114 100644 --- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultReply.java +++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultReply.java @@ -68,37 +68,31 @@ public abstract class DefaultReply> implements Reply { this.text = text; } - /** {@inheritDoc} */ @Override public String getId() { return id; } - /** {@inheritDoc} */ @Override public Sone getSone() { return database.getSone(soneId).get(); } - /** {@inheritDoc} */ @Override public long getTime() { return time; } - /** {@inheritDoc} */ @Override public String getText() { return text; } - /** {@inheritDoc} */ @Override public boolean isKnown() { return known; } - /** {@inheritDoc} */ @Override @SuppressWarnings("unchecked") public T setKnown(boolean known) { @@ -110,13 +104,11 @@ public abstract class DefaultReply> implements Reply { // OBJECT METHODS // - /** {@inheritDoc} */ @Override public int hashCode() { return id.hashCode(); } - /** {@inheritDoc} */ @Override public boolean equals(Object object) { if (!(object instanceof Reply)) { @@ -126,7 +118,6 @@ public abstract class DefaultReply> implements Reply { return reply.getId().equals(id); } - /** {@inheritDoc} */ @Override public String toString() { return String.format("%s[id=%s,sone=%s,time=%d,text=%s]", getClass().getName(), id, soneId, time, text); diff --git a/src/main/java/net/pterodactylus/sone/data/impl/DefaultSone.java b/src/main/java/net/pterodactylus/sone/data/impl/DefaultSone.java index cc03d7a..59964f9 100644 --- a/src/main/java/net/pterodactylus/sone/data/impl/DefaultSone.java +++ b/src/main/java/net/pterodactylus/sone/data/impl/DefaultSone.java @@ -136,34 +136,14 @@ public class DefaultSone implements Sone { // ACCESSORS // - /** - * Returns the identity of this Sone. - * - * @return The identity of this Sone - */ public String getId() { return id; } - /** - * Returns the identity of this Sone. - * - * @return The identity of this Sone - */ public Identity getIdentity() { return identity; } - /** - * Sets the identity of this Sone. The {@link Identity#getId() ID} of the - * identity has to match this Sone’s {@link #getId()}. - * - * @param identity - * The identity of this Sone - * @return This Sone (for method chaining) - * @throws IllegalArgumentException - * if the ID of the identity does not match this Sone’s ID - */ public DefaultSone setIdentity(Identity identity) throws IllegalArgumentException { if (!identity.getId().equals(id)) { throw new IllegalArgumentException("Identity’s ID does not match Sone’s ID!"); @@ -172,40 +152,18 @@ public class DefaultSone implements Sone { return this; } - /** - * Returns the name of this Sone. - * - * @return The name of this Sone - */ public String getName() { return (identity != null) ? identity.getNickname() : null; } - /** - * Returns whether this Sone is a local Sone. - * - * @return {@code true} if this Sone is a local Sone, {@code false} otherwise - */ public boolean isLocal() { return local; } - /** - * Returns the request URI of this Sone. - * - * @return The request URI of this Sone - */ public FreenetURI getRequestUri() { return (requestUri != null) ? requestUri.setSuggestedEdition(latestEdition) : null; } - /** - * Sets the request URI of this Sone. - * - * @param requestUri - * The request URI of this Sone - * @return This Sone (for method chaining) - */ public Sone setRequestUri(FreenetURI requestUri) { if (this.requestUri == null) { this.requestUri = requestUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]); @@ -218,22 +176,10 @@ public class DefaultSone implements Sone { return this; } - /** - * Returns the insert URI of this Sone. - * - * @return The insert URI of this Sone - */ public FreenetURI getInsertUri() { return (insertUri != null) ? insertUri.setSuggestedEdition(latestEdition) : null; } - /** - * Sets the insert URI of this Sone. - * - * @param insertUri - * The insert URI of this Sone - * @return This Sone (for method chaining) - */ public Sone setInsertUri(FreenetURI insertUri) { if (this.insertUri == null) { this.insertUri = insertUri.setKeyType("USK").setDocName("Sone").setMetaString(new String[0]); @@ -246,23 +192,10 @@ public class DefaultSone implements Sone { return this; } - /** - * Returns the latest edition of this Sone. - * - * @return The latest edition of this Sone - */ public long getLatestEdition() { return latestEdition; } - /** - * Sets the latest edition of this Sone. If the given latest edition is not - * greater than the current latest edition, the latest edition of this Sone is - * not changed. - * - * @param latestEdition - * The latest edition of this Sone - */ public void setLatestEdition(long latestEdition) { if (!(latestEdition > this.latestEdition)) { logger.log(Level.FINE, String.format("New latest edition %d is not greater than current latest edition %d!", latestEdition, this.latestEdition)); @@ -271,144 +204,59 @@ public class DefaultSone implements Sone { this.latestEdition = latestEdition; } - /** - * Return the time of the last inserted update of this Sone. - * - * @return The time of the update (in milliseconds since Jan 1, 1970 UTC) - */ public long getTime() { return time; } - /** - * Sets the time of the last inserted update of this Sone. - * - * @param time - * The time of the update (in milliseconds since Jan 1, 1970 UTC) - * @return This Sone (for method chaining) - */ public Sone setTime(long time) { this.time = time; return this; } - /** - * Returns the status of this Sone. - * - * @return The status of this Sone - */ public SoneStatus getStatus() { return status; } - /** - * Sets the new status of this Sone. - * - * @param status - * The new status of this Sone - * @return This Sone - * @throws IllegalArgumentException - * if {@code status} is {@code null} - */ public Sone setStatus(SoneStatus status) { this.status = checkNotNull(status, "status must not be null"); return this; } - /** - * Returns a copy of the profile. If you want to update values in the profile - * of this Sone, update the values in the returned {@link Profile} and use - * {@link #setProfile(Profile)} to change the profile in this Sone. - * - * @return A copy of the profile - */ public Profile getProfile() { return new Profile(profile); } - /** - * Sets the profile of this Sone. A copy of the given profile is stored so that - * subsequent modifications of the given profile are not reflected in this - * Sone! - * - * @param profile - * The profile to set - */ public void setProfile(Profile profile) { this.profile = new Profile(profile); } - /** - * Returns the client used by this Sone. - * - * @return The client used by this Sone, or {@code null} - */ public Client getClient() { return client; } - /** - * Sets the client used by this Sone. - * - * @param client - * The client used by this Sone, or {@code null} - * @return This Sone (for method chaining) - */ public Sone setClient(Client client) { this.client = client; return this; } - /** - * Returns whether this Sone is known. - * - * @return {@code true} if this Sone is known, {@code false} otherwise - */ public boolean isKnown() { return known; } - /** - * Sets whether this Sone is known. - * - * @param known - * {@code true} if this Sone is known, {@code false} otherwise - * @return This Sone - */ public Sone setKnown(boolean known) { this.known = known; return this; } - /** - * Returns all friend Sones of this Sone. - * - * @return The friend Sones of this Sone - */ public List getFriends() { List friends = new ArrayList(friendSones); return friends; } - /** - * Returns whether this Sone has the given Sone as a friend Sone. - * - * @param friendSoneId - * The ID of the Sone to check for - * @return {@code true} if this Sone has the given Sone as a friend, {@code - * false} otherwise - */ public boolean hasFriend(String friendSoneId) { return friendSones.contains(friendSoneId); } - /** - * Adds the given Sone as a friend Sone. - * - * @param friendSone - * The friend Sone to add - * @return This Sone (for method chaining) - */ public Sone addFriend(String friendSone) { if (!friendSone.equals(id)) { friendSones.add(friendSone); @@ -416,23 +264,11 @@ public class DefaultSone implements Sone { return this; } - /** - * Removes the given Sone as a friend Sone. - * - * @param friendSoneId - * The ID of the friend Sone to remove - * @return This Sone (for method chaining) - */ public Sone removeFriend(String friendSoneId) { friendSones.remove(friendSoneId); return this; } - /** - * Returns the list of posts of this Sone, sorted by time, newest first. - * - * @return All posts of this Sone - */ public List getPosts() { List sortedPosts; synchronized (this) { @@ -442,13 +278,6 @@ public class DefaultSone implements Sone { return sortedPosts; } - /** - * Sets all posts of this Sone at once. - * - * @param posts - * The new (and only) posts of this Sone - * @return This Sone (for method chaining) - */ public Sone setPosts(Collection posts) { synchronized (this) { this.posts.clear(); @@ -457,218 +286,96 @@ public class DefaultSone implements Sone { return this; } - /** - * Adds the given post to this Sone. The post will not be added if its {@link - * Post#getSone() Sone} is not this Sone. - * - * @param post - * The post to add - */ public void addPost(Post post) { if (post.getSone().equals(this) && posts.add(post)) { logger.log(Level.FINEST, String.format("Adding %s to “%s”.", post, getName())); } } - /** - * Removes the given post from this Sone. - * - * @param post - * The post to remove - */ public void removePost(Post post) { if (post.getSone().equals(this)) { posts.remove(post); } } - /** - * Returns all replies this Sone made. - * - * @return All replies this Sone made - */ public Set getReplies() { return Collections.unmodifiableSet(replies); } - /** - * Sets all replies of this Sone at once. - * - * @param replies - * The new (and only) replies of this Sone - * @return This Sone (for method chaining) - */ public Sone setReplies(Collection replies) { this.replies.clear(); this.replies.addAll(replies); return this; } - /** - * Adds a reply to this Sone. If the given reply was not made by this Sone, - * nothing is added to this Sone. - * - * @param reply - * The reply to add - */ public void addReply(PostReply reply) { if (reply.getSone().equals(this)) { replies.add(reply); } } - /** - * Removes a reply from this Sone. - * - * @param reply - * The reply to remove - */ public void removeReply(PostReply reply) { if (reply.getSone().equals(this)) { replies.remove(reply); } } - /** - * Returns the IDs of all liked posts. - * - * @return All liked posts’ IDs - */ public Set getLikedPostIds() { return Collections.unmodifiableSet(likedPostIds); } - /** - * Sets the IDs of all liked posts. - * - * @param likedPostIds - * All liked posts’ IDs - * @return This Sone (for method chaining) - */ public Sone setLikePostIds(Set likedPostIds) { this.likedPostIds.clear(); this.likedPostIds.addAll(likedPostIds); return this; } - /** - * Checks whether the given post ID is liked by this Sone. - * - * @param postId - * The ID of the post - * @return {@code true} if this Sone likes the given post, {@code false} - * otherwise - */ public boolean isLikedPostId(String postId) { return likedPostIds.contains(postId); } - /** - * Adds the given post ID to the list of posts this Sone likes. - * - * @param postId - * The ID of the post - * @return This Sone (for method chaining) - */ public Sone addLikedPostId(String postId) { likedPostIds.add(postId); return this; } - /** - * Removes the given post ID from the list of posts this Sone likes. - * - * @param postId - * The ID of the post - * @return This Sone (for method chaining) - */ public Sone removeLikedPostId(String postId) { likedPostIds.remove(postId); return this; } - /** - * Returns the IDs of all liked replies. - * - * @return All liked replies’ IDs - */ public Set getLikedReplyIds() { return Collections.unmodifiableSet(likedReplyIds); } - /** - * Sets the IDs of all liked replies. - * - * @param likedReplyIds - * All liked replies’ IDs - * @return This Sone (for method chaining) - */ public Sone setLikeReplyIds(Set likedReplyIds) { this.likedReplyIds.clear(); this.likedReplyIds.addAll(likedReplyIds); return this; } - /** - * Checks whether the given reply ID is liked by this Sone. - * - * @param replyId - * The ID of the reply - * @return {@code true} if this Sone likes the given reply, {@code false} - * otherwise - */ public boolean isLikedReplyId(String replyId) { return likedReplyIds.contains(replyId); } - /** - * Adds the given reply ID to the list of replies this Sone likes. - * - * @param replyId - * The ID of the reply - * @return This Sone (for method chaining) - */ public Sone addLikedReplyId(String replyId) { likedReplyIds.add(replyId); return this; } - /** - * Removes the given post ID from the list of replies this Sone likes. - * - * @param replyId - * The ID of the reply - * @return This Sone (for method chaining) - */ public Sone removeLikedReplyId(String replyId) { likedReplyIds.remove(replyId); return this; } - /** - * Returns the root album that contains all visible albums of this Sone. - * - * @return The root album of this Sone - */ public Album getRootAlbum() { return rootAlbum; } - /** - * Returns Sone-specific options. - * - * @return The options of this Sone - */ public Options getOptions() { return options; } - /** - * Sets the options of this Sone. - * - * @param options - * The options of this Sone - */ /* TODO - remove this method again, maybe add an option provider */ public void setOptions(Options options) { this.options = options; @@ -706,7 +413,6 @@ public class DefaultSone implements Sone { // FINGERPRINTABLE METHODS // - /** {@inheritDoc} */ @Override public synchronized String getFingerprint() { Hasher hash = Hashing.sha256().newHasher(); @@ -758,7 +464,6 @@ public class DefaultSone implements Sone { // INTERFACE Comparable // - /** {@inheritDoc} */ @Override public int compareTo(Sone sone) { return NICE_NAME_COMPARATOR.compare(this, sone); @@ -768,13 +473,11 @@ public class DefaultSone implements Sone { // OBJECT METHODS // - /** {@inheritDoc} */ @Override public int hashCode() { return id.hashCode(); } - /** {@inheritDoc} */ @Override public boolean equals(Object object) { if (!(object instanceof Sone)) { @@ -783,7 +486,6 @@ public class DefaultSone implements Sone { return ((Sone) object).getId().equals(id); } - /** {@inheritDoc} */ @Override public String toString() { return getClass().getName() + "[identity=" + identity + ",requestUri=" + requestUri + ",insertUri(" + String.valueOf(insertUri).length() + "),friends(" + friendSones.size() + "),posts(" + posts.size() + "),replies(" + replies.size() + "),albums(" + getRootAlbum().getAlbums().size() + ")]"; diff --git a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java index 00443e4..704509f 100644 --- a/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java +++ b/src/main/java/net/pterodactylus/sone/database/memory/MemoryDatabase.java @@ -46,9 +46,7 @@ import net.pterodactylus.sone.data.Reply; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.database.Database; import net.pterodactylus.sone.database.DatabaseException; -import net.pterodactylus.sone.database.PostBuilder; import net.pterodactylus.sone.database.PostDatabase; -import net.pterodactylus.sone.database.PostReplyBuilder; import net.pterodactylus.sone.database.SoneBuilder; import net.pterodactylus.util.config.Configuration; import net.pterodactylus.util.config.ConfigurationException; @@ -128,12 +126,6 @@ public class MemoryDatabase extends AbstractService implements Database { // DATABASE METHODS // - /** - * Saves the database. - * - * @throws DatabaseException - * if an error occurs while saving - */ @Override public void save() throws DatabaseException { saveKnownPosts(); @@ -144,7 +136,6 @@ public class MemoryDatabase extends AbstractService implements Database { // SERVICE METHODS // - /** {@inheritDocs} */ @Override protected void doStart() { loadKnownPosts(); @@ -152,7 +143,6 @@ public class MemoryDatabase extends AbstractService implements Database { notifyStarted(); } - /** {@inheritDocs} */ @Override protected void doStop() { try { @@ -212,7 +202,6 @@ public class MemoryDatabase extends AbstractService implements Database { // POSTPROVIDER METHODS // - /** {@inheritDocs} */ @Override public Optional getPost(String postId) { lock.readLock().lock(); @@ -223,13 +212,11 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** {@inheritDocs} */ @Override public Collection getPosts(String soneId) { return new HashSet(getPostsFrom(soneId)); } - /** {@inheritDocs} */ @Override public Collection getDirectedPosts(String recipientId) { lock.readLock().lock(); @@ -245,7 +232,6 @@ public class MemoryDatabase extends AbstractService implements Database { // POSTSTORE METHODS // - /** {@inheritDocs} */ @Override public void storePost(Post post) { checkNotNull(post, "post must not be null"); @@ -261,7 +247,6 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** {@inheritDocs} */ @Override public void removePost(Post post) { checkNotNull(post, "post must not be null"); @@ -278,7 +263,6 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** {@inheritDocs} */ @Override public void storePosts(Sone sone, Collection posts) throws IllegalArgumentException { checkNotNull(sone, "sone must not be null"); @@ -313,7 +297,6 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** {@inheritDocs} */ @Override public void removePosts(Sone sone) { checkNotNull(sone, "sone must not be null"); @@ -336,7 +319,6 @@ public class MemoryDatabase extends AbstractService implements Database { // POSTREPLYPROVIDER METHODS // - /** {@inheritDocs} */ @Override public Optional getPostReply(String id) { lock.readLock().lock(); @@ -347,7 +329,6 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** {@inheritDocs} */ @Override public List getReplies(String postId) { lock.readLock().lock(); @@ -365,7 +346,6 @@ public class MemoryDatabase extends AbstractService implements Database { // POSTREPLYSTORE METHODS // - /** {@inheritDocs} */ @Override public void storePostReply(PostReply postReply) { lock.writeLock().lock(); @@ -383,7 +363,6 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** {@inheritDocs} */ @Override public void storePostReplies(Sone sone, Collection postReplies) { checkNotNull(sone, "sone must not be null"); @@ -416,7 +395,6 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** {@inheritDocs} */ @Override public void removePostReply(PostReply postReply) { lock.writeLock().lock(); @@ -433,7 +411,6 @@ public class MemoryDatabase extends AbstractService implements Database { } } - /** {@inheritDocs} */ @Override public void removePostReplies(Sone sone) { checkNotNull(sone, "sone must not be null"); diff --git a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java index d71ffc4..9be30fc 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/AbstractSoneCommand.java @@ -33,12 +33,12 @@ import net.pterodactylus.sone.freenet.fcp.Command; import net.pterodactylus.sone.freenet.fcp.FcpException; import net.pterodactylus.sone.template.SoneAccessor; -import com.google.common.base.Optional; -import com.google.common.collect.Collections2; - import freenet.node.FSParseException; import freenet.support.SimpleFieldSet; +import com.google.common.base.Optional; +import com.google.common.collect.Collections2; + /** * Abstract base implementation of a {@link Command} with Sone-related helper * methods. @@ -399,9 +399,6 @@ public abstract class AbstractSoneCommand extends AbstractCommand { // OBJECT METHODS // - /** - * {@inheritDoc} - */ @Override public String toString() { return getClass().getName() + "[writeAccess=" + writeAccess + "]"; diff --git a/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java b/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java index fcad23c..31308be 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/CreatePostCommand.java @@ -46,9 +46,6 @@ public class CreatePostCommand extends AbstractSoneCommand { super(core, true); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { Sone sone = getSone(parameters, "Sone", true); diff --git a/src/main/java/net/pterodactylus/sone/fcp/CreateReplyCommand.java b/src/main/java/net/pterodactylus/sone/fcp/CreateReplyCommand.java index 2de9bef..3d371e9 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/CreateReplyCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/CreateReplyCommand.java @@ -45,9 +45,6 @@ public class CreateReplyCommand extends AbstractSoneCommand { super(core, true); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { Sone sone = getSone(parameters, "Sone", true); diff --git a/src/main/java/net/pterodactylus/sone/fcp/DeletePostCommand.java b/src/main/java/net/pterodactylus/sone/fcp/DeletePostCommand.java index 00d5018..b9a0faa 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/DeletePostCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/DeletePostCommand.java @@ -42,9 +42,6 @@ public class DeletePostCommand extends AbstractSoneCommand { super(core, true); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { Post post = getPost(parameters, "Post"); diff --git a/src/main/java/net/pterodactylus/sone/fcp/DeleteReplyCommand.java b/src/main/java/net/pterodactylus/sone/fcp/DeleteReplyCommand.java index e9c0926..ef26411 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/DeleteReplyCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/DeleteReplyCommand.java @@ -42,9 +42,6 @@ public class DeleteReplyCommand extends AbstractSoneCommand { super(core, true); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { PostReply reply = getReply(parameters, "Reply"); diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetLocalSonesCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetLocalSonesCommand.java index b8684b0..82813a1 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/GetLocalSonesCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/GetLocalSonesCommand.java @@ -39,9 +39,6 @@ public class GetLocalSonesCommand extends AbstractSoneCommand { super(core); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) { return new Response("ListLocalSones", encodeSones(getCore().getLocalSones(), "LocalSones.")); diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetPostCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetPostCommand.java index c503f5b..e220429 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/GetPostCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/GetPostCommand.java @@ -40,9 +40,6 @@ public class GetPostCommand extends AbstractSoneCommand { super(core); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { Post post = getPost(parameters, "Post"); diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java index b22d356..a99c031 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/GetPostFeedCommand.java @@ -28,12 +28,12 @@ import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.freenet.fcp.FcpException; -import com.google.common.base.Optional; -import com.google.common.collect.Collections2; - import freenet.support.SimpleFieldSet; import freenet.support.api.Bucket; +import com.google.common.base.Optional; +import com.google.common.collect.Collections2; + /** * Implementation of an FCP interface for other clients or plugins to * communicate with Sone. @@ -52,9 +52,6 @@ public class GetPostFeedCommand extends AbstractSoneCommand { super(core); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { Sone sone = getSone(parameters, "Sone", true); diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetPostsCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetPostsCommand.java index 1947718..de8b692 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/GetPostsCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/GetPostsCommand.java @@ -45,9 +45,6 @@ public class GetPostsCommand extends AbstractSoneCommand { super(core); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { Sone sone = getSone(parameters, "Sone", false); diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetSoneCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetSoneCommand.java index e3ec1b1..711398c 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/GetSoneCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/GetSoneCommand.java @@ -22,11 +22,11 @@ import net.pterodactylus.sone.data.Profile; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.freenet.fcp.FcpException; -import com.google.common.base.Optional; - import freenet.support.SimpleFieldSet; import freenet.support.api.Bucket; +import com.google.common.base.Optional; + /** * Implements the “GetSone“ FCP command which returns {@link Profile} * information about a {@link Sone}. @@ -45,9 +45,6 @@ public class GetSoneCommand extends AbstractSoneCommand { super(core); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { Sone sone = getSone(parameters, "Sone", false); diff --git a/src/main/java/net/pterodactylus/sone/fcp/GetSonesCommand.java b/src/main/java/net/pterodactylus/sone/fcp/GetSonesCommand.java index 9ff8587..b0598fb 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/GetSonesCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/GetSonesCommand.java @@ -43,9 +43,6 @@ public class GetSonesCommand extends AbstractSoneCommand { super(core); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) { int startSone = getInt(parameters, "StartSone", 0); diff --git a/src/main/java/net/pterodactylus/sone/fcp/LikePostCommand.java b/src/main/java/net/pterodactylus/sone/fcp/LikePostCommand.java index 20d251c..44241cd 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/LikePostCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/LikePostCommand.java @@ -42,9 +42,6 @@ public class LikePostCommand extends AbstractSoneCommand { super(core, true); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { Post post = getPost(parameters, "Post"); diff --git a/src/main/java/net/pterodactylus/sone/fcp/LikeReplyCommand.java b/src/main/java/net/pterodactylus/sone/fcp/LikeReplyCommand.java index a462f08..aed7ce3 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/LikeReplyCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/LikeReplyCommand.java @@ -42,9 +42,6 @@ public class LikeReplyCommand extends AbstractSoneCommand { super(core, true); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) throws FcpException { PostReply reply = getReply(parameters, "Reply"); diff --git a/src/main/java/net/pterodactylus/sone/fcp/VersionCommand.java b/src/main/java/net/pterodactylus/sone/fcp/VersionCommand.java index c482f24..7220fc8 100644 --- a/src/main/java/net/pterodactylus/sone/fcp/VersionCommand.java +++ b/src/main/java/net/pterodactylus/sone/fcp/VersionCommand.java @@ -40,9 +40,6 @@ public class VersionCommand extends AbstractSoneCommand { super(core); } - /** - * {@inheritDoc} - */ @Override public Response execute(SimpleFieldSet parameters, Bucket data, AccessType accessType) { return new Response("Version", new SimpleFieldSetBuilder().put("Version", SonePlugin.VERSION.toString()).put("ProtocolVersion", 1).get()); diff --git a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java index c8075c5..08fe280 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java +++ b/src/main/java/net/pterodactylus/sone/freenet/L10nFilter.java @@ -48,9 +48,6 @@ public class L10nFilter implements Filter { this.webInterface = webInterface; } - /** - * {@inheritDoc} - */ @Override public String format(TemplateContext templateContext, Object data, Map parameters) { if (parameters.isEmpty()) { diff --git a/src/main/java/net/pterodactylus/sone/freenet/PluginStoreConfigurationBackend.java b/src/main/java/net/pterodactylus/sone/freenet/PluginStoreConfigurationBackend.java index 1e95389..a0690a4 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/PluginStoreConfigurationBackend.java +++ b/src/main/java/net/pterodactylus/sone/freenet/PluginStoreConfigurationBackend.java @@ -61,9 +61,6 @@ public class PluginStoreConfigurationBackend implements ExtendedConfigurationBac } } - /** - * {@inheritDoc} - */ @Override public String getValue(String attribute) throws ConfigurationException { if (!pluginStore.strings.containsKey(attribute)) { @@ -72,18 +69,12 @@ public class PluginStoreConfigurationBackend implements ExtendedConfigurationBac return pluginStore.strings.get(attribute); } - /** - * {@inheritDoc} - */ @Override public void putValue(String attribute, String value) throws ConfigurationException { pluginStore.strings.put(attribute, value); save(); } - /** - * {@inheritDoc} - */ @Override public Boolean getBooleanValue(String attribute) throws ConfigurationException { if (!pluginStore.booleans.containsKey(attribute)) { @@ -92,18 +83,12 @@ public class PluginStoreConfigurationBackend implements ExtendedConfigurationBac return pluginStore.booleans.get(attribute); } - /** - * {@inheritDoc} - */ @Override public void setBooleanValue(String attribute, Boolean value) throws ConfigurationException { pluginStore.booleans.put(attribute, value); save(); } - /** - * {@inheritDoc} - */ @Override public Double getDoubleValue(String attribute) throws ConfigurationException { if (!pluginStore.strings.containsKey(attribute)) { @@ -120,18 +105,12 @@ public class PluginStoreConfigurationBackend implements ExtendedConfigurationBac } } - /** - * {@inheritDoc} - */ @Override public void setDoubleValue(String attribute, Double value) throws ConfigurationException { pluginStore.strings.put(attribute, String.valueOf(value)); save(); } - /** - * {@inheritDoc} - */ @Override public Integer getIntegerValue(String attribute) throws ConfigurationException { if (!pluginStore.integers.containsKey(attribute)) { @@ -140,18 +119,12 @@ public class PluginStoreConfigurationBackend implements ExtendedConfigurationBac return pluginStore.integers.get(attribute); } - /** - * {@inheritDoc} - */ @Override public void setIntegerValue(String attribute, Integer value) throws ConfigurationException { pluginStore.integers.put(attribute, value); save(); } - /** - * {@inheritDoc} - */ @Override public Long getLongValue(String attribute) throws ConfigurationException { if (!pluginStore.longs.containsKey(attribute)) { @@ -160,18 +133,12 @@ public class PluginStoreConfigurationBackend implements ExtendedConfigurationBac return pluginStore.longs.get(attribute); } - /** - * {@inheritDoc} - */ @Override public void setLongValue(String attribute, Long value) throws ConfigurationException { pluginStore.longs.put(attribute, value); save(); } - /** - * {@inheritDoc} - */ @Override public void save() throws ConfigurationException { try { diff --git a/src/main/java/net/pterodactylus/sone/freenet/StringBucket.java b/src/main/java/net/pterodactylus/sone/freenet/StringBucket.java index c96a3cd..26c6115 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/StringBucket.java +++ b/src/main/java/net/pterodactylus/sone/freenet/StringBucket.java @@ -22,9 +22,8 @@ import java.io.InputStream; import java.io.OutputStream; import java.nio.charset.Charset; -import com.db4o.ObjectContainer; - import freenet.support.api.Bucket; +import com.db4o.ObjectContainer; /** * {@link Bucket} implementation wrapped around a {@link String}. @@ -63,81 +62,51 @@ public class StringBucket implements Bucket { this.encoding = encoding; } - /** - * {@inheritDoc} - */ @Override public Bucket createShadow() { return new StringBucket(string); } - /** - * {@inheritDoc} - */ @Override public void free() { /* ignore. */ } - /** - * {@inheritDoc} - */ @Override public InputStream getInputStream() { return new ByteArrayInputStream(string.getBytes(encoding)); } - /** - * {@inheritDoc} - */ @Override public String getName() { return getClass().getName() + "@" + hashCode(); } - /** - * {@inheritDoc} - */ @Override public OutputStream getOutputStream() { return null; } - /** - * {@inheritDoc} - */ @Override public boolean isReadOnly() { return true; } - /** - * {@inheritDoc} - */ @Override public void removeFrom(ObjectContainer objectContainer) { /* ignore. */ } - /** - * {@inheritDoc} - */ @Override public void setReadOnly() { /* ignore, it is already read-only. */ } - /** - * {@inheritDoc} - */ @Override public long size() { return string.getBytes(encoding).length; } - /** - * {@inheritDoc} - */ @Override public void storeTo(ObjectContainer objectContainer) { /* ignore. */ diff --git a/src/main/java/net/pterodactylus/sone/freenet/plugin/PluginConnector.java b/src/main/java/net/pterodactylus/sone/freenet/plugin/PluginConnector.java index 47330e8..32399c6 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/plugin/PluginConnector.java +++ b/src/main/java/net/pterodactylus/sone/freenet/plugin/PluginConnector.java @@ -19,9 +19,6 @@ package net.pterodactylus.sone.freenet.plugin; import net.pterodactylus.sone.freenet.plugin.event.ReceivedReplyEvent; -import com.google.common.eventbus.EventBus; -import com.google.inject.Inject; - import freenet.pluginmanager.FredPluginTalker; import freenet.pluginmanager.PluginNotFoundException; import freenet.pluginmanager.PluginRespirator; @@ -29,6 +26,9 @@ import freenet.pluginmanager.PluginTalker; import freenet.support.SimpleFieldSet; import freenet.support.api.Bucket; +import com.google.common.eventbus.EventBus; +import com.google.inject.Inject; + /** * Interface for talking to other plugins. Other plugins are identified by their * name and a unique connection identifier. @@ -122,9 +122,6 @@ public class PluginConnector implements FredPluginTalker { // INTERFACE FredPluginTalker // - /** - * {@inheritDoc} - */ @Override public void onReply(String pluginName, String identifier, SimpleFieldSet params, Bucket data) { eventBus.post(new ReceivedReplyEvent(this, pluginName, identifier, params, data)); diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java index 0cfb055..3e03f79 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java @@ -69,131 +69,83 @@ public class DefaultIdentity implements Identity { // ACCESSORS // - /** - * {@inheritDoc} - */ @Override public String getId() { return id; } - /** - * {@inheritDoc} - */ @Override public String getNickname() { return nickname; } - /** - * {@inheritDoc} - */ @Override public String getRequestUri() { return requestUri; } - /** - * {@inheritDoc} - */ @Override public Set getContexts() { return Collections.unmodifiableSet(contexts); } - /** - * {@inheritDoc} - */ @Override public boolean hasContext(String context) { return contexts.contains(context); } - /** - * {@inheritDoc} - */ @Override public void setContexts(Collection contexts) { this.contexts.clear(); this.contexts.addAll(contexts); } - /** - * {@inheritDoc} - */ @Override public void addContext(String context) { contexts.add(context); } - /** - * {@inheritDoc} - */ @Override public void removeContext(String context) { contexts.remove(context); } - /** - * {@inheritDoc} - */ @Override public Map getProperties() { return Collections.unmodifiableMap(properties); } - /** - * {@inheritDoc} - */ @Override public void setProperties(Map properties) { this.properties.clear(); this.properties.putAll(properties); } - /** - * {@inheritDoc} - */ @Override public String getProperty(String name) { return properties.get(name); } - /** - * {@inheritDoc} - */ @Override public void setProperty(String name, String value) { properties.put(name, value); } - /** - * {@inheritDoc} - */ @Override public void removeProperty(String name) { properties.remove(name); } - /** - * {@inheritDoc} - */ @Override public Trust getTrust(OwnIdentity ownIdentity) { return trustCache.get(ownIdentity); } - /** - * {@inheritDoc} - */ @Override public void setTrust(OwnIdentity ownIdentity, Trust trust) { trustCache.put(ownIdentity, trust); } - /** - * {@inheritDoc} - */ @Override public void removeTrust(OwnIdentity ownIdentity) { trustCache.remove(ownIdentity); @@ -203,17 +155,11 @@ public class DefaultIdentity implements Identity { // OBJECT METHODS // - /** - * {@inheritDoc} - */ @Override public int hashCode() { return getId().hashCode(); } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object object) { if (!(object instanceof Identity)) { @@ -223,9 +169,6 @@ public class DefaultIdentity implements Identity { return identity.getId().equals(getId()); } - /** - * {@inheritDoc} - */ @Override public String toString() { return getClass().getSimpleName() + "[id=" + id + ",nickname=" + nickname + ",contexts=" + contexts + ",properties=" + properties + "]"; diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java index 348cd8c..08a66e3 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/DefaultOwnIdentity.java @@ -62,9 +62,6 @@ public class DefaultOwnIdentity extends DefaultIdentity implements OwnIdentity { // ACCESSORS // - /** - * {@inheritDoc} - */ @Override public String getInsertUri() { return insertUri; diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java index 77e0480..7d07db5 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/IdentityManager.java @@ -157,9 +157,6 @@ public class IdentityManager extends AbstractService { // SERVICE METHODS // - /** - * {@inheritDoc} - */ @Override protected void serviceRun() { Map> oldIdentities = Collections.emptyMap(); diff --git a/src/main/java/net/pterodactylus/sone/freenet/wot/Trust.java b/src/main/java/net/pterodactylus/sone/freenet/wot/Trust.java index 6fa37d0..0a31606 100644 --- a/src/main/java/net/pterodactylus/sone/freenet/wot/Trust.java +++ b/src/main/java/net/pterodactylus/sone/freenet/wot/Trust.java @@ -79,9 +79,6 @@ public class Trust { return distance; } - /** - * {@inheritDoc} - */ @Override public String toString() { return getClass().getName() + "[explicit=" + explicit + ",implicit=" + implicit + ",distance=" + distance + "]"; diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java index 8e24e3c..a3c3d80 100644 --- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java +++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java @@ -42,18 +42,6 @@ import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.logging.LoggingListener; import net.pterodactylus.util.version.Version; -import com.google.common.eventbus.EventBus; -import com.google.inject.AbstractModule; -import com.google.inject.Guice; -import com.google.inject.Injector; -import com.google.inject.Singleton; -import com.google.inject.TypeLiteral; -import com.google.inject.matcher.Matchers; -import com.google.inject.name.Names; -import com.google.inject.spi.InjectionListener; -import com.google.inject.spi.TypeEncounter; -import com.google.inject.spi.TypeListener; - import freenet.client.async.DatabaseDisabledException; import freenet.l10n.BaseL10n.LANGUAGE; import freenet.l10n.PluginL10n; @@ -69,6 +57,18 @@ import freenet.pluginmanager.PluginRespirator; import freenet.support.SimpleFieldSet; import freenet.support.api.Bucket; +import com.google.common.eventbus.EventBus; +import com.google.inject.AbstractModule; +import com.google.inject.Guice; +import com.google.inject.Injector; +import com.google.inject.Singleton; +import com.google.inject.TypeLiteral; +import com.google.inject.matcher.Matchers; +import com.google.inject.name.Names; +import com.google.inject.spi.InjectionListener; +import com.google.inject.spi.TypeEncounter; +import com.google.inject.spi.TypeListener; + /** * This class interfaces with Freenet. It is the class that is loaded by the * node and starts up the whole Sone system. @@ -160,9 +160,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr // FREDPLUGIN METHODS // - /** - * {@inheritDoc} - */ @Override public void runPlugin(PluginRespirator pluginRespirator) { this.pluginRespirator = pluginRespirator; @@ -280,9 +277,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr } } - /** - * {@inheritDoc} - */ @Override public void terminate() { try { @@ -306,9 +300,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr // INTERFACE FredPluginFCP // - /** - * {@inheritDoc} - */ @Override public void handle(PluginReplySender pluginReplySender, SimpleFieldSet parameters, Bucket data, int accessType) { fcpInterface.handle(pluginReplySender, parameters, data, accessType); @@ -318,17 +309,11 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr // INTERFACE FredPluginL10n // - /** - * {@inheritDoc} - */ @Override public String getString(String key) { return l10n.getBase().getString(key); } - /** - * {@inheritDoc} - */ @Override public void setLanguage(LANGUAGE newLanguage) { l10n = new PluginL10n(this, newLanguage); @@ -338,33 +323,21 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr // INTERFACE FredPluginBaseL10n // - /** - * {@inheritDoc} - */ @Override public String getL10nFilesBasePath() { return "i18n"; } - /** - * {@inheritDoc} - */ @Override public String getL10nFilesMask() { return "sone.${lang}.properties"; } - /** - * {@inheritDoc} - */ @Override public String getL10nOverrideFilesMask() { return "sone.${lang}.override.properties"; } - /** - * {@inheritDoc} - */ @Override public ClassLoader getPluginClassLoader() { return SonePlugin.class.getClassLoader(); @@ -374,9 +347,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr // INTERFACE FredPluginVersioned // - /** - * {@inheritDoc} - */ @Override public String getVersion() { return VERSION.toString(); diff --git a/src/main/java/net/pterodactylus/sone/notify/ListNotification.java b/src/main/java/net/pterodactylus/sone/notify/ListNotification.java index 9d1203b..6447990 100644 --- a/src/main/java/net/pterodactylus/sone/notify/ListNotification.java +++ b/src/main/java/net/pterodactylus/sone/notify/ListNotification.java @@ -154,9 +154,6 @@ public class ListNotification extends TemplateNotification { // ABSTRACTNOTIFICATION METHODS // - /** - * {@inheritDoc} - */ @Override public void dismiss() { super.dismiss(); @@ -167,9 +164,6 @@ public class ListNotification extends TemplateNotification { // OBJECT METHODS // - /** - * {@inheritDoc} - */ @Override public int hashCode() { int hashCode = super.hashCode(); @@ -179,9 +173,6 @@ public class ListNotification extends TemplateNotification { return hashCode; } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object object) { if (!(object instanceof ListNotification)) { diff --git a/src/main/java/net/pterodactylus/sone/template/AlbumAccessor.java b/src/main/java/net/pterodactylus/sone/template/AlbumAccessor.java index 51cd974..52a9d88 100644 --- a/src/main/java/net/pterodactylus/sone/template/AlbumAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/AlbumAccessor.java @@ -34,9 +34,6 @@ import net.pterodactylus.util.template.TemplateContext; */ public class AlbumAccessor extends ReflectionAccessor { - /** - * {@inheritDoc} - */ @Override public Object get(TemplateContext templateContext, Object object, String member) { Album album = (Album) object; diff --git a/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java b/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java index 12b4bc2..e6b1dfc 100644 --- a/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/CollectionAccessor.java @@ -40,9 +40,6 @@ import net.pterodactylus.util.template.TemplateContext; */ public class CollectionAccessor extends ReflectionAccessor { - /** - * {@inheritDoc} - */ @Override public Object get(TemplateContext templateContext, Object object, String member) { if (object == null) { diff --git a/src/main/java/net/pterodactylus/sone/template/CssClassNameFilter.java b/src/main/java/net/pterodactylus/sone/template/CssClassNameFilter.java index a3f8db6..3a41661 100644 --- a/src/main/java/net/pterodactylus/sone/template/CssClassNameFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/CssClassNameFilter.java @@ -31,9 +31,6 @@ import net.pterodactylus.util.template.TemplateContext; */ public class CssClassNameFilter implements Filter { - /** - * {@inheritDoc} - */ @Override public Object format(TemplateContext templateContext, Object data, Map parameters) { return String.valueOf(data).replaceAll("[^a-zA-Z0-9-]", "_"); diff --git a/src/main/java/net/pterodactylus/sone/template/GetPagePlugin.java b/src/main/java/net/pterodactylus/sone/template/GetPagePlugin.java index d070fe9..f79b06e 100644 --- a/src/main/java/net/pterodactylus/sone/template/GetPagePlugin.java +++ b/src/main/java/net/pterodactylus/sone/template/GetPagePlugin.java @@ -32,9 +32,6 @@ import net.pterodactylus.util.web.Request; */ public class GetPagePlugin implements Plugin { - /** - * {@inheritDoc} - */ @Override public void execute(TemplateContext templateContext, Map parameters) { String requestKey = parameters.get("request"); diff --git a/src/main/java/net/pterodactylus/sone/template/HttpRequestAccessor.java b/src/main/java/net/pterodactylus/sone/template/HttpRequestAccessor.java index 0d888bc..a1bed67 100644 --- a/src/main/java/net/pterodactylus/sone/template/HttpRequestAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/HttpRequestAccessor.java @@ -31,9 +31,6 @@ import freenet.support.api.HTTPRequest; */ public class HttpRequestAccessor extends ReflectionAccessor { - /** - * {@inheritDoc} - */ @Override public Object get(TemplateContext templateContext, Object object, String member) { Object parentValue = super.get(templateContext, object, member); diff --git a/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java b/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java index c08a0a2..d4afd32 100644 --- a/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/IdentityAccessor.java @@ -47,9 +47,6 @@ public class IdentityAccessor extends ReflectionAccessor { this.core = core; } - /** - * {@inheritDoc} - */ @Override public Object get(TemplateContext templateContext, Object object, String member) { Identity identity = (Identity) object; diff --git a/src/main/java/net/pterodactylus/sone/template/ImageAccessor.java b/src/main/java/net/pterodactylus/sone/template/ImageAccessor.java index 3ac684c..1f1482a 100644 --- a/src/main/java/net/pterodactylus/sone/template/ImageAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/ImageAccessor.java @@ -37,9 +37,6 @@ import net.pterodactylus.util.template.TemplateContext; */ public class ImageAccessor extends ReflectionAccessor { - /** - * {@inheritDoc} - */ @Override public Object get(TemplateContext templateContext, Object object, String member) { Image image = (Image) object; diff --git a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java index 55cf4b1..692b1cb 100644 --- a/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/ImageLinkFilter.java @@ -62,9 +62,6 @@ public class ImageLinkFilter implements Filter { this.templateContextFactory = templateContextFactory; } - /** - * {@inheritDoc} - */ @Override public Object format(TemplateContext templateContext, Object data, Map parameters) { Image image = null; diff --git a/src/main/java/net/pterodactylus/sone/template/JavascriptFilter.java b/src/main/java/net/pterodactylus/sone/template/JavascriptFilter.java index 9b8cd7e..6f92b0e 100644 --- a/src/main/java/net/pterodactylus/sone/template/JavascriptFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/JavascriptFilter.java @@ -33,9 +33,6 @@ import com.google.common.io.BaseEncoding; */ public class JavascriptFilter implements Filter { - /** - * {@inheritDoc} - */ @Override public Object format(TemplateContext templateContext, Object data, Map parameters) { StringBuilder javascriptString = new StringBuilder(); diff --git a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java index bc496a2..3900ad8 100644 --- a/src/main/java/net/pterodactylus/sone/template/ParserFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/ParserFilter.java @@ -84,9 +84,6 @@ public class ParserFilter implements Filter { this.soneTextParser = soneTextParser; } - /** - * {@inheritDoc} - */ @Override public Object format(TemplateContext templateContext, Object data, Map parameters) { String text = String.valueOf(data); diff --git a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java index d593b51..9f33779 100644 --- a/src/main/java/net/pterodactylus/sone/template/PostAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/PostAccessor.java @@ -50,9 +50,6 @@ public class PostAccessor extends ReflectionAccessor { this.core = core; } - /** - * {@inheritDoc} - */ @Override public Object get(TemplateContext templateContext, Object object, String member) { Post post = (Post) object; diff --git a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java index f072041..d215c82 100644 --- a/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/ProfileAccessor.java @@ -49,9 +49,6 @@ public class ProfileAccessor extends ReflectionAccessor { this.core = core; } - /** - * {@inheritDoc} - */ @Override public Object get(TemplateContext templateContext, Object object, String member) { Profile profile = (Profile) object; diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java index b497a94..7e81eb7 100644 --- a/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/ReplyAccessor.java @@ -46,9 +46,6 @@ public class ReplyAccessor extends ReflectionAccessor { this.core = core; } - /** - * {@inheritDoc} - */ @Override public Object get(TemplateContext templateContext, Object object, String member) { PostReply reply = (PostReply) object; diff --git a/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java b/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java index 3d5fda1..eff8c7f 100644 --- a/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/ReplyGroupFilter.java @@ -41,9 +41,6 @@ import com.google.common.base.Optional; */ public class ReplyGroupFilter implements Filter { - /** - * {@inheritDoc} - */ @Override public Object format(TemplateContext templateContext, Object data, Map parameters) { @SuppressWarnings("unchecked") diff --git a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java index 0d4f556..ff677fb 100644 --- a/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/RequestChangeFilter.java @@ -39,9 +39,6 @@ import net.pterodactylus.util.template.TemplateContext; */ public class RequestChangeFilter implements Filter { - /** - * {@inheritDoc} - */ @Override public Object format(TemplateContext templateContext, Object data, Map parameters) { FreenetRequest request = (FreenetRequest) data; diff --git a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java index 92be8e0..c93f4e7 100644 --- a/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/SoneAccessor.java @@ -73,9 +73,6 @@ public class SoneAccessor extends ReflectionAccessor { this.core = core; } - /** - * {@inheritDoc} - */ @Override public Object get(TemplateContext templateContext, Object object, String member) { Sone sone = (Sone) object; diff --git a/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java b/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java index 6efc5ed..d6e5771 100644 --- a/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/SubstringFilter.java @@ -33,9 +33,6 @@ import net.pterodactylus.util.template.TemplateContext; */ public class SubstringFilter implements Filter { - /** - * {@inheritDoc} - */ @Override public Object format(TemplateContext templateContext, Object data, Map parameters) { String startString = String.valueOf(parameters.get("start")); diff --git a/src/main/java/net/pterodactylus/sone/template/TrustAccessor.java b/src/main/java/net/pterodactylus/sone/template/TrustAccessor.java index 7ba7a10..50e8506 100644 --- a/src/main/java/net/pterodactylus/sone/template/TrustAccessor.java +++ b/src/main/java/net/pterodactylus/sone/template/TrustAccessor.java @@ -35,9 +35,6 @@ import net.pterodactylus.util.template.TemplateContext; */ public class TrustAccessor extends ReflectionAccessor { - /** - * {@inheritDoc} - */ @Override public Object get(TemplateContext templateContext, Object object, String member) { Trust trust = (Trust) object; diff --git a/src/main/java/net/pterodactylus/sone/template/UniqueElementFilter.java b/src/main/java/net/pterodactylus/sone/template/UniqueElementFilter.java index fb5551d..445f8bf 100644 --- a/src/main/java/net/pterodactylus/sone/template/UniqueElementFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/UniqueElementFilter.java @@ -32,9 +32,6 @@ import net.pterodactylus.util.template.TemplateContext; */ public class UniqueElementFilter implements Filter { - /** - * {@inheritDoc} - */ @Override public Object format(TemplateContext templateContext, Object data, Map parameters) { if (!(data instanceof Collection)) { diff --git a/src/main/java/net/pterodactylus/sone/template/UnknownDateFilter.java b/src/main/java/net/pterodactylus/sone/template/UnknownDateFilter.java index 077e1fd..379b55c 100644 --- a/src/main/java/net/pterodactylus/sone/template/UnknownDateFilter.java +++ b/src/main/java/net/pterodactylus/sone/template/UnknownDateFilter.java @@ -50,9 +50,6 @@ public class UnknownDateFilter implements Filter { this.unknownKey = unknownKey; } - /** - * {@inheritDoc} - */ @Override public Object format(TemplateContext templateContext, Object data, Map parameters) { if (data instanceof Long) { diff --git a/src/main/java/net/pterodactylus/sone/text/LinkPart.java b/src/main/java/net/pterodactylus/sone/text/LinkPart.java index f531bab..de7cb25 100644 --- a/src/main/java/net/pterodactylus/sone/text/LinkPart.java +++ b/src/main/java/net/pterodactylus/sone/text/LinkPart.java @@ -89,11 +89,6 @@ public class LinkPart implements Part { // PART METHODS // - /** - * Returns the text of this part. - * - * @return The text of this part - */ @Override public String getText() { return text; diff --git a/src/main/java/net/pterodactylus/sone/text/PartContainer.java b/src/main/java/net/pterodactylus/sone/text/PartContainer.java index 7d8acd6..14941fb 100644 --- a/src/main/java/net/pterodactylus/sone/text/PartContainer.java +++ b/src/main/java/net/pterodactylus/sone/text/PartContainer.java @@ -84,9 +84,6 @@ public class PartContainer implements Part, Iterable { // PART METHODS // - /** - * {@inheritDoc} - */ @Override public String getText() { StringBuilder partText = new StringBuilder(); @@ -100,9 +97,6 @@ public class PartContainer implements Part, Iterable { // ITERABLE METHODS // - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("synthetic-access") public Iterator iterator() { diff --git a/src/main/java/net/pterodactylus/sone/text/PlainTextPart.java b/src/main/java/net/pterodactylus/sone/text/PlainTextPart.java index aa6441b..7e677e5 100644 --- a/src/main/java/net/pterodactylus/sone/text/PlainTextPart.java +++ b/src/main/java/net/pterodactylus/sone/text/PlainTextPart.java @@ -41,11 +41,6 @@ public class PlainTextPart implements Part { // PART METHODS // - /** - * Returns the text of this part. - * - * @return The text of this part - */ @Override public String getText() { return text; diff --git a/src/main/java/net/pterodactylus/sone/text/PostPart.java b/src/main/java/net/pterodactylus/sone/text/PostPart.java index f7177c9..1e7eda1 100644 --- a/src/main/java/net/pterodactylus/sone/text/PostPart.java +++ b/src/main/java/net/pterodactylus/sone/text/PostPart.java @@ -56,9 +56,6 @@ public class PostPart implements Part { // PART METHODS // - /** - * {@inheritDoc} - */ @Override public String getText() { return post.getText(); diff --git a/src/main/java/net/pterodactylus/sone/text/SonePart.java b/src/main/java/net/pterodactylus/sone/text/SonePart.java index a7b418b..7c0c34f 100644 --- a/src/main/java/net/pterodactylus/sone/text/SonePart.java +++ b/src/main/java/net/pterodactylus/sone/text/SonePart.java @@ -57,9 +57,6 @@ public class SonePart implements Part { // PART METHODS // - /** - * {@inheritDoc} - */ @Override public String getText() { return SoneAccessor.getNiceName(sone); diff --git a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java index 16db9c1..0edd5f3 100644 --- a/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java +++ b/src/main/java/net/pterodactylus/sone/text/SoneTextParser.java @@ -120,9 +120,6 @@ public class SoneTextParser implements Parser { // PART METHODS // - /** - * {@inheritDoc} - */ @Override public Iterable parse(SoneTextParserContext context, Reader source) throws IOException { PartContainer parts = new PartContainer(); diff --git a/src/main/java/net/pterodactylus/sone/utils/IntegerRangePredicate.java b/src/main/java/net/pterodactylus/sone/utils/IntegerRangePredicate.java index db6a841..11eff29 100644 --- a/src/main/java/net/pterodactylus/sone/utils/IntegerRangePredicate.java +++ b/src/main/java/net/pterodactylus/sone/utils/IntegerRangePredicate.java @@ -51,9 +51,6 @@ public class IntegerRangePredicate implements Predicate { // PREDICATE METHODS // - /** - * {@inheritDoc} - */ @Override public boolean apply(Integer value) { return (value != null) && (value >= lowerBound) && (value <= upperBound); diff --git a/src/main/java/net/pterodactylus/sone/web/AboutPage.java b/src/main/java/net/pterodactylus/sone/web/AboutPage.java index 6a6bc63..8078eb7 100644 --- a/src/main/java/net/pterodactylus/sone/web/AboutPage.java +++ b/src/main/java/net/pterodactylus/sone/web/AboutPage.java @@ -51,9 +51,6 @@ public class AboutPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/BookmarkPage.java b/src/main/java/net/pterodactylus/sone/web/BookmarkPage.java index 042a683..923679f 100644 --- a/src/main/java/net/pterodactylus/sone/web/BookmarkPage.java +++ b/src/main/java/net/pterodactylus/sone/web/BookmarkPage.java @@ -43,9 +43,6 @@ public class BookmarkPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java b/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java index 10b6dc3..f66807f 100644 --- a/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java +++ b/src/main/java/net/pterodactylus/sone/web/BookmarksPage.java @@ -56,9 +56,6 @@ public class BookmarksPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java index 97c0e3b..561878c 100644 --- a/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java +++ b/src/main/java/net/pterodactylus/sone/web/CreateAlbumPage.java @@ -50,9 +50,6 @@ public class CreateAlbumPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java index 9348652..3e7622a 100644 --- a/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java +++ b/src/main/java/net/pterodactylus/sone/web/CreatePostPage.java @@ -53,9 +53,6 @@ public class CreatePostPage extends SoneTemplatePage { // TEMPLATEPATH METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java index ef83c71..1303508 100644 --- a/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java +++ b/src/main/java/net/pterodactylus/sone/web/CreateReplyPage.java @@ -52,9 +52,6 @@ public class CreateReplyPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java b/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java index fe8c32e..2c183df 100644 --- a/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/CreateSonePage.java @@ -91,9 +91,6 @@ public class CreateSonePage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); @@ -128,9 +125,6 @@ public class CreateSonePage extends SoneTemplatePage { } } - /** - * {@inheritDoc} - */ @Override public boolean isEnabled(ToadletContext toadletContext) { if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) { diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java index 0250971..d167693 100644 --- a/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java +++ b/src/main/java/net/pterodactylus/sone/web/DeleteAlbumPage.java @@ -44,9 +44,6 @@ public class DeleteAlbumPage extends SoneTemplatePage { super("deleteAlbum.html", template, "Page.DeleteAlbum.Title", webInterface, true); } - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java b/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java index 6b423ef..8aa36a9 100644 --- a/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java +++ b/src/main/java/net/pterodactylus/sone/web/DeleteImagePage.java @@ -48,9 +48,6 @@ public class DeleteImagePage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java b/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java index 6ef86f0..23c2cc1 100644 --- a/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java +++ b/src/main/java/net/pterodactylus/sone/web/DeletePostPage.java @@ -17,14 +17,14 @@ package net.pterodactylus.sone.web; -import com.google.common.base.Optional; - import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; import net.pterodactylus.util.web.Method; +import com.google.common.base.Optional; + /** * Lets the user delete a post they made. * @@ -48,9 +48,6 @@ public class DeletePostPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java index 852cc91..b6f3eeb 100644 --- a/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java +++ b/src/main/java/net/pterodactylus/sone/web/DeleteProfileFieldPage.java @@ -48,9 +48,6 @@ public class DeleteProfileFieldPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java b/src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java index f7ca132..7a593bc 100644 --- a/src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java +++ b/src/main/java/net/pterodactylus/sone/web/DeleteReplyPage.java @@ -48,9 +48,6 @@ public class DeleteReplyPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java b/src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java index 39d3fb3..c623310 100644 --- a/src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/DeleteSonePage.java @@ -48,9 +48,6 @@ public class DeleteSonePage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java b/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java index 40efa5d..3e47a45 100644 --- a/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java +++ b/src/main/java/net/pterodactylus/sone/web/DismissNotificationPage.java @@ -45,9 +45,6 @@ public class DismissNotificationPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/DistrustPage.java b/src/main/java/net/pterodactylus/sone/web/DistrustPage.java index c8879a0..46a621b 100644 --- a/src/main/java/net/pterodactylus/sone/web/DistrustPage.java +++ b/src/main/java/net/pterodactylus/sone/web/DistrustPage.java @@ -17,8 +17,6 @@ package net.pterodactylus.sone.web; -import com.google.common.base.Optional; - import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.page.FreenetRequest; @@ -26,6 +24,8 @@ import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; import net.pterodactylus.util.web.Method; +import com.google.common.base.Optional; + /** * Page that lets the user distrust another Sone. This will assign a * configurable (negative) amount of trust to an identity. @@ -51,9 +51,6 @@ public class DistrustPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java index e4fbdd5..f37be62 100644 --- a/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java +++ b/src/main/java/net/pterodactylus/sone/web/EditAlbumPage.java @@ -45,9 +45,6 @@ public class EditAlbumPage extends SoneTemplatePage { super("editAlbum.html", template, "Page.EditAlbum.Title", webInterface, true); } - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/EditImagePage.java b/src/main/java/net/pterodactylus/sone/web/EditImagePage.java index c9bd705..a123b8b 100644 --- a/src/main/java/net/pterodactylus/sone/web/EditImagePage.java +++ b/src/main/java/net/pterodactylus/sone/web/EditImagePage.java @@ -49,9 +49,6 @@ public class EditImagePage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java b/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java index fe9d78f..69c9be9 100644 --- a/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java +++ b/src/main/java/net/pterodactylus/sone/web/EditProfileFieldPage.java @@ -48,9 +48,6 @@ public class EditProfileFieldPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java index d814212..5e5b919 100644 --- a/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java +++ b/src/main/java/net/pterodactylus/sone/web/EditProfilePage.java @@ -52,9 +52,6 @@ public class EditProfilePage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java b/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java index 11a680c..0b98a1a 100644 --- a/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/FollowSonePage.java @@ -17,14 +17,14 @@ package net.pterodactylus.sone.web; -import com.google.common.base.Optional; - import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; import net.pterodactylus.util.web.Method; +import com.google.common.base.Optional; + /** * This page lets the user follow another Sone. * @@ -46,9 +46,6 @@ public class FollowSonePage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/GetImagePage.java b/src/main/java/net/pterodactylus/sone/web/GetImagePage.java index 442ce7d..7fb5cde 100644 --- a/src/main/java/net/pterodactylus/sone/web/GetImagePage.java +++ b/src/main/java/net/pterodactylus/sone/web/GetImagePage.java @@ -45,25 +45,16 @@ public class GetImagePage implements FreenetPage { this.webInterface = webInterface; } - /** - * {@inheritDoc} - */ @Override public String getPath() { return "getImage.html"; } - /** - * {@inheritDoc} - */ @Override public boolean isPrefixPage() { return false; } - /** - * {@inheritDoc} - */ @Override public Response handleRequest(FreenetRequest request, Response response) throws IOException { String imageId = request.getHttpRequest().getParam("image"); @@ -75,9 +66,6 @@ public class GetImagePage implements FreenetPage { return response.setStatusCode(200).setStatusText("OK").setContentType(contentType).addHeader("Content-Disposition", "attachment; filename=" + temporaryImage.getId() + "." + contentType.substring(contentType.lastIndexOf('/') + 1)).write(temporaryImage.getImageData()); } - /** - * {@inheritDoc} - */ @Override public boolean isLinkExcepted(URI link) { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java index 1e881cf..4a67034 100644 --- a/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ImageBrowserPage.java @@ -61,9 +61,6 @@ public class ImageBrowserPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); @@ -107,9 +104,6 @@ public class ImageBrowserPage extends SoneTemplatePage { templateContext.set("sone", sone); } - /** - * {@inheritDoc} - */ @Override public boolean isLinkExcepted(URI link) { return true; diff --git a/src/main/java/net/pterodactylus/sone/web/IndexPage.java b/src/main/java/net/pterodactylus/sone/web/IndexPage.java index e1a52b9..a3db226 100644 --- a/src/main/java/net/pterodactylus/sone/web/IndexPage.java +++ b/src/main/java/net/pterodactylus/sone/web/IndexPage.java @@ -57,9 +57,6 @@ public class IndexPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java index dd1b1fc..553ad76 100644 --- a/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java +++ b/src/main/java/net/pterodactylus/sone/web/KnownSonesPage.java @@ -57,9 +57,6 @@ public class KnownSonesPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/LikePage.java b/src/main/java/net/pterodactylus/sone/web/LikePage.java index 7f08e65..d4dd401 100644 --- a/src/main/java/net/pterodactylus/sone/web/LikePage.java +++ b/src/main/java/net/pterodactylus/sone/web/LikePage.java @@ -47,9 +47,6 @@ public class LikePage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/LockSonePage.java b/src/main/java/net/pterodactylus/sone/web/LockSonePage.java index 3c3e2c3..e2fbb76 100644 --- a/src/main/java/net/pterodactylus/sone/web/LockSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/LockSonePage.java @@ -48,9 +48,6 @@ public class LockSonePage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/LoginPage.java b/src/main/java/net/pterodactylus/sone/web/LoginPage.java index d1bb0ed..95443c8 100644 --- a/src/main/java/net/pterodactylus/sone/web/LoginPage.java +++ b/src/main/java/net/pterodactylus/sone/web/LoginPage.java @@ -61,9 +61,6 @@ public class LoginPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); @@ -87,9 +84,6 @@ public class LoginPage extends SoneTemplatePage { templateContext.set("identitiesWithoutSone", ownIdentitiesWithoutSone); } - /** - * {@inheritDoc} - */ @Override protected String getRedirectTarget(FreenetRequest request) { if (getCurrentSone(request.getToadletContext(), false) != null) { @@ -102,9 +96,6 @@ public class LoginPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override public boolean isEnabled(ToadletContext toadletContext) { if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) { diff --git a/src/main/java/net/pterodactylus/sone/web/LogoutPage.java b/src/main/java/net/pterodactylus/sone/web/LogoutPage.java index bc4c56d..416e4f4 100644 --- a/src/main/java/net/pterodactylus/sone/web/LogoutPage.java +++ b/src/main/java/net/pterodactylus/sone/web/LogoutPage.java @@ -43,9 +43,6 @@ public class LogoutPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { setCurrentSone(request.getToadletContext(), null); @@ -53,9 +50,6 @@ public class LogoutPage extends SoneTemplatePage { throw new RedirectException("index.html"); } - /** - * {@inheritDoc} - */ @Override public boolean isEnabled(ToadletContext toadletContext) { if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) { diff --git a/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java b/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java index 66ac635..0b3d4b3 100644 --- a/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java +++ b/src/main/java/net/pterodactylus/sone/web/MarkAsKnownPage.java @@ -53,9 +53,6 @@ public class MarkAsKnownPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/NewPage.java b/src/main/java/net/pterodactylus/sone/web/NewPage.java index 71200d8..7973d28 100644 --- a/src/main/java/net/pterodactylus/sone/web/NewPage.java +++ b/src/main/java/net/pterodactylus/sone/web/NewPage.java @@ -23,8 +23,6 @@ import java.util.HashSet; import java.util.List; import java.util.Set; -import com.google.common.collect.Collections2; - import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.PostReply; import net.pterodactylus.sone.notify.ListNotificationFilters; @@ -34,6 +32,8 @@ import net.pterodactylus.util.number.Numbers; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; +import com.google.common.collect.Collections2; + /** * Page that displays all new posts and replies. The posts are filtered using * {@link ListNotificationFilters#filterPosts(java.util.Collection, net.pterodactylus.sone.data.Sone)} @@ -59,9 +59,6 @@ public class NewPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java index 094a9cf..53c5977 100644 --- a/src/main/java/net/pterodactylus/sone/web/OptionsPage.java +++ b/src/main/java/net/pterodactylus/sone/web/OptionsPage.java @@ -53,9 +53,6 @@ public class OptionsPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/RescuePage.java b/src/main/java/net/pterodactylus/sone/web/RescuePage.java index 6888277..89bd738 100644 --- a/src/main/java/net/pterodactylus/sone/web/RescuePage.java +++ b/src/main/java/net/pterodactylus/sone/web/RescuePage.java @@ -49,9 +49,6 @@ public class RescuePage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/SearchPage.java b/src/main/java/net/pterodactylus/sone/web/SearchPage.java index db29fd2..d83b822 100644 --- a/src/main/java/net/pterodactylus/sone/web/SearchPage.java +++ b/src/main/java/net/pterodactylus/sone/web/SearchPage.java @@ -94,9 +94,6 @@ public class SearchPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("synthetic-access") protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { @@ -421,9 +418,6 @@ public class SearchPage extends SoneTemplatePage { this.complete = complete; } - /** - * {@inheritDoc} - */ @Override public String generateString(Sone sone) { StringBuilder soneString = new StringBuilder(); @@ -457,9 +451,6 @@ public class SearchPage extends SoneTemplatePage { */ private class PostStringGenerator implements StringGenerator { - /** - * {@inheritDoc} - */ @Override public String generateString(Post post) { StringBuilder postString = new StringBuilder(); @@ -543,17 +534,11 @@ public class SearchPage extends SoneTemplatePage { // OBJECT METHODS // - /** - * {@inheritDoc} - */ @Override public int hashCode() { return phrase.hashCode() ^ ((optionality == Optionality.FORBIDDEN) ? (0xaaaaaaaa) : ((optionality == Optionality.REQUIRED) ? 0x55555555 : 0)); } - /** - * {@inheritDoc} - */ @Override public boolean equals(Object object) { if (!(object instanceof Phrase)) { @@ -644,9 +629,6 @@ public class SearchPage extends SoneTemplatePage { */ private static class HitMapper implements Function, T> { - /** - * {@inheritDoc} - */ @Override public T apply(Hit input) { return input.getObject(); diff --git a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java index 7dfdfe7..9df00b7 100644 --- a/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java +++ b/src/main/java/net/pterodactylus/sone/web/SoneTemplatePage.java @@ -34,13 +34,13 @@ import net.pterodactylus.util.notify.Notification; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; - import freenet.clients.http.SessionManager.Session; import freenet.clients.http.ToadletContext; import freenet.support.api.HTTPRequest; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; + /** * Base page for the Sone web interface. * @@ -202,9 +202,6 @@ public class SoneTemplatePage extends FreenetTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected String getPageTitle(FreenetRequest request) { if (pageTitleKey != null) { @@ -213,25 +210,16 @@ public class SoneTemplatePage extends FreenetTemplatePage { return ""; } - /** - * {@inheritDoc} - */ @Override protected List> getAdditionalLinkNodes(FreenetRequest request) { return ImmutableList.> builder().add(ImmutableMap. builder().put("rel", "search").put("type", "application/opensearchdescription+xml").put("title", "Sone").put("href", "http://" + request.getHttpRequest().getHeader("host") + "/Sone/OpenSearch.xml").build()).build(); } - /** - * {@inheritDoc} - */ @Override protected Collection getStyleSheets() { return Arrays.asList("css/sone.css"); } - /** - * {@inheritDoc} - */ @Override protected String getShortcutIcon() { return "images/icon.png"; @@ -247,9 +235,6 @@ public class SoneTemplatePage extends FreenetTemplatePage { return requireLogin; } - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); @@ -269,9 +254,6 @@ public class SoneTemplatePage extends FreenetTemplatePage { templateContext.set("notificationHash", notifications.hashCode()); } - /** - * {@inheritDoc} - */ @Override protected String getRedirectTarget(FreenetRequest request) { if (requiresLogin() && (getCurrentSone(request.getToadletContext(), false) == null)) { @@ -299,17 +281,11 @@ public class SoneTemplatePage extends FreenetTemplatePage { return null; } - /** - * {@inheritDoc} - */ @Override protected boolean isFullAccessOnly() { return webInterface.getCore().getPreferences().isRequireFullAccess(); } - /** - * {@inheritDoc} - */ @Override public boolean isEnabled(ToadletContext toadletContext) { if (webInterface.getCore().getPreferences().isRequireFullAccess() && !toadletContext.isAllowedFullAccess()) { diff --git a/src/main/java/net/pterodactylus/sone/web/TrustPage.java b/src/main/java/net/pterodactylus/sone/web/TrustPage.java index 39fd1de..10e4a8c 100644 --- a/src/main/java/net/pterodactylus/sone/web/TrustPage.java +++ b/src/main/java/net/pterodactylus/sone/web/TrustPage.java @@ -17,8 +17,6 @@ package net.pterodactylus.sone.web; -import com.google.common.base.Optional; - import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.page.FreenetRequest; @@ -26,6 +24,8 @@ import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; import net.pterodactylus.util.web.Method; +import com.google.common.base.Optional; + /** * Page that lets the user trust another Sone. This will assign a configurable * amount of trust to an identity. @@ -51,9 +51,6 @@ public class TrustPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java b/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java index b568be1..c7ecf5f 100644 --- a/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java +++ b/src/main/java/net/pterodactylus/sone/web/UnbookmarkPage.java @@ -46,9 +46,6 @@ public class UnbookmarkPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java b/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java index 4813239..f8a5041 100644 --- a/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/UnfollowSonePage.java @@ -44,9 +44,6 @@ public class UnfollowSonePage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/UnlikePage.java b/src/main/java/net/pterodactylus/sone/web/UnlikePage.java index 9254a42..0670a18 100644 --- a/src/main/java/net/pterodactylus/sone/web/UnlikePage.java +++ b/src/main/java/net/pterodactylus/sone/web/UnlikePage.java @@ -47,9 +47,6 @@ public class UnlikePage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java b/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java index 314a8c0..a2be618 100644 --- a/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/UnlockSonePage.java @@ -47,9 +47,6 @@ public class UnlockSonePage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/UntrustPage.java b/src/main/java/net/pterodactylus/sone/web/UntrustPage.java index d68d5ca..294fff2 100644 --- a/src/main/java/net/pterodactylus/sone/web/UntrustPage.java +++ b/src/main/java/net/pterodactylus/sone/web/UntrustPage.java @@ -17,8 +17,6 @@ package net.pterodactylus.sone.web; -import com.google.common.base.Optional; - import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.page.FreenetRequest; @@ -26,6 +24,8 @@ import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; import net.pterodactylus.util.web.Method; +import com.google.common.base.Optional; + /** * Page that lets the user untrust another Sone. This will remove all trust * assignments for an identity. @@ -51,9 +51,6 @@ public class UntrustPage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java index 0dcdd3a..ec228d7 100644 --- a/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java +++ b/src/main/java/net/pterodactylus/sone/web/UploadImagePage.java @@ -76,9 +76,6 @@ public class UploadImagePage extends SoneTemplatePage { // SONETEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); diff --git a/src/main/java/net/pterodactylus/sone/web/ViewPostPage.java b/src/main/java/net/pterodactylus/sone/web/ViewPostPage.java index 8adf46d..3f44419 100644 --- a/src/main/java/net/pterodactylus/sone/web/ViewPostPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ViewPostPage.java @@ -19,14 +19,14 @@ package net.pterodactylus.sone.web; import java.net.URI; -import com.google.common.base.Optional; - import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.template.SoneAccessor; import net.pterodactylus.sone.web.page.FreenetRequest; import net.pterodactylus.util.template.Template; import net.pterodactylus.util.template.TemplateContext; +import com.google.common.base.Optional; + /** * This page lets the user view a post and all its replies. * @@ -50,9 +50,6 @@ public class ViewPostPage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected String getPageTitle(FreenetRequest request) { String postId = request.getHttpRequest().getParam("post"); @@ -66,9 +63,6 @@ public class ViewPostPage extends SoneTemplatePage { return title; } - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); @@ -79,9 +73,6 @@ public class ViewPostPage extends SoneTemplatePage { templateContext.set("raw", raw); } - /** - * {@inheritDoc} - */ @Override public boolean isLinkExcepted(URI link) { return true; diff --git a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java index a94b4af..3c0ba8f 100644 --- a/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java +++ b/src/main/java/net/pterodactylus/sone/web/ViewSonePage.java @@ -61,9 +61,6 @@ public class ViewSonePage extends SoneTemplatePage { // TEMPLATEPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected String getPageTitle(FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); @@ -75,9 +72,6 @@ public class ViewSonePage extends SoneTemplatePage { return webInterface.getL10n().getString("Page.ViewSone.Page.TitleWithoutSone"); } - /** - * {@inheritDoc} - */ @Override protected void processTemplate(FreenetRequest request, TemplateContext templateContext) throws RedirectException { super.processTemplate(request, templateContext); @@ -118,9 +112,6 @@ public class ViewSonePage extends SoneTemplatePage { templateContext.set("repliedPosts", repliedPostPagination.getItems()); } - /** - * {@inheritDoc} - */ @Override public boolean isLinkExcepted(URI link) { return true; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java index acee365..0eb02a5 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/BookmarkAjaxPage.java @@ -41,9 +41,6 @@ public class BookmarkAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String id = request.getHttpRequest().getParam("post", null); @@ -54,9 +51,6 @@ public class BookmarkAjaxPage extends JsonPage { return createSuccessJsonObject(); } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java index afccd40..3902951 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreatePostAjaxPage.java @@ -45,9 +45,6 @@ public class CreatePostAjaxPage extends JsonPage { super("createPost.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { Sone sone = getCurrentSone(request.getToadletContext()); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java index 441caaa..dc95166 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/CreateReplyAjaxPage.java @@ -49,9 +49,6 @@ public class CreateReplyAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String postId = request.getHttpRequest().getParam("post"); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java index acf5f03..66a67eb 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/DeletePostAjaxPage.java @@ -17,12 +17,12 @@ package net.pterodactylus.sone.web.ajax; -import com.google.common.base.Optional; - import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; +import com.google.common.base.Optional; + /** * This AJAX page deletes a post. * @@ -44,9 +44,6 @@ public class DeletePostAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String postId = request.getHttpRequest().getParam("post"); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java index cb33fb9..f037251 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteProfileFieldAjaxPage.java @@ -45,9 +45,6 @@ public class DeleteProfileFieldAjaxPage extends JsonPage { super("deleteProfileField.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String fieldId = request.getHttpRequest().getParam("field"); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java index 3ea9f7f..c9e493b 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/DeleteReplyAjaxPage.java @@ -17,12 +17,12 @@ package net.pterodactylus.sone.web.ajax; -import com.google.common.base.Optional; - import net.pterodactylus.sone.data.PostReply; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; +import com.google.common.base.Optional; + /** * This AJAX page deletes a reply. * @@ -44,9 +44,6 @@ public class DeleteReplyAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String replyId = request.getHttpRequest().getParam("reply"); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java index aed9cad..d8d5cf7 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/DismissNotificationAjaxPage.java @@ -38,9 +38,6 @@ public class DismissNotificationAjaxPage extends JsonPage { super("dismissNotification.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String notificationId = request.getHttpRequest().getParam("notification"); @@ -55,9 +52,6 @@ public class DismissNotificationAjaxPage extends JsonPage { return createSuccessJsonObject(); } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java index 4206e8f..2694abf 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/DistrustAjaxPage.java @@ -17,13 +17,13 @@ package net.pterodactylus.sone.web.ajax; -import com.google.common.base.Optional; - import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; +import com.google.common.base.Optional; + /** * AJAX page that lets the user distrust a Sone. * @@ -42,9 +42,6 @@ public class DistrustAjaxPage extends JsonPage { super("distrustSone.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { Sone currentSone = getCurrentSone(request.getToadletContext(), false); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java index 1bb419b..ba79baf 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/EditAlbumAjaxPage.java @@ -45,9 +45,6 @@ public class EditAlbumAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String albumId = request.getHttpRequest().getParam("album"); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.java index 18dccf4..df13f7b 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/EditImageAjaxPage.java @@ -54,9 +54,6 @@ public class EditImageAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String imageId = request.getHttpRequest().getParam("image"); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.java index b4596ad..d638b9d 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/EditProfileFieldAjaxPage.java @@ -44,9 +44,6 @@ public class EditProfileFieldAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String fieldId = request.getHttpRequest().getParam("field"); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java index 64c402a..1af59f3 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/FollowSoneAjaxPage.java @@ -17,12 +17,12 @@ package net.pterodactylus.sone.web.ajax; -import com.google.common.base.Optional; - import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; +import com.google.common.base.Optional; + /** * AJAX page that lets a Sone follow another Sone. * @@ -40,9 +40,6 @@ public class FollowSoneAjaxPage extends JsonPage { super("followSone.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java index ccc51dc..dea635c 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetLikesAjaxPage.java @@ -56,9 +56,6 @@ public class GetLikesAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String type = request.getHttpRequest().getParam("type", null); @@ -84,9 +81,6 @@ public class GetLikesAjaxPage extends JsonPage { return createErrorJsonObject("invalid-type"); } - /** - * {@inheritDoc} - */ @Override protected boolean needsFormPassword() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java index e8107ef..34eabc1 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetNotificationsAjaxPage.java @@ -59,25 +59,16 @@ public class GetNotificationsAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected boolean needsFormPassword() { return false; } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false; } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { Sone currentSone = getCurrentSone(request.getToadletContext(), false); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java index 96002b3..8587d12 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetPostAjaxPage.java @@ -17,10 +17,9 @@ package net.pterodactylus.sone.web.ajax; -import java.io.StringWriter; import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance; -import com.google.common.base.Optional; +import java.io.StringWriter; import net.pterodactylus.sone.data.Post; import net.pterodactylus.sone.data.Sone; @@ -33,6 +32,7 @@ import net.pterodactylus.util.template.TemplateException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.common.base.Optional; /** * This AJAX handler retrieves information and rendered representation of a @@ -58,9 +58,6 @@ public class GetPostAjaxPage extends JsonPage { this.postTemplate = postTemplate; } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String postId = request.getHttpRequest().getParam("post"); @@ -71,9 +68,6 @@ public class GetPostAjaxPage extends JsonPage { return createSuccessJsonObject().put("post", createJsonPost(request, post.get(), getCurrentSone(request.getToadletContext()))); } - /** - * {@inheritDoc} - */ @Override protected boolean needsFormPassword() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java index 251c784..56b51f4 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetReplyAjaxPage.java @@ -17,10 +17,9 @@ package net.pterodactylus.sone.web.ajax; -import java.io.StringWriter; import static com.fasterxml.jackson.databind.node.JsonNodeFactory.instance; -import com.google.common.base.Optional; +import java.io.StringWriter; import net.pterodactylus.sone.data.PostReply; import net.pterodactylus.sone.data.Sone; @@ -33,6 +32,7 @@ import net.pterodactylus.util.template.TemplateException; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.node.ObjectNode; +import com.google.common.base.Optional; /** * This AJAX page returns the details of a reply. @@ -61,9 +61,6 @@ public class GetReplyAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String replyId = request.getHttpRequest().getParam("reply"); @@ -74,9 +71,6 @@ public class GetReplyAjaxPage extends JsonPage { return createSuccessJsonObject().put("reply", createJsonReply(request, reply.get(), getCurrentSone(request.getToadletContext()))); } - /** - * {@inheritDoc} - */ @Override protected boolean needsFormPassword() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java index e43910c..d6c2bd7 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetStatusAjaxPage.java @@ -64,9 +64,6 @@ public class GetStatusAjaxPage extends JsonPage { super("getStatus.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { final Sone currentSone = getCurrentSone(request.getToadletContext(), false); @@ -137,17 +134,11 @@ public class GetStatusAjaxPage extends JsonPage { return createSuccessJsonObject().put("loggedIn", currentSone != null).put("options", createJsonOptions(currentSone)).put("sones", jsonSones).put("notificationHash", notifications.hashCode()).put("newPosts", jsonPosts).put("newReplies", jsonReplies); } - /** - * {@inheritDoc} - */ @Override protected boolean needsFormPassword() { return false; } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java index 0c78bb6..c15abcc 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetTimesAjaxPage.java @@ -52,9 +52,6 @@ public class GetTimesAjaxPage extends JsonPage { super("getTimes.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String allIds = request.getHttpRequest().getParam("posts"); @@ -98,17 +95,11 @@ public class GetTimesAjaxPage extends JsonPage { return createSuccessJsonObject().put("postTimes", postTimes).put("replyTimes", replyTimes); } - /** - * {@inheritDoc} - */ @Override protected boolean needsFormPassword() { return false; } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java index 5c81d95..d8f43cd 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/GetTranslationPage.java @@ -41,9 +41,6 @@ public class GetTranslationPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String key = request.getHttpRequest().getParam("key"); @@ -51,17 +48,11 @@ public class GetTranslationPage extends JsonPage { return createSuccessJsonObject().put("value", translation); } - /** - * {@inheritDoc} - */ @Override protected boolean needsFormPassword() { return false; } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java index 3c7f587..ea8d52b 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/JsonPage.java @@ -34,10 +34,11 @@ import net.pterodactylus.util.logging.Logging; import net.pterodactylus.util.web.Page; import net.pterodactylus.util.web.Response; -import com.fasterxml.jackson.databind.ObjectMapper; import freenet.clients.http.SessionManager.Session; import freenet.clients.http.ToadletContext; +import com.fasterxml.jackson.databind.ObjectMapper; + /** * A JSON page is a specialized {@link Page} that will always return a JSON * object to the browser, e.g. for use with AJAX or other scripting frameworks. @@ -196,25 +197,16 @@ public abstract class JsonPage implements FreenetPage { // PAGE METHODS // - /** - * {@inheritDoc} - */ @Override public String getPath() { return path; } - /** - * {@inheritDoc} - */ @Override public boolean isPrefixPage() { return false; } - /** - * {@inheritDoc} - */ @Override public Response handleRequest(FreenetRequest request, Response response) throws IOException { if (webInterface.getCore().getPreferences().isRequireFullAccess() && !request.getToadletContext().isAllowedFullAccess()) { @@ -240,9 +232,6 @@ public abstract class JsonPage implements FreenetPage { } } - /** - * {@inheritDoc} - */ @Override public boolean isLinkExcepted(URI link) { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/LikeAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/LikeAjaxPage.java index 55a947a..7e7a6a6 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/LikeAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/LikeAjaxPage.java @@ -39,9 +39,6 @@ public class LikeAjaxPage extends JsonPage { super("like.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String type = request.getHttpRequest().getParam("type", null); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java index f1e86f9..20490f1 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/LockSoneAjaxPage.java @@ -41,9 +41,6 @@ public class LockSoneAjaxPage extends JsonPage { super("lockSone.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); @@ -55,9 +52,6 @@ public class LockSoneAjaxPage extends JsonPage { return createSuccessJsonObject(); } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.java index cd026ef..602f253 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/MarkAsKnownAjaxPage.java @@ -45,9 +45,6 @@ public class MarkAsKnownAjaxPage extends JsonPage { super("markAsKnown.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String type = request.getHttpRequest().getParam("type"); @@ -80,9 +77,6 @@ public class MarkAsKnownAjaxPage extends JsonPage { return createSuccessJsonObject(); } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java index d8781ba..301e59a 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/MoveProfileFieldAjaxPage.java @@ -46,9 +46,6 @@ public class MoveProfileFieldAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { Sone currentSone = getCurrentSone(request.getToadletContext()); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java index 3661cb1..a05f959 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/TrustAjaxPage.java @@ -17,13 +17,13 @@ package net.pterodactylus.sone.web.ajax; -import com.google.common.base.Optional; - import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; +import com.google.common.base.Optional; + /** * AJAX page that lets the user trust a Sone. * @@ -42,9 +42,6 @@ public class TrustAjaxPage extends JsonPage { super("trustSone.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { Sone currentSone = getCurrentSone(request.getToadletContext(), false); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UnbookmarkAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UnbookmarkAjaxPage.java index 65bb14d..0014886 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/UnbookmarkAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/UnbookmarkAjaxPage.java @@ -41,9 +41,6 @@ public class UnbookmarkAjaxPage extends JsonPage { // JSONPAGE METHODS // - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String id = request.getHttpRequest().getParam("post", null); @@ -54,9 +51,6 @@ public class UnbookmarkAjaxPage extends JsonPage { return createSuccessJsonObject(); } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java index a285d20..3b45f27 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/UnfollowSoneAjaxPage.java @@ -38,9 +38,6 @@ public class UnfollowSoneAjaxPage extends JsonPage { super("unfollowSone.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.java index 17be966..bd3c387 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/UnlikeAjaxPage.java @@ -39,9 +39,6 @@ public class UnlikeAjaxPage extends JsonPage { super("unlike.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String type = request.getHttpRequest().getParam("type", null); diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java index 38f8dde..3756ebb 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/UnlockSoneAjaxPage.java @@ -41,9 +41,6 @@ public class UnlockSoneAjaxPage extends JsonPage { super("unlockSone.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { String soneId = request.getHttpRequest().getParam("sone"); @@ -55,9 +52,6 @@ public class UnlockSoneAjaxPage extends JsonPage { return createSuccessJsonObject(); } - /** - * {@inheritDoc} - */ @Override protected boolean requiresLogin() { return false; diff --git a/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java b/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java index 229f219..6d05508 100644 --- a/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java +++ b/src/main/java/net/pterodactylus/sone/web/ajax/UntrustAjaxPage.java @@ -17,13 +17,13 @@ package net.pterodactylus.sone.web.ajax; -import com.google.common.base.Optional; - import net.pterodactylus.sone.core.Core; import net.pterodactylus.sone.data.Sone; import net.pterodactylus.sone.web.WebInterface; import net.pterodactylus.sone.web.page.FreenetRequest; +import com.google.common.base.Optional; + /** * AJAX page that lets the user untrust a Sone. * @@ -42,9 +42,6 @@ public class UntrustAjaxPage extends JsonPage { super("untrustSone.ajax", webInterface); } - /** - * {@inheritDoc} - */ @Override protected JsonReturnObject createJsonObject(FreenetRequest request) { Sone currentSone = getCurrentSone(request.getToadletContext(), false); diff --git a/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java b/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java index 625978b..1a5b950 100644 --- a/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java +++ b/src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java @@ -85,9 +85,6 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback { this.invalidFormPasswordRedirectTarget = invalidFormPasswordRedirectTarget; } - /** - * {@inheritDoc} - */ @Override public String getPath() { return path; @@ -105,17 +102,11 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback { return null; } - /** - * {@inheritDoc} - */ @Override public boolean isPrefixPage() { return false; } - /** - * {@inheritDoc} - */ @Override public Response handleRequest(FreenetRequest request, Response response) throws IOException { String redirectTarget = getRedirectTarget(request); @@ -259,9 +250,6 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback { return false; } - /** - * {@inheritDoc} - */ @Override public boolean isLinkExcepted(URI link) { return false; @@ -271,9 +259,6 @@ public class FreenetTemplatePage implements FreenetPage, LinkEnabledCallback { // INTERFACE LinkEnabledCallback // - /** - * {@inheritDoc} - */ @Override public boolean isEnabled(ToadletContext toadletContext) { return !isFullAccessOnly(); diff --git a/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java b/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java index a40a543..d919bd7 100644 --- a/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java +++ b/src/main/java/net/pterodactylus/sone/web/page/PageToadlet.java @@ -82,9 +82,6 @@ public class PageToadlet extends Toadlet implements LinkEnabledCallback, LinkFil return menuName; } - /** - * {@inheritDoc} - */ @Override public String path() { return pathPrefix + page.getPath(); @@ -126,9 +123,6 @@ public class PageToadlet extends Toadlet implements LinkEnabledCallback, LinkFil handleRequest(new FreenetRequest(uri, Method.POST, httpRequest, toadletContext)); } - /** - * {@inheritDoc} - */ @Override public String toString() { return getClass().getName() + "[path=" + path() + ",page=" + page + "]"; @@ -173,9 +167,6 @@ public class PageToadlet extends Toadlet implements LinkEnabledCallback, LinkFil } } - /** - * {@inheritDoc} - */ @Override public boolean isEnabled(ToadletContext toadletContext) { if (page instanceof LinkEnabledCallback) { @@ -188,9 +179,6 @@ public class PageToadlet extends Toadlet implements LinkEnabledCallback, LinkFil // LINKFILTEREXCEPTEDTOADLET METHODS // - /** - * {@inheritDoc} - */ @Override public boolean isLinkExcepted(URI link) { return (page instanceof FreenetPage) ? ((FreenetPage) page).isLinkExcepted(link) : false; -- 2.7.4