Remove core listener.

diff --git a/src/main/java/net/pterodactylus/sone/core/Core.java b/src/main/java/net/pterodactylus/sone/core/Core.java
index ab27f67..4ce7711 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/core/Core.java
+++ b/src/main/java/net/pterodactylus/sone/core/Core.java
@@ -113,9 +113,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
        /** The preferences. */
        private final Preferences preferences = new Preferences(options);
 
-       /** The core listener manager. */
-       private final CoreListenerManager coreListenerManager = new CoreListenerManager(this);
-
        /** The event bus. */
        private final EventBus eventBus;
 
@@ -233,30 +230,6 @@ public class Core extends AbstractService implements IdentityListener, UpdateLis
        }
 
        //
-       // LISTENER MANAGEMENT
-       //
-
-       /**
-        * Adds a new core listener.
-        *
-        * @param coreListener
-        *            The listener to add
-        */
-       public void addCoreListener(CoreListener coreListener) {
-               coreListenerManager.addListener(coreListener);
-       }
-
-       /**
-        * Removes a core listener.
-        *
-        * @param coreListener
-        *            The listener to remove
-        */
-       public void removeCoreListener(CoreListener coreListener) {
-               coreListenerManager.removeListener(coreListener);
-       }
-
-       //
        // ACCESSORS
        //
 

diff --git a/src/main/java/net/pterodactylus/sone/core/CoreListener.java b/src/main/java/net/pterodactylus/sone/core/CoreListener.java
deleted file mode 100644 (file)
index a449293..0000000
--- a/src/main/java/net/pterodactylus/sone/core/CoreListener.java
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Sone - CoreListener.java - Copyright © 2010–2012 David Roden
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.core;
-
-import java.util.EventListener;
-
-import net.pterodactylus.sone.data.Image;
-
-/**
- * Listener interface for objects that want to be notified on certain
- * {@link Core} events, such es discovery of new data.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public interface CoreListener extends EventListener {
-
-       /**
-        * Notifies a listener that an image failed to be inserted.
-        *
-        * @param image
-        *            The image that could not be inserted
-        * @param cause
-        *            The reason for the failed insert
-        */
-       public void imageInsertFailed(Image image, Throwable cause);
-
-}

diff --git a/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java b/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java
deleted file mode 100644 (file)
index 47738b3..0000000
--- a/src/main/java/net/pterodactylus/sone/core/CoreListenerManager.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Sone - CoreListenerManager.java - Copyright © 2010–2012 David Roden
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package net.pterodactylus.sone.core;
-
-import net.pterodactylus.sone.data.Image;
-import net.pterodactylus.util.event.AbstractListenerManager;
-
-/**
- * Manager for {@link CoreListener}s.
- *
- * @author <a href="mailto:bombe@pterodactylus.net">David ‘Bombe’ Roden</a>
- */
-public class CoreListenerManager extends AbstractListenerManager<Core, CoreListener> {
-
-       /**
-        * Creates a new core listener manager.
-        *
-        * @param source
-        *            The Core
-        */
-       public CoreListenerManager(Core source) {
-               super(source);
-       }
-
-       //
-       // ACTIONS
-       //
-
-       /**
-        * Notifies all listeners that an image failed to be inserted.
-        *
-        * @see CoreListener#imageInsertFailed(Image, Throwable)
-        * @param image
-        *            The image that could not be inserted
-        * @param cause
-        *            The cause of the failure
-        */
-       void fireImageInsertFailed(Image image, Throwable cause) {
-               for (CoreListener coreListener : getListeners()) {
-                       coreListener.imageInsertFailed(image, cause);
-               }
-       }
-
-}

diff --git a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
index bf32eab..32adff9 100644 (file)
--- a/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
+++ b/src/main/java/net/pterodactylus/sone/main/SonePlugin.java
@@ -227,7 +227,6 @@ public class SonePlugin implements FredPlugin, FredPluginFCP, FredPluginL10n, Fr
                /* create the web interface. */
                webInterface = injector.getInstance(WebInterface.class);
                eventBus.register(webInterface);
-               core.addCoreListener(webInterface);
 
                boolean startupFailed = true;
                try {