erik/mobibot
erik/mobibot
1
1
Fork 0
Code Issues Releases Activity

Updated libraries dependencies.

Browse source 
More code cleanup.
This commit is contained in:
Erik C. Thauvin 2015-10-23 17:58:36 -07:00
parent 9d67b34354
commit 3e0bef10d7
22 changed files with 71 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

10
build.gradle
View file

@ -22,8 +22,8 @@ dependencies {
compile 'pircbot:pircbot:1.5.0'
compile 'commons-codec:commons-codec:1.9'
compile 'commons-logging:commons-logging:1.1.3'
compile 'commons-codec:commons-codec:1.10'
compile 'commons-logging:commons-logging:1.2'
compile 'commons-net:commons-net:1.4.1'
compile 'commons-cli:commons-cli:1.2'
compile 'commons-httpclient:commons-httpclient:3.1'
@ -31,16 +31,16 @@ dependencies {
compile 'oro:oro:2.0.8'
compile 'org.jdom:jdom:1.1.3'
compile 'org.jsoup:jsoup:1.7.3'
compile 'org.jsoup:jsoup:1.8.3'
compile 'rome:rome:1.0@jar'
compile 'rome:rome-fetcher:1.0@jar'
compile 'org.json:json:20140107'
compile 'org.json:json:20150729'
compile 'org.ostermiller:utils:1.07.00'
compile 'net.sourceforge.jweather:jweather:0.3.0@jar'
compile 'de.congrace:exp4j:0.3.11'
compile 'org.twitter4j:twitter4j-core:4.0.1'
compile 'org.twitter4j:twitter4j-core:4.0.4'
compile 'net.sf.delicious-java:delicious:1.14'
//compile fileTree(dir: 'lib', include: '*.jar')

12
mobibot.iml
View file

@ -16,21 +16,21 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="Gradle: log4j:log4j:1.2.17" level="project" />
<orderEntry type="library" exported="" name="Gradle: pircbot:pircbot:1.5.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-codec:commons-codec:1.9" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-logging:commons-logging:1.1.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-net:commons-net:1.4.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-cli:commons-cli:1.2" level="project" />
<orderEntry type="library" exported="" name="Gradle: commons-httpclient:commons-httpclient:3.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: oro:oro:2.0.8" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.jdom:jdom:1.1.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.jsoup:jsoup:1.7.3" level="project" />
<orderEntry type="library" exported="" name="Gradle: rome:rome:1.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: rome:rome-fetcher:1.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.json:json:20140107" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.ostermiller:utils:1.07.00" level="project" />
<orderEntry type="library" exported="" name="Gradle: net.sourceforge.jweather:jweather:0.3.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: de.congrace:exp4j:0.3.11" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.twitter4j:twitter4j-core:4.0.1" level="project" />
<orderEntry type="library" exported="" name="Gradle: net.sf.delicious-java:delicious:1.14" level="project" />
<orderEntry type="library" name="Gradle: org.twitter4j:twitter4j-core:4.0.4" level="project" />
<orderEntry type="library" name="Gradle: commons-codec:commons-codec:1.10" level="project" />
<orderEntry type="library" name="Gradle: commons-logging:commons-logging:1.2" level="project" />
<orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" level="project" />
<orderEntry type="library" name="Gradle: org.json:json:20150729" level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom:2.0.2" level="project" />
</component>
</module>

41
mobibot.ipr
View file

@ -169,9 +169,10 @@
<option name="loggerClassName" value="org.apache.log4j.Logger,org.slf4j.LoggerFactory,org.apache.commons.logging.LogFactory,java.util.logging.Logger" />
<option name="loggerFactoryMethodName" value="getLogger,getLogger,getLog,getLogger" />
</inspection_tool>
<inspection_tool class="UnnecessarySemicolon" enabled="false" level="WARNING" enabled_by_default="false" />
</profile>
<option name="PROJECT_PROFILE" value="Project Default" />
<option name="USE_PROJECT_PROFILE" value="true" />
<option name="PROJECT_PROFILE" />
<option name="USE_PROJECT_PROFILE" value="false" />
<version value="1.0" />
</component>
<component name="JavadocGenerationManager">
@ -401,13 +402,13 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-cli/commons-cli/1.2/6c5459816530a1962ac18cd315cc775b1b384329/commons-cli-1.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-codec:commons-codec:1.9">
<library name="Gradle: commons-codec:commons-codec:1.10">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.9/9ce04e34240f674bc72680f8b843b1457383161a/commons-codec-1.9.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/4b95f4897fa13f2cd904aee711aeafc0c5295cd8/commons-codec-1.10.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.9/3f15fff45d57656685abfee9e8302bf14580044c/commons-codec-1.9-sources.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-codec/commons-codec/1.10/11fb3d88ae7e3b757d70237064210ceb954a5a04/commons-codec-1.10-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-httpclient:commons-httpclient:3.1">
@ -419,13 +420,13 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-httpclient/commons-httpclient/3.1/c6d6ea83d0cf16d3ed9c1b7e600fa0f60b9d3159/commons-httpclient-3.1-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-logging:commons-logging:1.1.3">
<library name="Gradle: commons-logging:commons-logging:1.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/f6f66e966c70a83ffbdb6f17a0919eaf7c8aca7f/commons-logging-1.1.3.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/4bfc12adfe4842bf07b657f0369c4cb522955686/commons-logging-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.1.3/28bb0405fddaf04f15058fbfbe01fe2780d7d3b6/commons-logging-1.1.3-sources.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-logging/commons-logging/1.2/ecf26c7507d67782a3bbd148d170b31dfad001aa/commons-logging-1.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: commons-net:commons-net:1.4.1">
@ -473,31 +474,31 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sourceforge.jweather/jweather/0.3.0/385ecc27f62f9d7c31de57cee468a8df58cb415e/jweather-0.3.0-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.jdom:jdom:1.1.3">
<library name="Gradle: org.jdom:jdom:2.0.2">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom/1.1.3/8bdfeb39fa929c35f5e4f0b02d34350db39a1efc/jdom-1.1.3.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom/2.0.2/d06c71e0df0ac4b94deb737718580ccce22d92e8/jdom-2.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom/1.1.3/b8b961a9f20d1faf160681c49f773a66b87efd63/jdom-1.1.3-sources.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jdom/jdom/2.0.2/2c0614e33230394e42f5cfe55c20d5ae8949c108/jdom-2.0.2-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.json:json:20140107">
<library name="Gradle: org.json:json:20150729">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20140107/d1ffca6e2482b002702c6a576166fd685e3370e3/json-20140107.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20150729/7ad48f520e9f94787fdbf2beb9916c76971bdcb0/json-20150729.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20140107/f53f91bc9c21fef71745450dea5200e423e38370/json-20140107-sources.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.json/json/20150729/d71e3dbedb977d57f76453af0bb43eed162adc30/json-20150729-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.jsoup:jsoup:1.7.3">
<library name="Gradle: org.jsoup:jsoup:1.8.3">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.7.3/92568d7167ce1bf9eb1fd815b022d5a2c113547a/jsoup-1.7.3.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.8.3/65fd012581ded67bc20945d85c32b4598c3a9cf1/jsoup-1.8.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.7.3/b783d347815471821faaa7ae7a4f0d2fec30966e/jsoup-1.7.3-sources.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.jsoup/jsoup/1.8.3/17b6b6cb133d73e13e2e1f3550f90d4e23451b10/jsoup-1.8.3-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.ostermiller:utils:1.07.00">
@ -509,13 +510,13 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.ostermiller/utils/1.07.00/586774ee4b8409b6835621bae2186d9b54d1c36a/utils-1.07.00-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: org.twitter4j:twitter4j-core:4.0.1">
<library name="Gradle: org.twitter4j:twitter4j-core:4.0.4">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.1/37fd1d1eb3ed57916c9fdd1ea1f6c3afce778c7c/twitter4j-core-4.0.1.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.4/1f3c896c7b2f20c51103078ccf0bc2ea97ac012a/twitter4j-core-4.0.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.1/f1ba5ef4a200e94857bc49d41385a364f1b5571e/twitter4j-core-4.0.1-sources.jar!/" />
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/org.twitter4j/twitter4j-core/4.0.4/5fb9d7d5700c56e9a5202a95a2fd6c2159cb33b7/twitter4j-core-4.0.4-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: oro:oro:2.0.8">

2
src/main/java/net/thauvin/erik/mobibot/Commands.java
View file

@ -40,7 +40,7 @@ package net.thauvin.erik.mobibot;
* @created 2014-04-26
* @since 1.0
*/
public class Commands
class Commands
{
/**
* The add (back)log command.

2
src/main/java/net/thauvin/erik/mobibot/CurrencyConverter.java
View file

@ -51,7 +51,7 @@ import java.util.*;
* @created Feb 11, 2004
* @since 1.0
*/
public class CurrencyConverter implements Runnable
class CurrencyConverter implements Runnable
{
/**
* The exchange rates.

39
src/main/java/net/thauvin/erik/mobibot/DeliciousPoster.java
View file

@ -42,8 +42,7 @@ import del.icio.us.Delicious;
* @created Mar 5, 2005
* @since 1.0
*/
@SuppressWarnings("UnnecessaryBoxing")
public class DeliciousPoster
class DeliciousPoster
{
private final Delicious delicious;
@ -73,11 +72,11 @@ public class DeliciousPoster
{
public Object construct()
{
return Boolean.valueOf(delicious.addPost(entry.getLink(),
entry.getTitle(),
postedBy(entry),
entry.getDeliciousTags(),
entry.getDate()));
return delicious.addPost(entry.getLink(),
entry.getTitle(),
postedBy(entry),
entry.getDeliciousTags(),
entry.getDate());
}
};
@ -109,7 +108,7 @@ public class DeliciousPoster
{
public Object construct()
{
return Boolean.valueOf(delicious.deletePost(link));
return delicious.deletePost(link);
}
};
@ -132,21 +131,21 @@ public class DeliciousPoster
{
delicious.deletePost(oldUrl);
return Boolean.valueOf(delicious.addPost(entry.getLink(),
entry.getTitle(),
postedBy(entry),
entry.getDeliciousTags(),
entry.getDate()));
return delicious.addPost(entry.getLink(),
entry.getTitle(),
postedBy(entry),
entry.getDeliciousTags(),
entry.getDate());
}
else
{
return Boolean.valueOf(delicious.addPost(entry.getLink(),
entry.getTitle(),
postedBy(entry),
entry.getDeliciousTags(),
entry.getDate(),
true,
true));
return delicious.addPost(entry.getLink(),
entry.getTitle(),
postedBy(entry),
entry.getDeliciousTags(),
entry.getDate(),
true,
true);
}
}
};

2
src/main/java/net/thauvin/erik/mobibot/Dice.java
View file

@ -42,7 +42,7 @@ import java.util.Random;
* @created 2014-04-28
* @since 1.0
*/
public class Dice
class Dice
{
/**
* Disables the default constructor.

2
src/main/java/net/thauvin/erik/mobibot/EntriesMgr.java
View file

@ -50,7 +50,7 @@ import java.util.List;
* @created 2014-04-28
* @since 1.0
*/
public class EntriesMgr
class EntriesMgr
{
/**
* The name of the file containing the current entries.

2
src/main/java/net/thauvin/erik/mobibot/EntryLink.java
View file

@ -361,7 +361,7 @@ public class EntryLink implements Serializable
*
* @param tags The tags.
*/
final void setTags(List<SyndCategoryImpl> tags)
private void setTags(List<SyndCategoryImpl> tags)
{
this.tags.addAll(tags);
}

2
src/main/java/net/thauvin/erik/mobibot/FeedReader.java
View file

@ -50,7 +50,7 @@ import java.util.List;
* @created Feb 1, 2004
* @since 1.0
*/
public class FeedReader implements Runnable
class FeedReader implements Runnable
{
/**
* The maximum number of feed items to display.

2
src/main/java/net/thauvin/erik/mobibot/GoogleSearch.java
View file

@ -49,7 +49,7 @@ import java.net.URLEncoder;
* @created Feb 7, 2004
* @since 1.0
*/
public class GoogleSearch implements Runnable
class GoogleSearch implements Runnable
{
/**
* The tab indent (4 spaces).

2
src/main/java/net/thauvin/erik/mobibot/Joke.java
View file

@ -48,7 +48,7 @@ import java.net.URLConnection;
* @created 2014-04-20
* @since 1.0
*/
public class Joke implements Runnable
class Joke implements Runnable
{
/**

5
src/main/java/net/thauvin/erik/mobibot/Lookup.java
View file

@ -46,14 +46,13 @@ import java.net.UnknownHostException;
* @created 2014-04-26
* @since 1.0
*/
public class Lookup
class Lookup
{
/**
* The whois host.
*/
@SuppressWarnings("WeakerAccess")
public static final String WHOIS_HOST = "whois.arin.net";
private static final String WHOIS_HOST = "whois.arin.net";
/**
* Disables the default constructor.

5
src/main/java/net/thauvin/erik/mobibot/Mobibot.java
View file

@ -773,8 +773,7 @@ public class Mobibot extends PircBot
*
* @return The file location.
*/
@SuppressWarnings("WeakerAccess")
public String getSerializedObject()
private String getSerializedObject()
{
return serializedObject;
}
@ -828,7 +827,7 @@ public class Mobibot extends PircBot
* @param channel The channel.
* @param action The action.
*/
final void action(String channel, String action)
private void action(String channel, String action)
{
if (Utils.isValidString(channel) && Utils.isValidString(action))
{

2
src/main/java/net/thauvin/erik/mobibot/StockQuote.java
View file

@ -46,7 +46,7 @@ import java.io.IOException;
* @created Feb 7, 2004
* @since 1.0
*/
public class StockQuote implements Runnable
class StockQuote implements Runnable
{
/**
* The Yahoo! stock quote URL.

1
src/main/java/net/thauvin/erik/mobibot/TellMessage.java
View file

@ -46,7 +46,6 @@ import java.util.Date;
*/
public class TellMessage implements Serializable
{
@SuppressWarnings({"UnusedDeclaration"})
private static final long serialVersionUID = 1L;
private final String id;

4
src/main/java/net/thauvin/erik/mobibot/TellMessagesMgr.java
View file

@ -48,7 +48,7 @@ import java.util.List;
* @created 2014-04-26
* @since 1.0
*/
public class TellMessagesMgr
class TellMessagesMgr
{
/**
* Disables the default constructor.
@ -132,7 +132,7 @@ public class TellMessagesMgr
logger.getLogger().error("An error occurred loading the messages queue.", e);
}
return (List<TellMessage>) new ArrayList();
return new ArrayList<TellMessage>();
}
/**

2
src/main/java/net/thauvin/erik/mobibot/Twitter.java
View file

@ -44,7 +44,7 @@ import twitter4j.conf.ConfigurationBuilder;
* @created Sept 10, 2008
* @since 1.0
*/
public class Twitter implements Runnable
class Twitter implements Runnable
{
/**
* The Twitter access token.

2
src/main/java/net/thauvin/erik/mobibot/Utils.java
View file

@ -50,7 +50,7 @@ import java.util.Calendar;
* @created 2014-04-26
* @since 1.0
*/
public class Utils
class Utils
{
/**
* The timestamp simple date format.

2
src/main/java/net/thauvin/erik/mobibot/War.java
View file

@ -42,7 +42,7 @@ import java.util.Random;
* @created 2014-04-28
* @since 1.0
*/
public class War
class War
{
/**
* The deck of card for the {@link net.thauvin.erik.mobibot.Commands#WAR_CMD war} command.

2
src/main/java/net/thauvin/erik/mobibot/Weather.java
View file

@ -47,7 +47,7 @@ import java.util.Date;
* @created Feb 7, 2004
* @since 1.0
*/
public class Weather implements Runnable
class Weather implements Runnable
{
/**
* The URL where the stations are listed.

2
src/main/java/net/thauvin/erik/mobibot/WorldTime.java
View file

@ -46,7 +46,7 @@ import java.util.TreeMap;
* @created 2014-04-27
* @since 1.0
*/
public class WorldTime
class WorldTime
{
/**
* The beats (Internet Time) keyword.