Removed disabled commands from help, etc.

This commit is contained in:
Erik C. Thauvin 2010-09-14 09:24:58 +00:00
parent 4a6e02cd18
commit 4bded0453e
6 changed files with 312 additions and 157 deletions

View file

@ -1,3 +1,3 @@
#ANT Task: ch.oscg.jreleaseinfo.BuildNumberHandler #ANT Task: ch.oscg.jreleaseinfo.BuildNumberHandler
#Mon Sep 13 17:42:54 PDT 2010 #Tue Sep 14 01:40:47 PDT 2010
build.num.last=6 build.num.last=7

View file

@ -1,6 +1,6 @@
Mobibot License Mobibot License
Copyright (c) 2004, Erik C. Thauvin (erik@thauvin.net) Copyright (c) 2004-2010, Erik C. Thauvin (erik@thauvin.net)
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,

View file

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="AnalysisUIOptions">
<option name="SCOPE_TYPE" value="8" />
<option name="CUSTOM_SCOPE_NAME" value="Project and Libraries" />
</component>
<component name="CCaseConfig"> <component name="CCaseConfig">
<option name="checkoutReserved" value="false" /> <option name="checkoutReserved" value="false" />
<option name="markExternalChangeAsUpToDate" value="true" /> <option name="markExternalChangeAsUpToDate" value="true" />
@ -29,9 +33,16 @@
<option name="USER" value="" /> <option name="USER" value="" />
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" readonly="true" id="944923a8-a8d5-4232-a77e-02473b958f59" name="Default" comment="" /> <list default="true" readonly="true" id="944923a8-a8d5-4232-a77e-02473b958f59" name="Default" comment="">
<ignored path="$USER_HOME_GRAILS$/" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/licenses/License.txt" afterPath="$PROJECT_DIR$/licenses/License.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/buildnum.properties" afterPath="$PROJECT_DIR$/buildnum.properties" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java" afterPath="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/mobibot.iws" afterPath="$PROJECT_DIR$/mobibot.iws" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/CurrencyConverter.java" afterPath="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/CurrencyConverter.java" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/ReleaseInfo.java" afterPath="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/ReleaseInfo.java" />
</list>
<ignored path="$USER_HOME_GRIFFON$/" /> <ignored path="$USER_HOME_GRIFFON$/" />
<ignored path="$USER_HOME_GRAILS$/" />
<option name="TRACKING_ENABLED" value="true" /> <option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -128,35 +139,80 @@
<component name="FileColors" enabled="true" enabledForTabs="true" /> <component name="FileColors" enabled="true" enabledForTabs="true" />
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf> <leaf>
<file leaf-file-name="FeedReader.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/FeedReader.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="GoogleSearch.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/GoogleSearch.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Jaiku.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Jaiku.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="EntryLink.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryLink.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Mobibot.java" pinned="false" current="true" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java">
<provider selected="true" editor-type-id="text-editor">
<state line="637" column="26" selection-start="15201" selection-end="15201" vertical-scroll-proportion="-2.1819105">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="ReleaseInfo.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/ReleaseInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state line="40" column="42" selection-start="1170" selection-end="1170" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="StockQuote.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/StockQuote.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Twitter.java" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Twitter.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Twitter.java"> <entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Twitter.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="93" column="18" selection-start="2403" selection-end="2403" vertical-scroll-proportion="0.0"> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="TwitterOAuth.java" pinned="false" current="true" current-in-tab="true"> <file leaf-file-name="TwitterOAuth.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/TwitterOAuth.java"> <entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/TwitterOAuth.java">
<provider selected="true" editor-type-id="text-editor">
<state line="62" column="60" selection-start="1972" selection-end="1975" vertical-scroll-proportion="0.84626865">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Mobibot.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java">
<provider selected="true" editor-type-id="text-editor">
<state line="2512" column="124" selection-start="59852" selection-end="59852" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="build.properties" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/build.properties">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding /> <folding />
@ -164,8 +220,8 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="mobibot.properties" pinned="false" current="false" current-in-tab="false"> <file leaf-file-name="Weather.java" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/mobibot.properties"> <entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Weather.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding /> <folding />
@ -173,15 +229,6 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="buildnum.properties" pinned="false" current="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/buildnum.properties">
<provider selected="true" editor-type-id="text-editor">
<state line="2" column="16" selection-start="97" selection-end="97" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
</file>
</leaf> </leaf>
</component> </component>
<component name="FindManager"> <component name="FindManager">
@ -206,10 +253,11 @@
<list> <list>
<option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryLink.java" /> <option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryLink.java" />
<option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/TwitterTest.java" /> <option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/TwitterTest.java" />
<option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java" />
<option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Twitter.java" /> <option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Twitter.java" />
<option value="$PROJECT_DIR$/buildnum.properties" />
<option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/TwitterOAuth.java" /> <option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/TwitterOAuth.java" />
<option value="$PROJECT_DIR$/buildnum.properties" />
<option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/CurrencyConverter.java" />
<option value="$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java" />
</list> </list>
</option> </option>
</component> </component>
@ -336,6 +384,7 @@
<sortByType /> <sortByType />
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" />
<pane id="Favorites" /> <pane id="Favorites" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
@ -369,23 +418,8 @@
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT> </PATH_ELEMENT>
</PATH> </PATH>
<PATH>
<PATH_ELEMENT>
<option name="myItemId" value="mobibot" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="mobibot" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
<PATH_ELEMENT>
<option name="myItemId" value="lib" />
<option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
</PATH_ELEMENT>
</PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scope" />
<pane id="PackagesPane"> <pane id="PackagesPane">
<subPane> <subPane>
<PATH> <PATH>
@ -823,23 +857,24 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="154" y="0" width="1414" height="1175" extended-state="0" /> <frame x="153" y="0" width="1415" height="1175" extended-state="0" />
<editor active="false" /> <editor active="true" />
<layout> <layout>
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32934684" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32934684" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.09696521" sideWeight="0.66762453" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32854405" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.09689349" sideWeight="0.66475093" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39907408" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39907408" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="11" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3256705" sideWeight="0.5" order="19" side_tool="false" content_ui="tabs" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33024693" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33024693" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27818063" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27818063" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18134715" sideWeight="0.66762453" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.18121302" sideWeight="0.66475093" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" /> <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="17" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32854405" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39367816" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" x="22" y="277" width="980" height="213" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.39367816" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" x="22" y="277" width="980" height="213" />
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> <window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="IntelliTail" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" /> <window_info id="IntelliTail" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="12" side_tool="false" content_ui="tabs" />
@ -851,11 +886,11 @@
<window_info id="BeanShell Box" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293247" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" /> <window_info id="BeanShell Box" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3293247" sideWeight="0.5" order="13" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32854405" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" /> <window_info id="Profile" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="16" side_tool="false" content_ui="tabs" />
<window_info id="BSFConsole" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962963" sideWeight="0.5" order="21" side_tool="false" content_ui="tabs" /> <window_info id="BSFConsole" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962963" sideWeight="0.5" order="21" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32969153" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32969153" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Jalopy" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962963" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" /> <window_info id="Jalopy" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962963" sideWeight="0.5" order="15" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.3256705" sideWeight="0.5" order="19" side_tool="false" content_ui="tabs" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> <window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Code Outline" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Code Outline" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@ -863,7 +898,6 @@
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" /> <window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="10" side_tool="false" content_ui="tabs" />
<window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962963" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" /> <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32962963" sideWeight="0.5" order="18" side_tool="false" content_ui="tabs" />
<window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Duplicates" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32934684" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44135803" sideWeight="0.5" order="20" side_tool="false" content_ui="tabs" x="22" y="277" width="980" height="214" /> <window_info id="Regex" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.44135803" sideWeight="0.5" order="20" side_tool="false" content_ui="tabs" x="22" y="277" width="980" height="214" />
</layout> </layout>
</component> </component>
@ -965,66 +999,6 @@
<option name="myLastEditedConfigurable" /> <option name="myLastEditedConfigurable" />
</component> </component>
<component name="editorHistoryManager"> <component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/licenses/PircBot License.html">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/licenses/ROME License.txt">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/licenses/Twitter4J LICENSE.txt">
<provider selected="true" editor-type-id="text-editor">
<state line="23" column="0" selection-start="1423" selection-end="1423" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.cvsignore">
<provider selected="true" editor-type-id="text-editor">
<state line="7" column="52" selection-start="85" selection-end="85" vertical-scroll-proportion="0.09915014" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Jaiku.java">
<provider selected="true" editor-type-id="text-editor">
<state line="28" column="13" selection-start="642" selection-end="642" vertical-scroll-proportion="-0.13314448" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/ReleaseInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state line="56" column="28" selection-start="1568" selection-end="1578" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryLink.java">
<provider selected="true" editor-type-id="text-editor">
<state line="382" column="80" selection-start="8127" selection-end="8127" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/StockQuote.java">
<provider selected="true" editor-type-id="text-editor">
<state line="52" column="13" selection-start="2029" selection-end="2029" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.xml">
<provider selected="true" editor-type-id="text-editor">
<state line="34" column="59" selection-start="1429" selection-end="1429" vertical-scroll-proportion="-22.173914" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Twitter.java">
<provider selected="true" editor-type-id="text-editor">
<state line="93" column="18" selection-start="2403" selection-end="2403" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java">
<provider selected="true" editor-type-id="text-editor">
<state line="2512" column="124" selection-start="59852" selection-end="59852" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/build.properties">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/mobibot.properties"> <entry file="file://$PROJECT_DIR$/mobibot.properties">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" /> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0" />
@ -1032,12 +1006,105 @@
</entry> </entry>
<entry file="file://$PROJECT_DIR$/buildnum.properties"> <entry file="file://$PROJECT_DIR$/buildnum.properties">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="2" column="16" selection-start="97" selection-end="97" vertical-scroll-proportion="0.0" /> <state line="3" column="0" selection-start="98" selection-end="98" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/SwingWorker.java">
<provider selected="true" editor-type-id="text-editor">
<state line="50" column="27" selection-start="1450" selection-end="1450" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/CurrencyConverter.java">
<provider selected="true" editor-type-id="text-editor">
<state line="10" column="3" selection-start="279" selection-end="279" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/DeliciousPoster.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryComment.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/EntryLink.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/FeedReader.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/GoogleSearch.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Jaiku.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/ReleaseInfo.java">
<provider selected="true" editor-type-id="text-editor">
<state line="40" column="42" selection-start="1170" selection-end="1170" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/StockQuote.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Twitter.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/TwitterOAuth.java"> <entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/TwitterOAuth.java">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state line="62" column="60" selection-start="1972" selection-end="1975" vertical-scroll-proportion="0.84626865"> <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Weather.java">
<provider selected="true" editor-type-id="text-editor">
<state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/src/net/thauvin/erik/mobibot/Mobibot.java">
<provider selected="true" editor-type-id="text-editor">
<state line="637" column="26" selection-start="15201" selection-end="15201" vertical-scroll-proportion="-2.1819105">
<folding /> <folding />
</state> </state>
</provider> </provider>

View file

@ -186,7 +186,7 @@ public class CurrencyConverter implements Runnable
NumberFormat.getCurrencyInstance(Locale.US).format((amt * to) / from) NumberFormat.getCurrencyInstance(Locale.US).format((amt * to) / from)
.substring(1) + ' ' + cmds[3].toUpperCase()); .substring(1) + ' ' + cmds[3].toUpperCase());
} }
catch (NullPointerException e) catch (NullPointerException ignore)
{ {
_bot.send(_sender, _bot.send(_sender,
"The supported currencies are: " + EXCHANGE_RATES.keySet().toString()); "The supported currencies are: " + EXCHANGE_RATES.keySet().toString());

View file

@ -94,7 +94,8 @@ public class Mobibot extends PircBot
* The version strings. * The version strings.
*/ */
private static final String[] VERSION_STRS = private static final String[] VERSION_STRS =
{"Version: " + ReleaseInfo.getVersion() + '.' + ReleaseInfo.getBuildNumber() + " (" + ISO_SDF.format(ReleaseInfo.getBuildDate()) + ')', {"Version: " + ReleaseInfo.getVersion() + '.' + ReleaseInfo.getBuildNumber() + " ("
+ ISO_SDF.format(ReleaseInfo.getBuildDate()) + ')',
"Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", " "Platform: " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", "
+ System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')', + System.getProperty("os.arch") + ", " + System.getProperty("user.country") + ')',
"Runtime: " + System.getProperty("java.runtime.name") + " (build " "Runtime: " + System.getProperty("java.runtime.name") + " (build "
@ -588,7 +589,7 @@ public class Mobibot extends PircBot
} }
catch (FeedException e) catch (FeedException e)
{ {
_logger.error("An error occured while parsing the '" + CURRENT_XML + "' file.", e); _logger.error("An error occurred while parsing the '" + CURRENT_XML + "' file.", e);
} }
// Load the backlogs, if any. // Load the backlogs, if any.
@ -602,7 +603,7 @@ public class Mobibot extends PircBot
} }
catch (FeedException e) catch (FeedException e)
{ {
_logger.error("An error occured while parsing the '" + NAV_XML + "' file.", e); _logger.error("An error occurred while parsing the '" + NAV_XML + "' file.", e);
} }
} }
@ -979,17 +980,17 @@ public class Mobibot extends PircBot
send(sender, "To list the last 5 posts from the channel's weblog:"); send(sender, "To list the last 5 posts from the channel's weblog:");
send(sender, DOUBLE_INDENT + bold(getNick() + ": " + getChannel().substring(1))); send(sender, DOUBLE_INDENT + bold(getNick() + ": " + getChannel().substring(1)));
} }
else if (lcTopic.endsWith(GOOGLE_CMD)) else if (lcTopic.endsWith(GOOGLE_CMD) && isGoogleEnabled())
{ {
send(sender, "To search Google:"); send(sender, "To search Google:");
send(sender, DOUBLE_INDENT + bold(getNick() + ": " + GOOGLE_CMD + " <query>")); send(sender, DOUBLE_INDENT + bold(getNick() + ": " + GOOGLE_CMD + " <query>"));
} }
else if (lcTopic.endsWith(JAIKU_CMD)) else if (lcTopic.endsWith(JAIKU_CMD) && isJaikuEnabled())
{ {
send(sender, "To post to Jaiku:"); send(sender, "To post to Jaiku:");
send(sender, DOUBLE_INDENT + bold(getNick() + ": " + JAIKU_CMD + " <message>")); send(sender, DOUBLE_INDENT + bold(getNick() + ": " + JAIKU_CMD + " <message>"));
} }
else if (lcTopic.endsWith(TWITTER_CMD)) else if (lcTopic.endsWith(TWITTER_CMD) && isTwitterEnabled())
{ {
send(sender, "To post to Twitter:"); send(sender, "To post to Twitter:");
send(sender, DOUBLE_INDENT + bold(getNick() + ": " + TWITTER_CMD + " <message>")); send(sender, DOUBLE_INDENT + bold(getNick() + ": " + TWITTER_CMD + " <message>"));
@ -1017,7 +1018,7 @@ public class Mobibot extends PircBot
send(sender, "For a listing of the supported countries:"); send(sender, "For a listing of the supported countries:");
send(sender, DOUBLE_INDENT + bold(getNick() + ": " + TIME_CMD)); send(sender, DOUBLE_INDENT + bold(getNick() + ": " + TIME_CMD));
} }
else if (lcTopic.endsWith(SPELL_CMD)) else if (lcTopic.endsWith(SPELL_CMD) && isGoogleEnabled())
{ {
send(sender, "To have Google try to correctly spell a sentence:"); send(sender, "To have Google try to correctly spell a sentence:");
send(sender, DOUBLE_INDENT + bold(getNick() + ": " + SPELL_CMD + " <sentence>")); send(sender, DOUBLE_INDENT + bold(getNick() + ": " + SPELL_CMD + " <sentence>"));
@ -1113,25 +1114,81 @@ public class Mobibot extends PircBot
send(sender, "For more information on specific command, type:"); send(sender, "For more information on specific command, type:");
send(sender, DOUBLE_INDENT + bold(getNick() + ": " + HELP_CMD + " <command>")); send(sender, DOUBLE_INDENT + bold(getNick() + ": " + HELP_CMD + " <command>"));
send(sender, "The commands are:"); send(sender, "The commands are:");
send(sender,
DOUBLE_INDENT + bold( final String[] cmds = {CALC_CMD,
CALC_CMD + ' ' + CURRENCY_CMD + ' ' + DICE_CMD + ' ' + GOOGLE_CMD + ' ' + IGNORE_CMD)); CURRENCY_CMD,
send(sender, DICE_CMD,
DOUBLE_INDENT + bold( GOOGLE_CMD,
INFO_CMD + ' ' + getChannel().substring(1) + ' ' + LOOKUP_CMD + ' ' + HELP_POSTING_KEYWORD IGNORE_CMD,
+ ' ' + RECAP_CMD)); INFO_CMD,
send(sender, JAIKU_CMD,
DOUBLE_INDENT + bold( LOOKUP_CMD,
SPELL_CMD + ' ' + STOCK_CMD + ' ' + HELP_TAGS_KEYWORD + ' ' + TIME_CMD + ' ' + USERS_CMD + ' ' getChannel().substring(1),
+ VIEW_CMD)); HELP_POSTING_KEYWORD,
send(sender, DOUBLE_INDENT + bold(JAIKU_CMD + ' ' + TWITTER_CMD + ' ' + WEATHER_CMD)); RECAP_CMD,
SPELL_CMD,
STOCK_CMD,
HELP_TAGS_KEYWORD,
TIME_CMD,
TWITTER_CMD,
USERS_CMD,
VIEW_CMD,
WEATHER_CMD};
Arrays.sort(cmds);
final StringBuffer sb = new StringBuffer(0);
boolean isValidCmd = true;
for (int i = 0, cmdCount = 1; i < cmds.length; i++, cmdCount++)
{
if (cmds[i].equals(GOOGLE_CMD) || cmds[i].equals(SPELL_CMD))
{
isValidCmd = isGoogleEnabled();
}
if (cmds[i].equals(JAIKU_CMD))
{
isValidCmd = isJaikuEnabled();
}
if (cmds[i].equals(TWITTER_CMD))
{
isValidCmd = isTwitterEnabled();
}
if (isValidCmd)
{
if (sb.length() > 0)
{
sb.append(" ");
}
sb.append(cmds[i]);
}
else
{
cmdCount--;
}
// 5 commands per line or last command
if (sb.length() > 0 && (cmdCount == 5 || i == (cmds.length - 1)))
{
send(sender, DOUBLE_INDENT + bold(sb.toString()));
sb.setLength(0);
cmdCount = 0;
}
isValidCmd = true;
}
if (isOp(sender)) if (isOp(sender))
{ {
send(sender, "The op commands are:"); send(sender, "The op commands are:");
send(sender, send(sender,
DOUBLE_INDENT + bold( DOUBLE_INDENT + bold(
CYCLE_CMD + ' ' + ME_CMD + ' ' + MSG_CMD + ' ' + SAY_CMD + ' ' + VERSION_CMD)); CYCLE_CMD + " " + ME_CMD + " " + MSG_CMD + " " + SAY_CMD + " " + VERSION_CMD));
} }
} }
} }
@ -1233,7 +1290,8 @@ public class Mobibot extends PircBot
{ {
if (_logger.isDebugEnabled()) if (_logger.isDebugEnabled())
{ {
_logger.debug("Unable to reconnect to " + _ircServer + " after " + MAX_RECONNECT + " retries.", _logger.debug(
"Unable to reconnect to " + _ircServer + " after " + MAX_RECONNECT + " retries.",
ex); ex);
} }
@ -1385,7 +1443,7 @@ public class Mobibot extends PircBot
"is somewhere over the rainbow.", "is somewhere over the rainbow.",
"has fallen and can't get up.", "has fallen and can't get up.",
"is running. You better go chase it.", "is running. You better go chase it.",
"has just spontantiously combusted.", "has just spontaneously combusted.",
"is talking to itself... don't interrupt. That's rude.", "is talking to itself... don't interrupt. That's rude.",
"is bartending at an AA meeting.", "is bartending at an AA meeting.",
"is hibernating.", "is hibernating.",
@ -2437,6 +2495,16 @@ public class Mobibot extends PircBot
return _today; return _today;
} }
/**
* Returns <code>true</code> if Google services are enabled.
*
* @return <code>true</code> or <code>false</code>
*/
private boolean isGoogleEnabled()
{
return isValidString(_googleKey);
}
/** /**
* Responds with the Google search results for the specified query. * Responds with the Google search results for the specified query.
* *
@ -2445,7 +2513,7 @@ public class Mobibot extends PircBot
*/ */
private void googleResponse(String sender, String query) private void googleResponse(String sender, String query)
{ {
if (isValidString(_googleKey)) if (isGoogleEnabled())
{ {
if (query.length() > 0) if (query.length() > 0)
{ {
@ -2462,6 +2530,16 @@ public class Mobibot extends PircBot
} }
} }
/**
* Returns <code>true</code> if jaiku posting is enabled.
*
* @return <code>true</code> or <code>false</code>
*/
private boolean isJaikuEnabled()
{
return isValidString(_jaikuKey) && isValidString(_jaikuUser);
}
/** /**
* Posts a message to Jaiku. * Posts a message to Jaiku.
* *
@ -2470,7 +2548,7 @@ public class Mobibot extends PircBot
*/ */
private void jaikuResponse(String sender, String message) private void jaikuResponse(String sender, String message)
{ {
if (isValidString(_jaikuKey) && isValidString(_jaikuUser)) if (isJaikuEnabled())
{ {
if (message.length() > 0) if (message.length() > 0)
{ {
@ -2487,6 +2565,17 @@ public class Mobibot extends PircBot
} }
} }
/**
* Returns <code>true</code> if twitter posting is enabled.
*
* @return <code>true</code> or <code>false</code>
*/
private boolean isTwitterEnabled()
{
return isValidString(_twitterConsumerKey) && isValidString(_twitterConsumerSecret)
&& isValidString(_twitterToken) && isValidString(_twitterTokenSecret);
}
/** /**
* Posts a message to Twitter. * Posts a message to Twitter.
* *
@ -2495,8 +2584,7 @@ public class Mobibot extends PircBot
*/ */
private void twitterResponse(String sender, String message) private void twitterResponse(String sender, String message)
{ {
if (isValidString(_twitterConsumerKey) && isValidString(_twitterConsumerSecret) && isValidString(_twitterToken) if (isTwitterEnabled())
&& isValidString(_twitterTokenSecret))
{ {
if (message.length() > 0) if (message.length() > 0)
{ {
@ -3123,7 +3211,7 @@ public class Mobibot extends PircBot
*/ */
private void spellResponse(String sender, String spell) private void spellResponse(String sender, String spell)
{ {
if (isValidString(_googleKey)) if (isGoogleEnabled())
{ {
if (spell.length() > 0) if (spell.length() > 0)
{ {

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 Sep 13 17:42:54 PDT 2010 */ /* Creation date Tue Sep 14 01:40:47 PDT 2010 */
package net.thauvin.erik.mobibot; package net.thauvin.erik.mobibot;
import java.util.Date; import java.util.Date;
@ -20,21 +20,21 @@ public class ReleaseInfo {
} }
/** buildDate (set during build process to 1284424974097L). */ /** buildDate (set during build process to 1284453647766L). */
private static final Date buildDate = new Date(1284424974097L); private static final Date buildDate = new Date(1284453647766L);
/** /**
* Get buildDate (set during build process to Mon Sep 13 17:42:54 PDT 2010). * Get buildDate (set during build process to Tue Sep 14 01:40:47 PDT 2010).
* @return Date buildDate * @return Date buildDate
*/ */
public static Date getBuildDate() { return buildDate; } public static Date getBuildDate() { return buildDate; }
/** /**
* Get buildNumber (set during build process to 6). * Get buildNumber (set during build process to 7).
* @return int buildNumber * @return int buildNumber
*/ */
public static int getBuildNumber() { return 6; } public static int getBuildNumber() { return 7; }
/** project (set during build process to "mobibot"). */ /** project (set during build process to "mobibot"). */