From 0155bcedb7f00726d0b2f14e612a5342322a8278 Mon Sep 17 00:00:00 2001
From: snowleo <schneeleo@gmail.com>
Date: Wed, 14 Dec 2011 16:31:08 +0100
Subject: Updated all modules to new api, some settings are still missing

---
 .../src/com/earth2me/essentials/xmpp/UserManager.java          | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java')

diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
index 85ef50949..c8df2fcb3 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
@@ -1,12 +1,12 @@
 package com.earth2me.essentials.xmpp;
 
 import com.earth2me.essentials.EssentialsConf;
-import com.earth2me.essentials.IConf;
+import com.earth2me.essentials.api.IReload;
 import java.io.File;
 import java.util.*;
 
 
-public class UserManager implements IConf
+public class UserManager implements IReload
 {
 	private final transient EssentialsConf users;
 	private final transient List<String> spyusers = new ArrayList<String>();
@@ -16,7 +16,7 @@ public class UserManager implements IConf
 	public UserManager(final File folder)
 	{
 		users = new EssentialsConf(new File(folder, "users.yml"));
-		reloadConfig();
+		onReload();
 	}
 
 	public final boolean isSpy(final String username)
@@ -65,11 +65,11 @@ public class UserManager implements IConf
 		userdata.put(SPY, spy);
 		users.setProperty(username, userdata);
 		users.save();
-		reloadConfig();
+		onReload();
 	}
 
 	@Override
-	public final void reloadConfig()
+	public final void onReload()
 	{
 		users.load();
 		spyusers.clear();
-- 
cgit v1.2.3


From 7e8ca0520309408f83d587265eff550eb2623d46 Mon Sep 17 00:00:00 2001
From: md_5 <md_5@bigpond.com>
Date: Sun, 4 Mar 2012 10:37:05 +1100
Subject: Complete the transition to maven :D

---
 .../com/earth2me/essentials/xmpp/UserManager.java  | 23 ++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

(limited to 'EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java')

diff --git a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
index 6187d9ab8..0f17e8660 100644
--- a/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
+++ b/EssentialsXMPP/src/com/earth2me/essentials/xmpp/UserManager.java
@@ -1,21 +1,25 @@
 package com.earth2me.essentials.xmpp;
 
-import com.earth2me.essentials.EssentialsConf;
 import com.earth2me.essentials.api.IReload;
 import java.io.File;
+import java.io.IOException;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import org.bukkit.configuration.file.YamlConfiguration;
 
 
 public class UserManager implements IReload
 {
-	private final transient EssentialsConf users;
+	private transient YamlConfiguration users;
+	private final transient File folder;
 	private final transient List<String> spyusers = new ArrayList<String>();
 	private final static String ADDRESS = "address";
 	private final static String SPY = "spy";
 
 	public UserManager(final File folder)
 	{
-		users = new EssentialsConf(new File(folder, "users.yml"));
+		this.folder = folder;
 		onReload();
 	}
 
@@ -63,15 +67,22 @@ public class UserManager implements IReload
 		final Map<String, Object> userdata = new HashMap<String, Object>();
 		userdata.put(ADDRESS, address);
 		userdata.put(SPY, spy);
-		users.setProperty(username, userdata);
-		users.save();
+		users.set(username, userdata);
+		try
+		{
+			users.save(new File(folder, "users.yml"));
+		}
+		catch (IOException ex)
+		{
+			Logger.getLogger(UserManager.class.getName()).log(Level.SEVERE, null, ex);
+		}
 		onReload();
 	}
 
 	@Override
 	public final void onReload()
 	{
-		users.load();
+		users = YamlConfiguration.loadConfiguration(new File(folder, "users.yml"));
 		spyusers.clear();
 		final Set<String> keys = users.getKeys(false);
 		for (String key : keys)
-- 
cgit v1.2.3