From d53dacfc32b692fce800220dfc74df0d7ae070b7 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Tue, 6 Apr 2010 20:53:17 +0200 Subject: [PATCH] Removed private description and moved to getDescription() --- src/org/yaaic/command/handler/CloseHandler.java | 7 +++---- src/org/yaaic/command/handler/DCCHandler.java | 7 +++---- src/org/yaaic/command/handler/DeopHandler.java | 3 +-- src/org/yaaic/command/handler/DevoiceHandler.java | 3 +-- src/org/yaaic/command/handler/EchoHandler.java | 3 +-- src/org/yaaic/command/handler/JoinHandler.java | 6 +++--- src/org/yaaic/command/handler/KickHandler.java | 4 +--- src/org/yaaic/command/handler/MeHandler.java | 7 +++---- src/org/yaaic/command/handler/ModeHandler.java | 7 +++---- src/org/yaaic/command/handler/NamesHandler.java | 7 +++---- src/org/yaaic/command/handler/NickHandler.java | 7 +++---- src/org/yaaic/command/handler/NoticeHandler.java | 7 +++---- src/org/yaaic/command/handler/OpHandler.java | 4 +--- src/org/yaaic/command/handler/PartHandler.java | 4 +--- src/org/yaaic/command/handler/QueryHandler.java | 7 +++---- src/org/yaaic/command/handler/QuitHandler.java | 7 +++---- src/org/yaaic/command/handler/TopicHandler.java | 7 +++---- src/org/yaaic/command/handler/VoiceHandler.java | 7 +++---- 18 files changed, 42 insertions(+), 62 deletions(-) diff --git a/src/org/yaaic/command/handler/CloseHandler.java b/src/org/yaaic/command/handler/CloseHandler.java index fabaafd..05b42f1 100644 --- a/src/org/yaaic/command/handler/CloseHandler.java +++ b/src/org/yaaic/command/handler/CloseHandler.java @@ -38,8 +38,6 @@ import android.content.Intent; */ public class CloseHandler extends BaseHandler { - private String desc ="Closes the current window"; - /** * Execute /close */ @@ -80,7 +78,8 @@ public class CloseHandler extends BaseHandler * Description of /close */ @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "Closes the current window"; } } diff --git a/src/org/yaaic/command/handler/DCCHandler.java b/src/org/yaaic/command/handler/DCCHandler.java index a96c1cf..af0f426 100644 --- a/src/org/yaaic/command/handler/DCCHandler.java +++ b/src/org/yaaic/command/handler/DCCHandler.java @@ -39,8 +39,6 @@ import org.yaaic.model.Server; */ public class DCCHandler extends BaseHandler { - private String desc = "Send a file to a user"; - /** * Execute /dcc */ @@ -84,7 +82,8 @@ public class DCCHandler extends BaseHandler * Description of /dcc */ @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "Send a file to a user"; } } diff --git a/src/org/yaaic/command/handler/DeopHandler.java b/src/org/yaaic/command/handler/DeopHandler.java index fa9124c..7988e99 100644 --- a/src/org/yaaic/command/handler/DeopHandler.java +++ b/src/org/yaaic/command/handler/DeopHandler.java @@ -33,7 +33,6 @@ import org.yaaic.model.Server; */ public class DeopHandler extends BaseHandler { - private String desc = ""; /** * Execute /voice */ @@ -66,6 +65,6 @@ public class DeopHandler extends BaseHandler */ @Override public String getDescription() { - return desc; + return "Give a user voice status"; } } diff --git a/src/org/yaaic/command/handler/DevoiceHandler.java b/src/org/yaaic/command/handler/DevoiceHandler.java index 9d07e87..c42b7a7 100644 --- a/src/org/yaaic/command/handler/DevoiceHandler.java +++ b/src/org/yaaic/command/handler/DevoiceHandler.java @@ -33,7 +33,6 @@ import org.yaaic.model.Server; */ public class DevoiceHandler extends BaseHandler { - private String desc = ""; /** * Execute /devoice */ @@ -66,6 +65,6 @@ public class DevoiceHandler extends BaseHandler */ @Override public String getDescription() { - return desc; + return "Remove voice status from a user"; } } diff --git a/src/org/yaaic/command/handler/EchoHandler.java b/src/org/yaaic/command/handler/EchoHandler.java index 6348050..02f7ff1 100644 --- a/src/org/yaaic/command/handler/EchoHandler.java +++ b/src/org/yaaic/command/handler/EchoHandler.java @@ -37,7 +37,6 @@ import android.content.Intent; */ public class EchoHandler extends BaseHandler { - private String desc = ""; /** * Execute /echo */ @@ -74,6 +73,6 @@ public class EchoHandler extends BaseHandler */ @Override public String getDescription() { - return desc; + return "Print text to window"; } } diff --git a/src/org/yaaic/command/handler/JoinHandler.java b/src/org/yaaic/command/handler/JoinHandler.java index d24590c..5e4aa23 100644 --- a/src/org/yaaic/command/handler/JoinHandler.java +++ b/src/org/yaaic/command/handler/JoinHandler.java @@ -33,7 +33,6 @@ import org.yaaic.model.Server; */ public class JoinHandler extends BaseHandler { - private String desc = "join a channel"; /** * Execute /join */ @@ -62,7 +61,8 @@ public class JoinHandler extends BaseHandler * Description of /join */ @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "join a channel"; } } diff --git a/src/org/yaaic/command/handler/KickHandler.java b/src/org/yaaic/command/handler/KickHandler.java index 3ce9749..7c895cf 100644 --- a/src/org/yaaic/command/handler/KickHandler.java +++ b/src/org/yaaic/command/handler/KickHandler.java @@ -35,8 +35,6 @@ import org.yaaic.model.Server; */ public class KickHandler extends BaseHandler { - private String desc = "kicks a user"; - /** * Execute /kick */ @@ -68,6 +66,6 @@ public class KickHandler extends BaseHandler */ @Override public String getDescription() { - return desc; + return "kicks a user"; } } diff --git a/src/org/yaaic/command/handler/MeHandler.java b/src/org/yaaic/command/handler/MeHandler.java index 1ff5502..a300746 100644 --- a/src/org/yaaic/command/handler/MeHandler.java +++ b/src/org/yaaic/command/handler/MeHandler.java @@ -38,8 +38,6 @@ import android.content.Intent; */ public class MeHandler extends BaseHandler { - private String desc = ""; - /** * Execute /me */ @@ -81,7 +79,8 @@ public class MeHandler extends BaseHandler } @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "Perform an action"; } } diff --git a/src/org/yaaic/command/handler/ModeHandler.java b/src/org/yaaic/command/handler/ModeHandler.java index d3c51ee..0a2e659 100644 --- a/src/org/yaaic/command/handler/ModeHandler.java +++ b/src/org/yaaic/command/handler/ModeHandler.java @@ -35,8 +35,6 @@ import org.yaaic.model.Server; */ public class ModeHandler extends BaseHandler { - private String desc = ""; - /** * Execute /mode */ @@ -62,7 +60,8 @@ public class ModeHandler extends BaseHandler } @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "Change channel modes"; } } diff --git a/src/org/yaaic/command/handler/NamesHandler.java b/src/org/yaaic/command/handler/NamesHandler.java index e35442f..ca152e0 100644 --- a/src/org/yaaic/command/handler/NamesHandler.java +++ b/src/org/yaaic/command/handler/NamesHandler.java @@ -39,8 +39,6 @@ import android.content.Intent; */ public class NamesHandler extends BaseHandler { - private String desc = "lists all users in channel"; - /** * Execute /names */ @@ -87,7 +85,8 @@ public class NamesHandler extends BaseHandler * Description of /names */ @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "lists all users in channel"; } } diff --git a/src/org/yaaic/command/handler/NickHandler.java b/src/org/yaaic/command/handler/NickHandler.java index 408f570..49e94aa 100644 --- a/src/org/yaaic/command/handler/NickHandler.java +++ b/src/org/yaaic/command/handler/NickHandler.java @@ -33,8 +33,6 @@ import org.yaaic.model.Server; */ public class NickHandler extends BaseHandler { - private String desc = "change own nickname"; - /** * Execute /nick */ @@ -62,7 +60,8 @@ public class NickHandler extends BaseHandler * Description of /nick */ @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "change own nickname"; } } diff --git a/src/org/yaaic/command/handler/NoticeHandler.java b/src/org/yaaic/command/handler/NoticeHandler.java index cc88c14..0ad3124 100644 --- a/src/org/yaaic/command/handler/NoticeHandler.java +++ b/src/org/yaaic/command/handler/NoticeHandler.java @@ -40,8 +40,6 @@ import android.content.Intent; */ public class NoticeHandler extends BaseHandler { - private String desc = "Send a notice to an other user"; - /** * Execute /notice */ @@ -82,7 +80,8 @@ public class NoticeHandler extends BaseHandler * Description of /notice */ @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "Send a notice to an other user"; } } diff --git a/src/org/yaaic/command/handler/OpHandler.java b/src/org/yaaic/command/handler/OpHandler.java index b6984ec..8a3a7df 100644 --- a/src/org/yaaic/command/handler/OpHandler.java +++ b/src/org/yaaic/command/handler/OpHandler.java @@ -33,8 +33,6 @@ import org.yaaic.model.Server; */ public class OpHandler extends BaseHandler { - private String desc = ""; - /** * Execute /deop */ @@ -67,6 +65,6 @@ public class OpHandler extends BaseHandler */ @Override public String getDescription() { - return desc; + return "Give a user operator status"; } } diff --git a/src/org/yaaic/command/handler/PartHandler.java b/src/org/yaaic/command/handler/PartHandler.java index 72e3b62..57ba100 100644 --- a/src/org/yaaic/command/handler/PartHandler.java +++ b/src/org/yaaic/command/handler/PartHandler.java @@ -35,8 +35,6 @@ import org.yaaic.model.Server; */ public class PartHandler extends BaseHandler { - private String desc = "leave the current channel"; - /** * Execute /part */ @@ -67,6 +65,6 @@ public class PartHandler extends BaseHandler @Override public String getDescription() { - return desc; + return "leave the current channel"; } } diff --git a/src/org/yaaic/command/handler/QueryHandler.java b/src/org/yaaic/command/handler/QueryHandler.java index 787f5eb..36a96e7 100644 --- a/src/org/yaaic/command/handler/QueryHandler.java +++ b/src/org/yaaic/command/handler/QueryHandler.java @@ -39,8 +39,6 @@ import android.content.Intent; */ public class QueryHandler extends BaseHandler { - private String desc = "opens a private chat with a user"; - /** * Execute /query */ @@ -82,7 +80,8 @@ public class QueryHandler extends BaseHandler } @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "opens a private chat with a user"; } } diff --git a/src/org/yaaic/command/handler/QuitHandler.java b/src/org/yaaic/command/handler/QuitHandler.java index 3a1477c..e52657a 100644 --- a/src/org/yaaic/command/handler/QuitHandler.java +++ b/src/org/yaaic/command/handler/QuitHandler.java @@ -33,8 +33,6 @@ import org.yaaic.model.Server; */ public class QuitHandler extends BaseHandler { - private String desc = "leave current channel"; - /** * Execute /quit */ @@ -62,7 +60,8 @@ public class QuitHandler extends BaseHandler * Description of /quit */ @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "disconnect from server"; } } diff --git a/src/org/yaaic/command/handler/TopicHandler.java b/src/org/yaaic/command/handler/TopicHandler.java index 6ec677d..dd367c1 100644 --- a/src/org/yaaic/command/handler/TopicHandler.java +++ b/src/org/yaaic/command/handler/TopicHandler.java @@ -36,8 +36,6 @@ import org.yaaic.model.Server; */ public class TopicHandler extends BaseHandler { - private String desc = "show or change the current topic"; - /** * Execute /topic */ @@ -73,7 +71,8 @@ public class TopicHandler extends BaseHandler * Description of /topic */ @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "show or change the current topic"; } } diff --git a/src/org/yaaic/command/handler/VoiceHandler.java b/src/org/yaaic/command/handler/VoiceHandler.java index 2ab9638..5657cf7 100644 --- a/src/org/yaaic/command/handler/VoiceHandler.java +++ b/src/org/yaaic/command/handler/VoiceHandler.java @@ -33,8 +33,6 @@ import org.yaaic.model.Server; */ public class VoiceHandler extends BaseHandler { - private String desc = ""; - /** * Execute /voice */ @@ -66,7 +64,8 @@ public class VoiceHandler extends BaseHandler * Description of /voice */ @Override - public String getDescription() { - return desc; + public String getDescription() + { + return "Give a user voice status"; } }