Deprecate and stop using StringTranscoder

Fixes CLIENT-68

Change-Id: I3d5b8625f202c7914c76a62100145597ef9fe523
Reviewed-on: http://gerrit.dmdirc.com/1779
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>

src/com/dmdirc/Channel.java

@@ -154,7 +154,7 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
         final ClientInfo me = server.getParser().getLocalClient();
         final String[] details = getDetails(channelInfo.getChannelClient(me));
 
-        for (String part : splitLine(getTranscoder().encode(line))) {
+        for (String part : splitLine(line)) {
             if (!part.isEmpty()) {
                 final StringBuffer buff = new StringBuffer("channelSelfMessage");
 
@@ -199,9 +199,9 @@ public class Channel extends MessageTarget<ChannelWindow> implements ConfigChang
                     this, channelInfo.getChannelClient(me), action);
 
             addLine(buff, details[0], details[1], details[2], details[3],
-                    getTranscoder().encode(action), channelInfo);
+                    action, channelInfo);
 
-            channelInfo.sendAction(getTranscoder().encode(action));
+            channelInfo.sendAction(action);
         }
     }
 

src/com/dmdirc/FrameContainer.java

@@ -39,7 +39,6 @@ import com.dmdirc.util.ListenerList;
 import com.dmdirc.util.StringTranscoder;
 
 import java.awt.Color;
-import java.nio.charset.Charset;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Date;
@@ -122,16 +121,7 @@ public abstract class FrameContainer<T extends Window> {
         this.title = title;
         this.windowClass = windowClass;
 
-        // Can't assign directly to transcoder as it's final, and Java doesn't
-        // like the two paths in the try/catch.
-        StringTranscoder tempTranscoder;
-        try {
-            tempTranscoder = new StringTranscoder(Charset.forName(
-                    config.getOption("channel", "encoding")));
-        } catch (IllegalArgumentException ex) {
-            tempTranscoder = new StringTranscoder(Charset.forName("UTF-8"));
-        }
-        transcoder = tempTranscoder;
+        transcoder = new StringTranscoder(null);
 
         setIcon(icon);
     }
@@ -244,9 +234,11 @@ public abstract class FrameContainer<T extends Window> {
      * Retrieves the {@link StringTranscoder} used to transcode this frame's
      * text.
      *
+     * @deprecated Encoding is now handled by parsers, do not use.
      * @return This frame's transcoder
      * @since 0.6.4
      */
+    @Deprecated
     public StringTranscoder getTranscoder() {
         return transcoder;
     }

src/com/dmdirc/Query.java

@@ -129,7 +129,7 @@ public class Query extends MessageTarget<QueryWindow> implements PrivateActionLi
             return;
         }
 
-        for (String part : splitLine(getTranscoder().encode(line))) {
+        for (String part : splitLine(line)) {
             if (!part.isEmpty()) {
                 server.getParser().sendMessage(target, part);
 
@@ -177,8 +177,7 @@ public class Query extends MessageTarget<QueryWindow> implements PrivateActionLi
         final int maxLineLength = server.getParser().getMaxLength("PRIVMSG", host);
 
         if (maxLineLength >= action.length() + 2) {
-            server.getParser().sendAction(getNickname(),
-                    getTranscoder().encode(action));
+            server.getParser().sendAction(getNickname(), action);
 
             doNotification("querySelfAction", CoreActionType.QUERY_SELF_ACTION,
                     client, action);

src/com/dmdirc/Raw.java

@@ -119,7 +119,7 @@ public final class Raw extends WritableFrameContainer<InputWindow>
     @Override
     public void sendLine(final String line) {
         if (!line.isEmpty()) {
-            sendLine(getTranscoder().encode(line));
+            sendLine(line);
         }
     }
 

src/com/dmdirc/Server.java

@@ -935,7 +935,7 @@ public class Server extends WritableFrameContainer<ServerWindow> implements Conf
                 parserLock.readLock().lock();
                 if (parser != null && !line.isEmpty()
                         && myState.getState() == ServerState.CONNECTED) {
-                    parser.sendRawMessage(getTranscoder().encode(line));
+                    parser.sendRawMessage(line);
                 }
             } finally {
                 parserLock.readLock().unlock();

src/com/dmdirc/config/prefs/PreferencesManager.java

@@ -203,8 +203,6 @@ public final class PreferencesManager {
         category.addSetting(new PreferencesSetting(PreferencesType.INTEGER,
                 "ui", "inputbuffersize", "Input buffer size",
                 "Number of items of input history to keep"));
-        category.addSetting(new PreferencesSetting("channel", "encoding",
-                "Encoding", "Encoding to use", charsetMap));
 
         ActionManager.processEvent(CoreActionType.CLIENT_PREFS_REQUESTED, null,
                 category, Boolean.FALSE);

src/com/dmdirc/util/StringTranscoder.java

@@ -27,8 +27,11 @@ 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. */
@@ -50,9 +53,11 @@ public class StringTranscoder {
      *
      * @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 new String(string.getBytes(charset));
+        return string;
     }
 
     /**
@@ -61,9 +66,11 @@ public class StringTranscoder {
      *
      * @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 new String(string.getBytes(), charset);
+        return string;
     }
 
 }