Merge pull request #98 from greboid/fix-statusbar

Remove Statusbar.

src/com/dmdirc/interfaces/ui/StatusBar.java

-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.interfaces.ui;
-
-import com.dmdirc.ui.StatusMessage;
-
-/**
- * Status bar interface.
- */
-public interface StatusBar {
-
-    /**
-     * Sets the message for this message label.
-     *
-     * @param message Message object to show
-     *
-     * @since 0.6.6
-     */
-    void setMessage(final StatusMessage message);
-
-    /**
-     * Removes the message from the status bar.
-     */
-    void clearMessage();
-
-    /**
-     * Adds a component to the status bar.
-     *
-     * @param component component to add
-     */
-    void addComponent(final StatusBarComponent component);
-
-    /**
-     * Removes a component to the status bar.
-     *
-     * @param component component to add
-     */
-    void removeComponent(final StatusBarComponent component);
-
-}

src/com/dmdirc/plugins/PluginInjectorInitialiser.java

 import com.dmdirc.messages.MessageSinkManager;
 import com.dmdirc.ui.IconManager;
 import com.dmdirc.ui.WindowManager;
-import com.dmdirc.ui.core.components.StatusBarManager;
 import com.dmdirc.ui.messages.ColourManager;
 import com.dmdirc.ui.themes.ThemeManager;
 import com.dmdirc.util.SimpleInjector;
     private final CommandManager commandManager;
     private final MessageSinkManager messageSinkManager;
     private final WindowManager windowManager;
-    private final StatusBarManager statusBarManager;
     private final PreferencesManager preferencesManager;
     private final LifecycleController lifecycleController;
     private final CorePluginExtractor corePluginExtractor;
             final CommandManager commandManager,
             final MessageSinkManager messageSinkManager,
             final WindowManager windowManager,
-            final StatusBarManager statusBarManager,
             final PreferencesManager preferencesManager,
             final LifecycleController lifecycleController,
             final CorePluginExtractor corePluginExtractor,
         this.commandManager = commandManager;
         this.messageSinkManager = messageSinkManager;
         this.windowManager = windowManager;
-        this.statusBarManager = statusBarManager;
         this.preferencesManager = preferencesManager;
         this.lifecycleController = lifecycleController;
         this.corePluginExtractor = corePluginExtractor;
         injector.addParameter(commandManager);
         injector.addParameter(MessageSinkManager.class, messageSinkManager);
         injector.addParameter(WindowManager.class, windowManager);
-        injector.addParameter(statusBarManager);
         injector.addParameter(PreferencesManager.class, preferencesManager);
         injector.addParameter(LifecycleController.class, lifecycleController);
         injector.addParameter(corePluginExtractor);

src/com/dmdirc/ui/core/components/StatusBarManager.java

-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-package com.dmdirc.ui.core.components;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.events.StatusBarComponentAddedEvent;
-import com.dmdirc.events.StatusBarComponentRemovedEvent;
-import com.dmdirc.events.StatusBarMessageClearEvent;
-import com.dmdirc.events.StatusBarMessageEvent;
-import com.dmdirc.interfaces.ui.StatusBar;
-import com.dmdirc.interfaces.ui.StatusBarComponent;
-import com.dmdirc.ui.StatusMessage;
-
-import java.util.Collection;
-import java.util.concurrent.CopyOnWriteArraySet;
-
-import javax.inject.Inject;
-import javax.inject.Singleton;
-
-/**
- * A manager for status bars or status bar like components.
- *
- * @since 0.6.5
- */
-@Singleton
-public class StatusBarManager implements StatusBar {
-
-    /** A collection of known status bars. */
-    private final Collection<StatusBar> statusBars = new CopyOnWriteArraySet<>();
-    /** Event bus to fire status bar events on. */
-    private final DMDircMBassador eventBus;
-
-    @Inject
-    public StatusBarManager(final DMDircMBassador eventBus) {
-        this.eventBus = eventBus;
-    }
-
-    /**
-     * Registers a new status bar with the manager. All requests to interact with status bars will
-     * be passed on to this status bar until it is unregistered.
-     *
-     * @param statusBar The status bar to be added to the manager
-     */
-    public void registerStatusBar(final StatusBar statusBar) {
-        statusBars.add(statusBar);
-    }
-
-    /**
-     * Unregisters the specified status bar with the manager.
-     *
-     * @param statusBar The status bar to be unregistered
-     */
-    public void unregisterStatusBar(final StatusBar statusBar) {
-        statusBars.remove(statusBar);
-    }
-
-    @Override
-    public void setMessage(final StatusMessage message) {
-        eventBus.publishAsync(new StatusBarMessageEvent(message));
-        for (StatusBar statusBar : statusBars) {
-            statusBar.setMessage(message);
-        }
-    }
-
-    @Override
-    public void clearMessage() {
-        eventBus.publishAsync(new StatusBarMessageClearEvent());
-        for (StatusBar statusBar : statusBars) {
-            statusBar.clearMessage();
-        }
-    }
-
-    @Override
-    public void addComponent(final StatusBarComponent component) {
-        eventBus.publishAsync(new StatusBarComponentAddedEvent(component));
-        for (StatusBar statusBar : statusBars) {
-            statusBar.addComponent(component);
-        }
-    }
-
-    @Override
-    public void removeComponent(final StatusBarComponent component) {
-        eventBus.publishAsync(new StatusBarComponentRemovedEvent(component));
-        for (StatusBar statusBar : statusBars) {
-            statusBar.removeComponent(component);
-        }
-    }
-
-}

src/com/dmdirc/ui/core/feedback/FeedbackSender.java

 
 package com.dmdirc.ui.core.feedback;
 
+import com.dmdirc.DMDircMBassador;
+import com.dmdirc.events.StatusBarMessageEvent;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.ui.StatusBar;
 import com.dmdirc.ui.StatusMessage;
 import com.dmdirc.util.io.Downloader;
 
 public class FeedbackSender implements Runnable {
 
     private final Map<String, String> postData;
-    private final StatusBar statusBar;
+    private final DMDircMBassador eventBus;
     private final AggregateConfigProvider config;
     private final Downloader downloader;
 
     public FeedbackSender(
             final AggregateConfigProvider config,
             final Downloader downloader,
-            final StatusBar statusBar,
+            final DMDircMBassador eventBus,
             final String name,
             final String email,
             final String feedback,
             final String dmdircInfo) {
         this.downloader = downloader;
         this.config = config;
-        this.statusBar = statusBar;
+        this.eventBus = eventBus;
         this.postData = new HashMap<>(6);
 
         if (!name.isEmpty()) {
 
     @Override
     public void run() {
-        statusBar.setMessage(new StatusMessage(sendData(postData), config));
+        eventBus.publishAsync(new StatusBarMessageEvent(
+                new StatusMessage(sendData(postData), config)));
     }
 
 }

src/com/dmdirc/ui/core/feedback/FeedbackSenderFactory.java

 
 package com.dmdirc.ui.core.feedback;
 
+import com.dmdirc.DMDircMBassador;
 import com.dmdirc.interfaces.config.AggregateConfigProvider;
-import com.dmdirc.interfaces.ui.StatusBar;
 import com.dmdirc.util.io.Downloader;
 
 import javax.inject.Inject;
 
     private final AggregateConfigProvider config;
     private final Downloader downloader;
-    private final StatusBar statusBar;
+    private final DMDircMBassador eventBus;
 
     @Inject
     public FeedbackSenderFactory(
             @GlobalConfig final AggregateConfigProvider config,
-            final Downloader downloader, final StatusBar statusBar) {
+            final Downloader downloader, final DMDircMBassador eventBus) {
         this.config = config;
         this.downloader = downloader;
-        this.statusBar = statusBar;
+        this.eventBus = eventBus;
     }
 
     public FeedbackSender getFeedbackSender(
             final String version,
             final String serverInfo,
             final String dmdircInfo) {
-        return new FeedbackSender(config, downloader, statusBar, name, email, feedback, version,
+        return new FeedbackSender(config, downloader, eventBus, name, email, feedback, version,
                 serverInfo, dmdircInfo);
     }
 }

test/com/dmdirc/ui/core/components/StatusBarManagerTest.java

-/*
- * Copyright (c) 2006-2014 DMDirc Developers
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- * THE SOFTWARE.
- */
-package com.dmdirc.ui.core.components;
-
-import com.dmdirc.DMDircMBassador;
-import com.dmdirc.interfaces.ui.StatusBar;
-import com.dmdirc.interfaces.ui.StatusBarComponent;
-import com.dmdirc.ui.StatusMessage;
-
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.runners.MockitoJUnitRunner;
-
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.verifyZeroInteractions;
-
-@RunWith(MockitoJUnitRunner.class)
-public class StatusBarManagerTest {
-
-    @Mock
-    private DMDircMBassador eventBus;
-
-    @Test
-    public void testRegisterStatusBar() {
-        final StatusBar sb = mock(StatusBar.class);
-        final StatusBarManager instance = new StatusBarManager(eventBus);
-        instance.registerStatusBar(sb);
-        instance.clearMessage();
-        verify(sb).clearMessage();
-    }
-
-    @Test
-    public void testUnregisterStatusBar() {
-        final StatusBar sb = mock(StatusBar.class);
-        final StatusBarManager instance = new StatusBarManager(eventBus);
-        instance.registerStatusBar(sb);
-        instance.unregisterStatusBar(sb);
-        instance.clearMessage();
-        verifyZeroInteractions(sb);
-    }
-
-    @Test
-    public void testSetMessage() {
-        final StatusMessage message = mock(StatusMessage.class);
-        final StatusBar sb = mock(StatusBar.class);
-        final StatusBarManager instance = new StatusBarManager(eventBus);
-        instance.registerStatusBar(sb);
-        instance.setMessage(message);
-        verify(sb).setMessage(message);
-    }
-
-    @Test
-    public void testClearMessage() {
-        final StatusBar sb = mock(StatusBar.class);
-        final StatusBarManager instance = new StatusBarManager(eventBus);
-        instance.registerStatusBar(sb);
-        instance.clearMessage();
-        verify(sb).clearMessage();
-    }
-
-    @Test
-    public void testAddComponent() {
-        final StatusBarComponent comp = mock(StatusBarComponent.class);
-        final StatusBar sb = mock(StatusBar.class);
-        final StatusBarManager instance = new StatusBarManager(eventBus);
-        instance.registerStatusBar(sb);
-        instance.addComponent(comp);
-        verify(sb).addComponent(comp);
-    }
-
-    @Test
-    public void testRemoveComponent() {
-        final StatusBarComponent comp = mock(StatusBarComponent.class);
-        final StatusBar sb = mock(StatusBar.class);
-        final StatusBarManager instance = new StatusBarManager(eventBus);
-        instance.registerStatusBar(sb);
-        instance.removeComponent(comp);
-        verify(sb).removeComponent(comp);
-    }
-}