From ed23e0e6dc356102ff0633e44ccddf8f16e0a559 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Tue, 9 Mar 2010 23:46:32 +0100 Subject: [PATCH] Implemented command: /quit [] --- src/org/yaaic/command/CommandParser.java | 1 + src/org/yaaic/command/QuitCommand.java | 55 ++++++++++++++++++++++++ src/org/yaaic/view/ServerActivity.java | 2 - 3 files changed, 56 insertions(+), 2 deletions(-) create mode 100644 src/org/yaaic/command/QuitCommand.java diff --git a/src/org/yaaic/command/CommandParser.java b/src/org/yaaic/command/CommandParser.java index 8131eda..28f06e7 100644 --- a/src/org/yaaic/command/CommandParser.java +++ b/src/org/yaaic/command/CommandParser.java @@ -55,6 +55,7 @@ public class CommandParser commands.put("names", new NamesCommand()); commands.put("echo", new EchoCommand()); commands.put("topic", new TopicCommand()); + commands.put("quit", new QuitCommand()); } /** diff --git a/src/org/yaaic/command/QuitCommand.java b/src/org/yaaic/command/QuitCommand.java new file mode 100644 index 0000000..5191925 --- /dev/null +++ b/src/org/yaaic/command/QuitCommand.java @@ -0,0 +1,55 @@ +/* + Yaaic - Yet Another Android IRC Client + +Copyright 2009 Sebastian Kaspari + +This file is part of Yaaic. + +Yaaic 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. + +Yaaic 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 Yaaic. If not, see . +*/ +package org.yaaic.command; + +import org.yaaic.irc.IRCService; +import org.yaaic.model.Channel; +import org.yaaic.model.Server; + +/** + * Command: /quit [] + * + * @author Sebastian Kaspari + */ +public class QuitCommand extends BaseCommand +{ + /** + * Execute /quit + */ + @Override + public void execute(String[] params, Server server, Channel channel, IRCService service) throws CommandException + { + if (params.length == 1) { + service.getConnection(server.getId()).quitServer(); + } else { + service.getConnection(server.getId()).quitServer(BaseCommand.mergeParams(params)); + } + } + + /** + * Usage of /quit + */ + @Override + public String getUsage() + { + return "/quit []"; + } +} diff --git a/src/org/yaaic/view/ServerActivity.java b/src/org/yaaic/view/ServerActivity.java index b69bf98..db06b2d 100644 --- a/src/org/yaaic/view/ServerActivity.java +++ b/src/org/yaaic/view/ServerActivity.java @@ -321,8 +321,6 @@ public class ServerActivity extends Activity implements ServiceConnection, Chann String text = input.getText().toString(); input.setText(""); - Log.d(TAG, "Entered: " + text); - Channel channel = deckAdapter.getItem(deck.getSelectedItemPosition()); if (channel != null) {