summaryrefslogtreecommitdiffstats
path: root/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
diff options
context:
space:
mode:
authormd_5 <md_5@bigpond.com>2012-03-04 10:37:05 +1100
committermd_5 <md_5@bigpond.com>2012-03-04 10:37:05 +1100
commit7e8ca0520309408f83d587265eff550eb2623d46 (patch)
tree68dfb17005d3d5324af575672a790b1a98e18a5d /EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
parent3ed78c052086d7838fd8e5dd2b3acf50acb3ecf1 (diff)
downloadEssentials-7e8ca0520309408f83d587265eff550eb2623d46.tar
Essentials-7e8ca0520309408f83d587265eff550eb2623d46.tar.gz
Essentials-7e8ca0520309408f83d587265eff550eb2623d46.tar.lz
Essentials-7e8ca0520309408f83d587265eff550eb2623d46.tar.xz
Essentials-7e8ca0520309408f83d587265eff550eb2623d46.zip
Complete the transition to maven :D
Diffstat (limited to 'EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java')
-rw-r--r--EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
index 67109b461..64dd5aff2 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/XMPPManager.java
@@ -1,6 +1,5 @@
package com.earth2me.essentials.xmpp;
-import com.earth2me.essentials.EssentialsConf;
import com.earth2me.essentials.api.IReload;
import com.earth2me.essentials.api.IUser;
import java.io.File;
@@ -9,6 +8,7 @@ import java.util.logging.Handler;
import java.util.logging.Level;
import java.util.logging.LogRecord;
import java.util.logging.Logger;
+import org.bukkit.configuration.file.YamlConfiguration;
import org.bukkit.entity.Player;
import org.jivesoftware.smack.Roster.SubscriptionMode;
import org.jivesoftware.smack.*;
@@ -20,7 +20,7 @@ import org.jivesoftware.smack.util.StringUtils;
public class XMPPManager extends Handler implements MessageListener, ChatManagerListener, IReload
{
private static final Logger LOGGER = Logger.getLogger("Minecraft");
- private final transient EssentialsConf config;
+ private transient YamlConfiguration config = null;
private transient XMPPConnection connection;
private transient ChatManager chatManager;
private final transient Map<String, Chat> chats = Collections.synchronizedMap(new HashMap<String, Chat>());
@@ -36,8 +36,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
{
super();
this.parent = parent;
- config = new EssentialsConf(new File(parent.getDataFolder(), "config.yml"));
- config.setTemplateName("/config.yml", EssentialsXMPP.class);
+ // config.setTemplateName("/config.yml", EssentialsXMPP.class);
onReload();
}
@@ -168,7 +167,7 @@ public class XMPPManager extends Handler implements MessageListener, ChatManager
public final void onReload()
{
LOGGER.removeHandler(this);
- config.load();
+ config = YamlConfiguration.loadConfiguration(new File(parent.getDataFolder(), "config.yml"));
synchronized (chats)
{
disconnect();