Deprecation/mass deletion

Depends-On: I65a4cbe48f772dc7e400d585b1bfab15521fdd12
Change-Id: Ib499b44b594fa6dd85ac65fba5b95f16beb23c48
Reviewed-on: http://gerrit.dmdirc.com/1872
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/FrameContainer.java

@@ -120,17 +120,6 @@ public abstract class FrameContainer<T extends Window> {
         setIcon(icon);
     }
 
-    /**
-     * Returns the internal frame associated with this object.
-     *
-     * @return The internal frame associated with this object
-     * @deprecated Use {@link #getWindows()} instead
-     */
-    @Deprecated
-    public final T getFrame() {
-        return getWindows().isEmpty() ? null : getWindows().iterator().next();
-    }
-
     /**
      * Returns a collection of direct children of this frame.
      *

src/com/dmdirc/Main.java

@@ -299,17 +299,7 @@ public final class Main {
 
                 final Object export = provider.getExportedService("getController").execute();
 
-                if (export == null) {
-                    if (provider instanceof PluginInfo
-                            && ((PluginInfo) provider).getPlugin() instanceof UIController) {
-                        // @Deprecated - remove post 0.6.4
-                        // Hack for compatibility with older plugins
-                        CONTROLLERS.add((UIController) ((PluginInfo) provider).getPlugin());
-                        Logger.appError(ErrorLevel.LOW,
-                                "UI plugin doesn't export getController: "
-                                + provider.getProviderName(), new UnsupportedOperationException());
-                    }
-                } else {
+                if (export != null) {
                     CONTROLLERS.add((UIController) export);
                 }
             }

src/com/dmdirc/actions/ActionModel.java

@@ -34,6 +34,7 @@ import com.dmdirc.ui.interfaces.Window;
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collection;
 import java.util.List;
 
 /**
@@ -133,32 +134,33 @@ public class ActionModel {
 
         final FrameContainer<?> active = WindowManager.getActiveWindow();
         Window window = null;
-        WritableFrameContainer<?> cw = null;
+        WritableFrameContainer<? extends Window> container = null;
         CommandParser cp = null;
 
         if (arguments.length > 0
                 && arguments[0] instanceof WritableFrameContainer<?>) {
-            cw = (WritableFrameContainer<?>) arguments[0];
+            container = (WritableFrameContainer<?>) arguments[0];
         } else if (active instanceof WritableFrameContainer<?>) {
-            cw = (WritableFrameContainer<?>) active;
+            container = (WritableFrameContainer<?>) active;
         } else if (ServerManager.getServerManager().numServers() > 0) {
-            cw = ServerManager.getServerManager().getServers().get(0);
+            container = ServerManager.getServerManager().getServers().get(0);
         }
 
         if (arguments.length > 0 && arguments[0] instanceof Window) {
             window = (Window) arguments[0];
-        } else if (cw != null) {
-            window = cw.getFrame();
+        } else if (container != null) {
+            final Collection<? extends Window> windows = container.getWindows();
+            window = windows.isEmpty() ? null : windows.iterator().next();
         }
 
-        if (cw == null) {
+        if (container == null) {
             cp = GlobalCommandParser.getGlobalCommandParser();
         } else {
-            cp = cw.getCommandParser();
+            cp = container.getCommandParser();
         }
 
         for (String command : response) {
-            cp.parseCommand(cw, window, sub.doSubstitution(command, arguments));
+            cp.parseCommand(container, window, sub.doSubstitution(command, arguments));
         }
 
         if (newFormat != null && format != null) {

src/com/dmdirc/actions/wrappers/PerformWrapper.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.actions.wrappers;
 
-import com.dmdirc.Precondition;
 import com.dmdirc.Server;
 import com.dmdirc.actions.Action;
 import com.dmdirc.actions.ActionComponentChain;
@@ -41,8 +40,6 @@ import java.util.List;
 
 /**
  * An action wrapper for performs.
- *
- * @author Chris
  */
 public class PerformWrapper extends ActionGroup {
 
@@ -315,155 +312,6 @@ public class PerformWrapper extends ActionGroup {
         return target || profile;
     }
 
-    /**
-     * Determines if the specified action is a per-profile perform, as opposed
-     * to a generic perform.
-     *
-     * @param action The action to be tested
-     * @return True if the action is per-profile, false otherwise
-     * @since 0.6.3
-     * @deprecated Actions shouldn't be used directly
-     */
-    @Deprecated
-    public boolean isPerProfilePerform(final Action action) {
-        return contains(action) && action.getConditions().size() == 2;
-    }
-
-    /**
-     * Retrieves the name of the profile that is targetted by the specified
-     * per-profile perform action.
-     *
-     * @param action The action whose perform should be retrieved
-     * @return The action's targetted profile name
-     * @since 0.6.3
-     * @deprecated Actions shouldn't be used directly
-     */
-    @Deprecated
-    @Precondition("The action is a per-profile perform")
-    public String getProfileName(final Action action) {
-        Logger.assertTrue(isPerProfilePerform(action));
-
-        for (ActionCondition condition : action.getConditions()) {
-            if (PP_COMP_NAME.equals(condition.getComponent().toString())) {
-                return condition.getTarget();
-            }
-        }
-
-        throw new IllegalStateException("Profile component not found in action");
-    }
-
-    /**
-     * Retrieve the action that handles the perform for the specified server,
-     * or null if no such action exists.
-     *
-     * @param server The server to look for
-     * @return The action that handles the server's perform, or null
-     * @deprecated Actions shouldn't be used directly, use get/setPerform instead
-     */
-    @Deprecated
-    public Action getActionForServer(final String server) {
-        return getActionForServer(server, null);
-    }
-
-    /**
-     * Retrieve the action that handles the perform for the specified server,
-     * or null if no such action exists.
-     *
-     * @param server The server to look for
-     * @param profile The name of the profile the perform works for
-     * @return The action that handles the servers's perform for the specified
-     * profile, or null
-     * @since 0.6.3
-     * @deprecated Actions shouldn't be used directly, use get/setPerform instead
-     */
-    @Deprecated
-    public Action getActionForServer(final String server, final String profile) {
-        return getAction(CoreActionComponent.SERVER_NAME, server, profile);
-    }
-
-    /**
-     * Retrieve the action that handles the perform for the specified network,
-     * or null if no such action exists.
-     *
-     * @param network The network to look for
-     * @return The action that handles the network's perform, or null
-     * @deprecated Actions shouldn't be used directly, use get/setPerform instead
-     */
-    @Deprecated
-    public Action getActionForNetwork(final String network) {
-        return getActionForNetwork(network, null);
-    }
-
-    /**
-     * Retrieve the action that handles the perform for the specified network,
-     * or null if no such action exists.
-     *
-     * @param network The network to look for
-     * @param profile The name of the profile the perform works for
-     * @return The action that handles the network's perform for the specified
-     * profile, or null
-     * @since 0.6.3
-     * @deprecated Actions shouldn't be used directly, use get/setPerform instead
-     */
-    @Deprecated
-    public Action getActionForNetwork(final String network, final String profile) {
-        return getAction(CoreActionComponent.SERVER_NETWORK, network, profile);
-    }
-
-    /**
-     * Creates a new, empty, perform wrapper for the specified server.
-     *
-     * @param server The server to create the action for
-     * @return The new perform wrapper action
-     * @deprecated Actions shouldn't be used directly, use get/setPerform instead
-     */
-    @Deprecated
-    public Action createActionForServer(final String server) {
-        return createActionForServer(server, null);
-    }
-
-    /**
-     * Creates a new, empty, perform wrapper for the specified server, which
-     * is only applicable when the specified profile is in use.
-     *
-     * @param server The server to create the action for
-     * @param profile The name of the profile which must be in use
-     * @return The new perform wrapper action
-     * @since 0.6.3
-     * @deprecated Actions shouldn't be used directly, use get/setPerform instead
-     */
-    @Deprecated
-    public Action createActionForServer(final String server, final String profile) {
-        return createAction(server, "", profile);
-    }
-
-    /**
-     * Creates a new, empty, perform wrapper for the specified network.
-     *
-     * @param network The network to create the action for
-     * @return The new perform wrapper action
-     * @deprecated Actions shouldn't be used directly, use get/setPerform instead
-     */
-    @Deprecated
-    public Action createActionForNetwork(final String network) {
-        return createActionForNetwork(network, null);
-    }
-
-    /**
-     * Creates a new, empty, perform wrapper for the specified network, which
-     * is only applicable when the specified profile is in use.
-     *
-     * @param network The network to create the action for
-     * @param profile The name of the profile which must be in use
-     * @return The new perform wrapper action
-     * @since 0.6.3
-     * @deprecated Actions shouldn't be used directly, use get/setPerform instead
-     */
-    @Deprecated
-    public Action createActionForNetwork(final String network, final String profile) {
-        return createAction("", network, profile);
-    }
-
     /**
      * Creates a new, empty, perform wrapper for the specified server or
      * network. Note that both server and network must be specified, and

src/com/dmdirc/config/CipherUtils.java

@@ -22,7 +22,6 @@
 
 package com.dmdirc.config;
 
-import com.dmdirc.Main;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 
@@ -51,7 +50,7 @@ import net.miginfocom.Base64;
 /**
  * Helper class to encrypt and decrypt strings, requests passwords if needed.
  */
-public class CipherUtils {
+public abstract class CipherUtils {
 
     /** Singleton instance. */
     private static CipherUtils me;
@@ -77,28 +76,6 @@ public class CipherUtils {
     /** User password. */
     private String password;
 
-    /**
-     * Prevents creation of a new instance of Encipher.
-     */
-    protected CipherUtils() {
-        // Do nothing
-    }
-
-    /**
-     * Retrieves a singleton instance of CipherUtils.
-     *
-     * @return A singleton cipher utils instance.
-     */
-    public static CipherUtils getCipherUtils() {
-        synchronized(CipherUtils.class) {
-            if (me == null) {
-                me = new CipherUtils();
-            }
-
-            return me;
-        }
-    }
-
     /**
      * Encrypts a string using the stored settings. Will return null if the
      * automatic user authentication fails - use checkauth and auth.
@@ -259,7 +236,5 @@ public class CipherUtils {
      * @param prompt The prompt to show
      * @return The user-specified password
      */
-    protected String getPassword(final String prompt) {
-        return Main.getUI().getUserInput(prompt);
-    }
+    protected abstract String getPassword(final String prompt);
 }

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

@@ -22,69 +22,9 @@
 
 package com.dmdirc.ui.interfaces;
 
-import com.dmdirc.Channel;
-import com.dmdirc.interfaces.NicklistListener;
-import com.dmdirc.parser.interfaces.ChannelClientInfo;
-
-import java.util.Collection;
-
 /**
  * Specifies the standard interface for a channel window.
- * 
- * @author Chris
  */
 public interface ChannelWindow extends InputWindow {
-    
-    /**
-     * Updates the channel's name list to the specified list of clients.
-     * 
-     * @param clients The new list of clients for this channel
-     * @deprecated Use a {@link NicklistListener}
-     */
-    @Deprecated
-    void updateNames(Collection<ChannelClientInfo> clients);
-    
-    /**
-     * Adds the specified client to this channel's name list.
-     * 
-     * @param client The new client to be added
-     * @deprecated Use a {@link NicklistListener}
-     */
-    @Deprecated
-    void addName(ChannelClientInfo client);
-    
-    /**
-     * Removes the specified client from this channel's name list.
-     * 
-     * @param client The client to be removed
-     * @deprecated Use a {@link NicklistListener}
-     */
-    @Deprecated
-    void removeName(ChannelClientInfo client);
-    
-    /**
-     * Requests that the channel window updates the displayed list of channel
-     * clients, to take into account mode or nickname changes.
-     * @deprecated Use a {@link NicklistListener}
-     */
-    @Deprecated
-    void updateNames();
-    
-    /**
-     * Returns the channel associated with this window.
-     * 
-     * @return Associated Channel
-     * @deprecated Use {@link #getContainer()}
-     */
-    @Deprecated
-    Channel getChannel();
-    
-    /**
-     * Redraws the nicklist belonging to this channel.
-     *
-     * @deprecated Use a {@link NicklistListener}
-     */
-    @Deprecated
-    void redrawNicklist();
 
 }

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

@@ -27,8 +27,6 @@ import com.dmdirc.FrameContainer;
 /**
  * FrameListeners are registered with the {@link com.dmdirc.ui.WindowManager}
  * to receive events pertaining to frames.
- *
- * @author chris
  */
 public interface FrameListener {
 

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

@@ -24,8 +24,6 @@ package com.dmdirc.ui.interfaces;
 
 /**
  * Defines methods that need to be implemented by validation listeners.
- * 
- * @author chris
  */
 public interface InputValidationListener {
     

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

@@ -28,8 +28,6 @@ import com.dmdirc.ui.input.InputHandler;
 /**
  * The Input Window interface specifies additional methods that windows should
  * implement if they have an input field.
- *
- * @author chris
  */
 public interface InputWindow extends Window {
 

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

@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.interfaces;
-
-import javax.swing.ImageIcon;
-
-/**
- * Main window interface.
- */
-public interface MainWindow {
-
-    /**
-     * Retrieves the application icon.
-     *
-     * @return The application icon
-     */
-    ImageIcon getIcon();
-
-    /**
-     * Quits the client.
-     */
-    void quit();
-
-    /**
-     * Returns a prefix for use in the titlebar. Includes the version number
-     * if the config option is set.
-     *
-     * @return Titlebar prefix
-     */
-    String getTitlePrefix();
-
-    /**
-     * Shows or hides the main window.
-     *
-     * @param visible The new visibility of the main window
-     */
-    void setVisible(final boolean visible);
-
-    /**
-     * Returns whether the window is visible.
-     *
-     * @return Whether the main window is visible
-     */
-    boolean isVisible();
-
-}

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

@@ -24,8 +24,6 @@ package com.dmdirc.ui.interfaces;
 
 /**
  * Defines the standard interface for a query window.
- *
- * @author Chris
  */
 public interface QueryWindow extends InputWindow {
 

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

@@ -24,8 +24,6 @@ package com.dmdirc.ui.interfaces;
 
 /**
  * Lists the standard methods that should be implemented by any server window.
- * 
- * @author chris
  */
 public interface ServerWindow extends InputWindow {
     

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

@@ -1,33 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.interfaces;
-
-/**
- * Methods required to be implemented by classes wanting to respond to statusbar
- * error events.
- */
-public interface StatusErrorNotifier {
-    
-    /** Called when a click event is received on the error component. */
-    void clickReceived();
-}

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

@@ -26,35 +26,15 @@ import com.dmdirc.Channel;
 import com.dmdirc.Server;
 import com.dmdirc.config.prefs.PreferencesInterface;
 import com.dmdirc.ui.core.dialogs.sslcertificate.SSLCertificateDialogModel;
-import com.dmdirc.updater.Update;
 
 import java.net.URI;
-import java.util.List;
 
 /**
  * Defines the methods that should be implemented by UI controllers. Controllers
  * handle the various aspects of a UI implementation.
- *
- * @author Chris
  */
 public interface UIController {
 
-    /**
-     * Retrieves the main window used by this UI.
-     *
-     * @return This UI's main window
-     */
-    MainWindow getMainWindow();
-
-    /**
-     * Returns an updater dialog for the specified updates.
-     *
-     * @param updates Updates available
-     *
-     * @return UpdaterDialog
-     */
-    UpdaterDialog getUpdaterDialog(List<Update> updates);
-
     /**
      * Shows the first run wizard for the ui.
      */
@@ -81,12 +61,6 @@ public interface UIController {
      */
     void showServerSettingsDialog(Server server);
 
-    /**
-     * Initialises any settings required by this UI (this is always called
-     * before any aspect of the UI is instansiated).
-     */
-    void initUISettings();
-
     /**
      * Shows the unknown URL protocol handling dialog for a URL.
      *
@@ -107,14 +81,6 @@ public interface UIController {
      */
     void showMessageDialog(final String title, final String message);
 
-    /**
-     * Requests user input.
-     *
-     * @param prompt The prompt to display
-     * @return The user-inputted string
-     */
-    String getUserInput(final String prompt);
-
     /**
      * Retrieves the object used to display the plugin preferences panel.
      *

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

@@ -1,32 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.interfaces;
-
-/**
- * Updater dialog.
- */
-public interface UpdaterDialog {
-
-    /** Displays the dialog. */
-    void display();
-}

src/com/dmdirc/util/StringTranscoder.java

@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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.util;
-
-import java.nio.charset.Charset;
-
-/**
- * Facilitates easy transcoding of strings.
- *
- * @deprecated This kind of transcoding is not technically possible. This class
- * should not be used and now makes no attempt to transcode.
- * @author Chris
- */
-@Deprecated
-public class StringTranscoder {
-
-    /** The charset that is used by this transcoder. */
-    private final Charset charset;
-
-    /**
-     * Creates a new StringTranscoder that will transcode strings from the
-     * system's default character set into the specified charset.
-     *
-     * @param charset The target character set
-     */
-    public StringTranscoder(final Charset charset) {
-        this.charset = charset;
-    }
-
-    /**
-     * Transcodes the specified string from the system's default charset to
-     * this transcoder's charset.
-     *
-     * @param string The string to be transcoded
-     * @return A new string of the appropriate charset
-     * @deprecated Does not function. Do not use this class.
-     */
-    @Deprecated
-    public String encode(final String string) {
-        return string;
-    }
-
-    /**
-     * Transcodes the specified string from this transcoder's charset to the
-     * system's default charset
-     *
-     * @param string The string to be transcoded
-     * @return A new string of the appropriate charset
-     * @deprecated Does not function. Do not use this class.
-     */
-    @Deprecated
-    public String decode(final String string) {
-        return string;
-    }
-
-}

test/com/dmdirc/StringTranscoderTest.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (c) 2006-2011 Chris Smith, Shane Mc Cormack, Gregory Holmes
- *
- * 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;
-
-import com.dmdirc.util.StringTranscoder;
-
-import java.nio.charset.Charset;
-
-import org.junit.Test;
-import static org.junit.Assert.*;
-
-public class StringTranscoderTest {
-
-    @Test
-    public void testTranscode() {
-        String string = new String(new byte[]{(byte) 0xCA, (byte) 0xAE});
-        
-        StringTranscoder instance = new StringTranscoder(Charset.forName("UTF-8"));
-        
-        String res = instance.encode(string);
-
-        byte[] result = res.getBytes();
-        
-        assertEquals(string, instance.decode(new String(result)));
-    }
-    
-}