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

Updated to exp4j v0.4.5.

Browse source
This commit is contained in:
Erik C. Thauvin 2015-10-26 14:40:41 -07:00
parent c5c5e94b7b
commit edf97b3e1c
9 changed files with 24 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.gradle
View file

@ -38,7 +38,7 @@ dependencies {
compile 'org.ostermiller:utils:1.07.00' compile 'org.ostermiller:utils:1.07.00'
compile 'net.sourceforge.jweather:jweather:0.3.0@jar' compile 'net.sourceforge.jweather:jweather:0.3.0@jar'
compile 'de.congrace:exp4j:0.3.11' compile 'net.objecthunter:exp4j:0.4.5'
compile 'org.twitter4j:twitter4j-core:4.0.4' compile 'org.twitter4j:twitter4j-core:4.0.4'
compile 'net.sf.delicious-java:delicious:1.14' compile 'net.sf.delicious-java:delicious:1.14'

2
buildnum.properties
View file

@ -1,3 +1,3 @@
#ANT Task: ch.oscg.jreleaseinfo.BuildNumberHandler #ANT Task: ch.oscg.jreleaseinfo.BuildNumberHandler
#Mon Aug 31 12:19:55 PDT 2015 #Mon Oct 26 14:39:18 PDT 2015
build.num.last=0 build.num.last=0

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View file

Binary file not shown.

4
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -1,6 +1,6 @@
#Sat Aug 29 12:01:59 PDT 2015 #Sat Oct 24 14:24:39 PDT 2015
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.4-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-2.7-bin.zip

6
gradlew vendored
View file

@ -42,11 +42,6 @@ case "`uname`" in
;; ;;
esac esac
# For Cygwin, ensure paths are in UNIX format before anything is touched.
if $cygwin ; then
[ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi
# Attempt to set APP_HOME # Attempt to set APP_HOME
# Resolve links: $0 may be a link # Resolve links: $0 may be a link
PRG="$0" PRG="$0"
@ -114,6 +109,7 @@ fi
if $cygwin ; then if $cygwin ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"` APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath # We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`

2
mobibot.iml
View file

@ -24,7 +24,6 @@
<orderEntry type="library" exported="" name="Gradle: rome:rome-fetcher:1.0" level="project" /> <orderEntry type="library" exported="" name="Gradle: rome:rome-fetcher:1.0" level="project" />
<orderEntry type="library" exported="" name="Gradle: org.ostermiller:utils:1.07.00" 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: 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: net.sf.delicious-java:delicious:1.14" 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: 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-codec:commons-codec:1.10" level="project" />
@ -32,5 +31,6 @@
<orderEntry type="library" name="Gradle: org.jsoup:jsoup:1.8.3" 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.json:json:20150729" level="project" />
<orderEntry type="library" name="Gradle: org.jdom:jdom:1.1.3" level="project" /> <orderEntry type="library" name="Gradle: org.jdom:jdom:1.1.3" level="project" />
<orderEntry type="library" name="Gradle: net.objecthunter:exp4j:0.4.5" level="project" />
</component> </component>
</module> </module>

18
mobibot.ipr
View file

@ -438,15 +438,6 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/1.4.1/4c85b39e7f03471338bf7d36558eefe1e463e3de/commons-net-1.4.1-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/commons-net/commons-net/1.4.1/4c85b39e7f03471338bf7d36558eefe1e463e3de/commons-net-1.4.1-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: de.congrace:exp4j:0.3.11">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/de.congrace/exp4j/0.3.11/150e7b4a77af47b03a1b65be7a01bd663ea64420/exp4j-0.3.11.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/de.congrace/exp4j/0.3.11/61abb5ef010830519e47ac56faade402807b245b/exp4j-0.3.11-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: log4j:log4j:1.2.17"> <library name="Gradle: log4j:log4j:1.2.17">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/log4j/log4j/1.2.17/5af35056b4d257e4b64b9e8069c0746e8b08629f/log4j-1.2.17.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/log4j/log4j/1.2.17/5af35056b4d257e4b64b9e8069c0746e8b08629f/log4j-1.2.17.jar!/" />
@ -456,6 +447,15 @@
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/log4j/log4j/1.2.17/677abe279b68c5e7490d6d50c6951376238d7d3e/log4j-1.2.17-sources.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/log4j/log4j/1.2.17/677abe279b68c5e7490d6d50c6951376238d7d3e/log4j-1.2.17-sources.jar!/" />
</SOURCES> </SOURCES>
</library> </library>
<library name="Gradle: net.objecthunter:exp4j:0.4.5">
<CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.5/c6876761bb3816c603350f39b22023ee236430be/exp4j-0.4.5.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.objecthunter/exp4j/0.4.5/977535d7083d551378ff8ba8e5d2c9ddf5f0c455/exp4j-0.4.5-sources.jar!/" />
</SOURCES>
</library>
<library name="Gradle: net.sf.delicious-java:delicious:1.14"> <library name="Gradle: net.sf.delicious-java:delicious:1.14">
<CLASSES> <CLASSES>
<root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.delicious-java/delicious/1.14/6fdcbf3ef291e2a2352fc4c27fe033f02206ee1a/delicious-1.14.jar!/" /> <root url="jar://$USER_HOME$/.gradle/caches/modules-2/files-2.1/net.sf.delicious-java/delicious/1.14/6fdcbf3ef291e2a2352fc4c27fe033f02206ee1a/delicious-1.14.jar!/" />

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

@ -36,8 +36,8 @@ package net.thauvin.erik.mobibot;
import com.sun.syndication.fetcher.impl.FeedFetcherCache; import com.sun.syndication.fetcher.impl.FeedFetcherCache;
import com.sun.syndication.fetcher.impl.HashMapFeedInfoCache; import com.sun.syndication.fetcher.impl.HashMapFeedInfoCache;
import com.sun.syndication.io.FeedException; import com.sun.syndication.io.FeedException;
import de.congrace.exp4j.Calculable; import net.objecthunter.exp4j.Expression;
import de.congrace.exp4j.ExpressionBuilder; import net.objecthunter.exp4j.ExpressionBuilder;
import org.apache.commons.cli.*; import org.apache.commons.cli.*;
import org.apache.commons.logging.impl.Log4JLogger; import org.apache.commons.logging.impl.Log4JLogger;
import org.apache.log4j.Level; import org.apache.log4j.Level;
@ -850,8 +850,8 @@ public class Mobibot extends PircBot
try try
{ {
final Calculable calc = new ExpressionBuilder(args).build(); final Expression calc = new ExpressionBuilder(args).build();
send(channel, args.replaceAll(" ", "") + " = " + decimalFormat.format(calc.calculate())); send(channel, args.replaceAll(" ", "") + " = " + decimalFormat.format(calc.evaluate()));
} }
catch (Exception e) catch (Exception e)
{ {
@ -1050,7 +1050,6 @@ public class Mobibot extends PircBot
} }
} }
/** /**
* Returns indented and bold help string. * Returns indented and bold help string.
* *

8
src/main/java/net/thauvin/erik/mobibot/ReleaseInfo.java
View file

@ -1,5 +1,5 @@
/* Created by JReleaseInfo AntTask from Open Source Competence Group */ /* Created by JReleaseInfo AntTask from Open Source Competence Group */
/* Creation date Mon Aug 31 12:19:55 PDT 2015 */ /* Creation date Mon Oct 26 14:39:18 PDT 2015 */
package net.thauvin.erik.mobibot; package net.thauvin.erik.mobibot;
import java.util.Date; import java.util.Date;
@ -20,11 +20,11 @@ public class ReleaseInfo {
} }
/** buildDate (set during build process to 1441048795735L). */ /** buildDate (set during build process to 1445895558361L). */
private static final Date buildDate = new Date(1441048795735L); private static final Date buildDate = new Date(1445895558361L);
/** /**
* Get buildDate (set during build process to Mon Aug 31 12:19:55 PDT 2015). * Get buildDate (set during build process to Mon Oct 26 14:39:18 PDT 2015).
* @return Date buildDate * @return Date buildDate
*/ */
public static Date getBuildDate() { return buildDate; } public static Date getBuildDate() { return buildDate; }