From d85624b06730f5d4bf7ede576d2694e04e2b2b49 Mon Sep 17 00:00:00 2001 From: "Erik C. Thauvin" Date: Tue, 9 Apr 2019 02:28:09 -0700 Subject: [PATCH] Improved the AbstractMoudule. --- .../erik/mobibot/modules/AbstractModule.java | 6 +++++- .../net/thauvin/erik/mobibot/modules/Dice.java | 14 ++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java index 8abafaf..c58830a 100644 --- a/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java +++ b/src/main/java/net/thauvin/erik/mobibot/modules/AbstractModule.java @@ -106,7 +106,11 @@ public abstract class AbstractModule { * @return true or false */ public boolean isEnabled() { - return true; + if (hasProperties()) { + return isValidProperties(); + } else { + return true; + } } /** diff --git a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java index ec37090..6ad915d 100644 --- a/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java +++ b/src/main/java/net/thauvin/erik/mobibot/modules/Dice.java @@ -44,10 +44,8 @@ import java.security.SecureRandom; * @since 1.0 */ public final class Dice extends AbstractModule { - /** - * The dice command. - */ - public static final String DICE_CMD = "dice"; + // The dice command. + private static final String DICE_CMD = "dice"; /** * The default constructor. @@ -100,12 +98,4 @@ public final class Dice extends AbstractModule { bot.send(sender, "To roll the dice:"); bot.send(sender, bot.helpIndent(bot.getNick() + ": " + DICE_CMD)); } - - /** - * {@inheritDoc} - */ - @Override - public boolean isEnabled() { - return true; - } }