Raw windows now have proper command parsers

Remove pointless RawCommandParser as it doesn't add any functionality
over the ServerCommandParser.

Fixes issue 4091

Change-Id: I2e76979d0752c591f9643509b025e4d28860a989
Reviewed-on: http://gerrit.dmdirc.com/1202
Automatic-Compile: DMDirc Local Commits <dmdirc@googlemail.com>
Reviewed-by: Gregory Holmes <greg@dmdirc.com>

src/com/dmdirc/Raw.java

@@ -22,7 +22,7 @@
 
 package com.dmdirc;
 
-import com.dmdirc.commandparser.parsers.RawCommandParser;
+import com.dmdirc.commandparser.parsers.ServerCommandParser;
 import com.dmdirc.logger.ErrorLevel;
 import com.dmdirc.logger.Logger;
 import com.dmdirc.parser.interfaces.Parser;
@@ -51,10 +51,12 @@ public final class Raw extends WritableFrameContainer<InputWindow>
      */
     public Raw(final Server newServer) {
         super("raw", "Raw", "(Raw log)", InputWindow.class,
-                newServer.getConfigManager(), new RawCommandParser());
+                newServer.getConfigManager(), new ServerCommandParser());
 
         this.server = newServer;
 
+        getCommandParser().setOwner(server);
+
         WindowManager.addWindow(server, this);
     }
 

src/com/dmdirc/commandparser/parsers/RawCommandParser.java

@@ -1,63 +0,0 @@
-/*
- * 
- * Copyright (c) 2006-2010 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.commandparser.parsers;
-
-import com.dmdirc.FrameContainer;
-import com.dmdirc.Server;
-
-/**
- * Command parser for raw windows, sends lines directly to the parser.
- */
-public class RawCommandParser extends ServerCommandParser {
-
-    /**
-     * A version number for this class. It should be changed whenever the class
-     * structure is changed (or anything else that would prevent serialized
-     * objects being unserialized with the new class).
-     */
-    private static final long serialVersionUID = 1;
-
-    /** The container that owns this parser. */
-    private FrameContainer<?> owner;
-
-    /**
-     * Creates a new raw command parser for the specified server.
-     */
-    public RawCommandParser() {
-        super();
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    public void setOwner(final FrameContainer<?> owner) {
-        this.owner = owner;
-    }
-
-    /** {@inheritDoc} */
-    @Override
-    protected void handleNonCommand(final FrameContainer<?> origin, final String line) {
-        owner.getServer().getParser().sendRawMessage(line);
-    }
-
-}

src/com/dmdirc/commandparser/parsers/ServerCommandParser.java

@@ -60,7 +60,7 @@ public class ServerCommandParser extends CommandParser {
     /** {@inheritDoc} */
     @Override
     public void setOwner(final FrameContainer<?> owner) {
-        if (server == null) {
+        if (server == null && owner instanceof Server) {
             server = (Server) owner;
         }
     }