me keyword.
- */
- public static final String IGNORE_ME_KEYWORD = "me";
+ public static final String HELP_ARG = "help";
/**
* The help command.
@@ -139,29 +113,19 @@ public class Commands
public static final String HELP_TAGS_KEYWORD = "tags";
/**
- * The Google command.
+ * The ignore command.
*/
- public static final String GOOGLE_CMD = "google";
+ public static final String IGNORE_CMD = "ignore";
/**
- * The Twitter command.
+ * The ignore me keyword.
*/
- public static final String TWITTER_CMD = "twitter";
+ public static final String IGNORE_ME_KEYWORD = "me";
/**
- * The math command.
+ * The info command.
*/
- public static final String CALC_CMD = "calc";
-
- /**
- * The me command.
- */
- public static final String ME_CMD = "me";
-
- /**
- * The nick command.
- */
- public static final String NICK_CMD = "nick";
+ public static final String INFO_CMD = "info";
/**
* The link command.
@@ -173,6 +137,21 @@ public class Commands
*/
public static final String LOOKUP_CMD = "lookup";
+ /**
+ * The me command.
+ */
+ public static final String ME_CMD = "me";
+
+ /**
+ * The msg command.
+ */
+ public static final String MSG_CMD = "msg";
+
+ /**
+ * The nick command.
+ */
+ public static final String NICK_CMD = "nick";
+
/**
* The ping command.
*/
@@ -183,6 +162,11 @@ public class Commands
*/
public static final String PONG_CMD = "pong";
+ /**
+ * Properties command line argument.
+ */
+ public static final String PROPS_ARG = "properties";
+
/**
* The quote command.
*/
@@ -193,15 +177,20 @@ public class Commands
*/
public static final String RECAP_CMD = "recap";
+ /**
+ * The say command.
+ */
+ public static final String SAY_CMD = "say";
+
/**
* The stock command.
*/
public static final String STOCK_CMD = "stock";
/**
- * The time command.
+ * The {@link #TELL_CMD} all command.
*/
- public static final String TIME_CMD = "time";
+ public static final String TELL_ALL_CMD = "all";
/**
* The tell command.
@@ -214,14 +203,14 @@ public class Commands
public static final String TELL_DEL_CMD = "del";
/**
- * The {@link #TELL_CMD} all command.
+ * The time command.
*/
- public static final String TELL_ALL_CMD = "all";
+ public static final String TIME_CMD = "time";
/**
- * The war command.
+ * The Twitter command.
*/
- public static final String WAR_CMD = "war";
+ public static final String TWITTER_CMD = "twitter";
/**
* The users command.
@@ -229,9 +218,9 @@ public class Commands
public static final String USERS_CMD = "users";
/**
- * The info command.
+ * Properties version line argument.
*/
- public static final String INFO_CMD = "info";
+ public static final String VERSION_ARG = "version";
/**
* The version command.
@@ -243,10 +232,20 @@ public class Commands
*/
public static final String VIEW_CMD = "view";
+ /**
+ * The war command.
+ */
+ public static final String WAR_CMD = "war";
+
+ /**
+ * The weather command.
+ */
+ public static final String WEATHER_CMD = "weather";
+
/**
* Disables the default constructor.
*
- * @throws UnsupportedOperationException if an error occurred. if the constructor is called.
+ * @throws UnsupportedOperationException If the constructor is called.
*/
private Commands()
throws UnsupportedOperationException
diff --git a/src/main/java/net/thauvin/erik/mobibot/CurrencyConverter.java b/src/main/java/net/thauvin/erik/mobibot/CurrencyConverter.java
index 4d18356..f5936c9 100644
--- a/src/main/java/net/thauvin/erik/mobibot/CurrencyConverter.java
+++ b/src/main/java/net/thauvin/erik/mobibot/CurrencyConverter.java
@@ -1,7 +1,7 @@
/*
- * @(#)CurrencyConverter.java
+ * CurrencyConverter.java
*
- * Copyright (c) 2004-2014, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2015, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,6 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
package net.thauvin.erik.mobibot;
import org.jdom.Document;
@@ -54,21 +53,26 @@ import java.util.*;
*/
public class CurrencyConverter implements Runnable
{
- /**
- * The exchange rates table URL.
- */
- private static final String EXCHANGE_TABLE_URL = "http://www.ecb.int/stats/eurofxref/eurofxref-daily.xml";
-
/**
* The exchange rates.
*/
private static final Map+ * GUI-related work in a dedicated thread. For instructions on and examples of using this class, see: + *
* http://java.sun.com/docs/books/tutorial/uiswing/misc/threads.html - * - * Note that the API changed slightly in the 3rd version: You must now invoke start() on the SwingWorker after creating - * it. + * + * Note that the API changed slightly in the 3rd version: + * You must now invoke start() on the SwingWorker after creating it. */ @SuppressWarnings("ALL") public abstract class SwingWorker { - private Object value; // see getValue(), setValue() - private ThreadVar threadVar; + private Object value; // see getValue(), setValue() + /** * Start a thread that will call theconstruct method and then exit.
*/
@@ -67,19 +67,6 @@ public abstract class SwingWorker
*/
public abstract Object construct();
- /**
- * A new method that interrupts the worker thread. Call this method to force the worker to stop what it's doing.
- */
- public void interrupt()
- {
- Thread t = threadVar.get();
- if (t != null)
- {
- t.interrupt();
- }
- threadVar.clear();
- }
-
/**
* Return the value created by the construct method. Returns null if either the constructing thread or
* the current thread was interrupted before a value was produced.
@@ -127,6 +114,19 @@ public abstract class SwingWorker
value = x;
}
+ /**
+ * A new method that interrupts the worker thread. Call this method to force the worker to stop what it's doing.
+ */
+ public void interrupt()
+ {
+ Thread t = threadVar.get();
+ if (t != null)
+ {
+ t.interrupt();
+ }
+ threadVar.clear();
+ }
+
/**
* Start the worker thread.
*/
@@ -151,14 +151,14 @@ public abstract class SwingWorker
thread = t;
}
- synchronized Thread get()
- {
- return thread;
- }
-
synchronized void clear()
{
thread = null;
}
+
+ synchronized Thread get()
+ {
+ return thread;
+ }
}
}
diff --git a/src/main/java/net/thauvin/erik/mobibot/TellMessage.java b/src/main/java/net/thauvin/erik/mobibot/TellMessage.java
index 77ebdf9..48b3cbd 100644
--- a/src/main/java/net/thauvin/erik/mobibot/TellMessage.java
+++ b/src/main/java/net/thauvin/erik/mobibot/TellMessage.java
@@ -1,7 +1,7 @@
/*
- * @(#)TellMessage.java
+ * TellMessage.java
*
- * Copyright (c) 2004-2014, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2015, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,6 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
package net.thauvin.erik.mobibot;
import java.io.Serializable;
@@ -47,23 +46,24 @@ import java.util.Date;
*/
public class TellMessage implements Serializable
{
+ @SuppressWarnings({"UnusedDeclaration"})
private static final long serialVersionUID = 1L;
- private final String sender;
-
- private final String recipient;
-
- private final String message;
-
private final String id;
+ private final String message;
+
final private Date queued;
- private Date received;
+ private final String recipient;
+
+ private final String sender;
+
+ private boolean isNotified;
private boolean isReceived;
- private boolean isNotified;
+ private Date received;
/**
* Create a new message.
diff --git a/src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java b/src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java
index 9e9b4aa..d6b9b2b 100644
--- a/src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java
+++ b/src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java
@@ -1,7 +1,7 @@
/*
- * @(#)TellMessagesMgr.java
+ * TellMessagesMgr.java
*
- * Copyright (c) 2004-2014, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2015, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,6 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
package net.thauvin.erik.mobibot;
import org.apache.commons.logging.impl.Log4JLogger;
@@ -54,7 +53,7 @@ public class TellMessagesMgr
/**
* Disables the default constructor.
*
- * @throws UnsupportedOperationException if an error occurred. if the constructor is called.
+ * @throws UnsupportedOperationException If the constructor is called.
*/
private TellMessagesMgr()
throws UnsupportedOperationException
@@ -62,6 +61,35 @@ public class TellMessagesMgr
throw new UnsupportedOperationException("Illegal constructor call.");
}
+ /**
+ * Cleans the messages queue
+ *
+ * @param tellMessages The messages list.
+ * @param tellMaxDays The maximum number of days to keep messages for.
+ *
+ * @return True if the queue was cleaned.
+ */
+ public static boolean cleanTellMessages(ListTwitterOAuth class.
- * - * Go to http://twitter.com/oauth_clients/new to register your bot. - *
- * Then execute: - *
- * java -cp "mobibot.jar:lib/*" net.thauvin.erik.mobibot.TwitterOAuth <consumerKey> <consumerSecret>
- *
TwitterOAuth class. Go to http://twitter.com/oauth_clients/new + * to register your bot.
Then execute: java -cp "mobibot.jar:lib/*" net.thauvin.erik.mobibot.TwitterOAuth
+ * <consumerKey> <consumerSecret>
/) to indicate a directory.
- *
- * @param location The File or URL location.
- * @param isUrl Set to true if the location is a URL
- *
- * @return The location ending with a slash.
- */
- public static String ensureDir(String location, boolean isUrl)
- {
- if (isUrl)
- {
- if (location.charAt(location.length() - 1) == '/')
- {
- return location;
- }
- else
- {
- return location + '/';
- }
- }
- else
- {
- if (location.charAt(location.length() - 1) == File.separatorChar)
- {
- return location;
- }
- else
- {
- return location + File.separatorChar;
- }
- }
- }
-
- /**
- * Returns true if the given string is valid.
- *
- * @param s The string to validate.
- *
- * @return true if the string is non-empty and not null, false otherwise.
- */
- public static boolean isValidString(String s)
- {
- return (s != null) && (s.trim().length() > 0);
- }
-
/**
* Makes the given int bold.
*
@@ -285,16 +90,6 @@ public class Utils
return Colors.BOLD + i + Colors.BOLD;
}
- /**
- * Returns today's date.
- *
- * @return Today's date in {@link #ISO_SDF ISO} format.
- */
- public static String today()
- {
- return ISO_SDF.format(Calendar.getInstance().getTime());
- }
-
/**
* Builds an entry's comment for display on the channel.
*
@@ -385,4 +180,208 @@ public class Utils
{
return (Commands.LINK_CMD + (entryIndex + 1) + "T: " + entry.getDeliciousTags().replaceAll(",", ", "));
}
+
+ /**
+ * Copies a file.
+ *
+ * @param in The source file.
+ * @param out The destination file.
+ *
+ * @throws java.io.IOException If the file could not be copied.
+ */
+ @SuppressWarnings("UnusedDeclaration")
+ public static void copyFile(File in, File out)
+ throws IOException
+ {
+ FileChannel inChannel = null;
+ FileChannel outChannel = null;
+ FileInputStream input = null;
+ FileOutputStream output = null;
+
+ try
+ {
+ input = new FileInputStream(in);
+ output = new FileOutputStream(out);
+
+ inChannel = input.getChannel();
+ outChannel = output.getChannel();
+
+ inChannel.transferTo(0L, inChannel.size(), outChannel);
+ }
+ finally
+ {
+ try
+ {
+ if (inChannel != null)
+ {
+ inChannel.close();
+ }
+
+ if (input != null)
+ {
+ input.close();
+ }
+ }
+ catch (Exception ignore)
+ {
+ ; // Do nothing
+ }
+
+ try
+ {
+ if (outChannel != null)
+ {
+ outChannel.close();
+ }
+
+ if (output != null)
+ {
+ output.close();
+ }
+ }
+ catch (Exception ignore)
+ {
+ ; // Do nothing
+ }
+ }
+ }
+
+ /**
+ * Ensures that the given location (File/URL) has a trailing slash (/) to indicate a directory.
+ *
+ * @param location The File or URL location.
+ * @param isUrl Set to true if the location is a URL
+ *
+ * @return The location ending with a slash.
+ */
+ public static String ensureDir(String location, boolean isUrl)
+ {
+ if (isUrl)
+ {
+ if (location.charAt(location.length() - 1) == '/')
+ {
+ return location;
+ }
+ else
+ {
+ return location + '/';
+ }
+ }
+ else
+ {
+ if (location.charAt(location.length() - 1) == File.separatorChar)
+ {
+ return location;
+ }
+ else
+ {
+ return location + File.separatorChar;
+ }
+ }
+ }
+
+ /**
+ * Returns a property as an int.
+ *
+ * @param property The port property value.
+ * @param def The default property value.
+ *
+ * @return The port or default value if invalid.
+ */
+ public static int getIntProperty(String property, int def)
+ {
+ int prop;
+
+ try
+ {
+ prop = Integer.parseInt(property);
+ }
+ catch (NumberFormatException ignore)
+ {
+ prop = def;
+ }
+
+ return prop;
+ }
+
+ /**
+ * Returns the current Internet (beat) Time.
+ *
+ * @return The Internet Time string.
+ */
+ public static String internetTime()
+ {
+ final Calendar gc = Calendar.getInstance();
+
+ final int offset = (gc.get(Calendar.ZONE_OFFSET) / (60 * 60 * 1000));
+ int hh = gc.get(Calendar.HOUR_OF_DAY);
+ final int mm = gc.get(Calendar.MINUTE);
+ final int ss = gc.get(Calendar.SECOND);
+
+ hh -= offset; // GMT
+ hh += 1; // BMT
+
+ long beats = Math.round(Math.floor((double) ((((hh * 3600) + (mm * 60) + ss) * 1000) / 86400)));
+
+ if (beats >= 1000)
+ {
+ beats -= (long) 1000;
+ }
+ else if (beats < 0)
+ {
+ beats += (long) 1000;
+ }
+
+ if (beats < 10)
+ {
+ return ("@00" + String.valueOf(beats));
+ }
+ else if (beats < 100)
+ {
+ return ("@0" + String.valueOf(beats));
+ }
+
+ return ('@' + String.valueOf(beats));
+ }
+
+ /**
+ * Returns true if the given string is valid.
+ *
+ * @param s The string to validate.
+ *
+ * @return true if the string is non-empty and not null, false otherwise.
+ */
+ public static boolean isValidString(String s)
+ {
+ return (s != null) && (s.trim().length() > 0);
+ }
+
+ /**
+ * Returns today's date.
+ *
+ * @return Today's date in {@link #ISO_SDF ISO} format.
+ */
+ public static String today()
+ {
+ return ISO_SDF.format(Calendar.getInstance().getTime());
+ }
+
+ /**
+ * Converts XML/XHTML entities to plain text.
+ *
+ * @param str The string to unescape.
+ *
+ * @return The unescaped string.
+ */
+ public static String unescapeXml(String str)
+ {
+ String s = str.replaceAll("&", "&");
+ s = s.replaceAll("<", "<");
+ s = s.replaceAll(">", ">");
+ s = s.replaceAll(""", "\"");
+ s = s.replaceAll("'", "'");
+ s = s.replaceAll("'", "'");
+
+ return s;
+ }
}
\ No newline at end of file
diff --git a/src/main/java/net/thauvin/erik/mobibot/War.java b/src/main/java/net/thauvin/erik/mobibot/War.java
index ec2ba9f..7a2d6c4 100644
--- a/src/main/java/net/thauvin/erik/mobibot/War.java
+++ b/src/main/java/net/thauvin/erik/mobibot/War.java
@@ -1,7 +1,7 @@
/*
- * @(#)War.java
+ * War.java
*
- * Copyright (c) 2004-2014, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2015, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -58,7 +58,7 @@ public class War
/**
* Disables the default constructor.
*
- * @throws UnsupportedOperationException if an error occurred. if the constructor is called.
+ * @throws UnsupportedOperationException If the constructor is called.
*/
private War()
throws UnsupportedOperationException
diff --git a/src/main/java/net/thauvin/erik/mobibot/Weather.java b/src/main/java/net/thauvin/erik/mobibot/Weather.java
index 105e770..a232cee 100644
--- a/src/main/java/net/thauvin/erik/mobibot/Weather.java
+++ b/src/main/java/net/thauvin/erik/mobibot/Weather.java
@@ -1,7 +1,7 @@
/*
- * @(#)Weather.java
+ * Weather.java
*
- * Copyright (c) 2004-2014, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2015, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -31,7 +31,6 @@
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-
package net.thauvin.erik.mobibot;
import net.sf.jweather.metar.Metar;
@@ -65,6 +64,11 @@ public class Weather implements Runnable
*/
private final Mobibot bot;
+ /**
+ * The private message flag.
+ */
+ private final boolean isPrivate;
+
/**
* The nick of the person who sent the message.
*/
@@ -75,11 +79,6 @@ public class Weather implements Runnable
*/
private final String station;
- /**
- * The private message flag.
- */
- private final boolean isPrivate;
-
/**
* Creates a new {@link Weather} instance.
*
@@ -114,8 +113,7 @@ public class Weather implements Runnable
bot.send(sender,
"At: " + Utils.UTC_SDF.format(metar.getDate()) + " UTC (" + (
((new Date()).getTime() - metar.getDate().getTime()) / 1000L / 60L) + " minutes ago)",
- isPrivate
- );
+ isPrivate);
result = metar.getWindSpeedInMPH();
@@ -124,8 +122,7 @@ public class Weather implements Runnable
bot.send(sender,
"Wind Speed: " + result + " mph, " + metar.getWindSpeedInKnots() + " knots, " + metar
.getWindSpeedInMPS() + " m/s",
- isPrivate
- );
+ isPrivate);
}
result = metar.getVisibility();
@@ -135,8 +132,7 @@ public class Weather implements Runnable
bot.send(sender,
"Visibility: " + (metar.getVisibilityLessThan() ? "< " : "") + NUMBER_FORMAT.format(result)
+ " mi, " + metar.getVisibilityInKilometers() + " km",
- isPrivate
- );
+ isPrivate);
}
result = metar.getPressure();
diff --git a/src/main/java/net/thauvin/erik/mobibot/WorldTime.java b/src/main/java/net/thauvin/erik/mobibot/WorldTime.java
index 26eccfe..228987c 100644
--- a/src/main/java/net/thauvin/erik/mobibot/WorldTime.java
+++ b/src/main/java/net/thauvin/erik/mobibot/WorldTime.java
@@ -1,7 +1,7 @@
/*
- * @(#)Time.java
+ * WorldTime.java
*
- * Copyright (c) 2004-2014, Erik C. Thauvin (erik@thauvin.net)
+ * Copyright (c) 2004-2015, Erik C. Thauvin (erik@thauvin.net)
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -48,16 +48,16 @@ import java.util.TreeMap;
*/
public class WorldTime
{
- /**
- * The countries supported by the {@link net.thauvin.erik.mobibot.Commands#TIME_CMD time} command.
- */
- private static final Map