diff options
| author | KHobbits <rob@khobbits.co.uk> | 2012-09-14 00:58:57 +0100 |
|---|---|---|
| committer | KHobbits <rob@khobbits.co.uk> | 2012-09-14 00:58:57 +0100 |
| commit | d3967297bb4d0cda4e9a1f080faa62966adbc176 (patch) | |
| tree | 603be00551bbe68e013752f283b805778d54f03f | |
| parent | 0296f4fcf17a629a42f92ff6b409a69e470585d8 (diff) | |
| download | Essentials-d3967297bb4d0cda4e9a1f080faa62966adbc176.tar Essentials-d3967297bb4d0cda4e9a1f080faa62966adbc176.tar.gz Essentials-d3967297bb4d0cda4e9a1f080faa62966adbc176.tar.lz Essentials-d3967297bb4d0cda4e9a1f080faa62966adbc176.tar.xz Essentials-d3967297bb4d0cda4e9a1f080faa62966adbc176.zip | |
Don't create empty user files
| -rw-r--r-- | Essentials/nbproject/project.properties | 1 | ||||
| -rw-r--r-- | Essentials/src/com/earth2me/essentials/EssentialsConf.java | 35 |
2 files changed, 24 insertions, 12 deletions
diff --git a/Essentials/nbproject/project.properties b/Essentials/nbproject/project.properties index a9cebbb92..fd32306ca 100644 --- a/Essentials/nbproject/project.properties +++ b/Essentials/nbproject/project.properties @@ -150,5 +150,6 @@ run.test.classpath=\ ${javac.test.classpath}:\ ${build.test.classes.dir} source.encoding=UTF-8 +source.reference.craftbukkit.jar=U:\\Users\\KHobbits\\GIT\\CraftBukkit\\src\\main\\java\\ src.dir=src test.src.dir=test diff --git a/Essentials/src/com/earth2me/essentials/EssentialsConf.java b/Essentials/src/com/earth2me/essentials/EssentialsConf.java index bc262e3f5..d6414fb05 100644 --- a/Essentials/src/com/earth2me/essentials/EssentialsConf.java +++ b/Essentials/src/com/earth2me/essentials/EssentialsConf.java @@ -91,18 +91,7 @@ public class EssentialsConf extends YamlConfiguration } else { - try - { - LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString())); - if (!configFile.createNewFile()) - { - LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString())); - } - } - catch (IOException ex) - { - LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex); - } + return; } } @@ -367,6 +356,28 @@ public class EssentialsConf extends YamlConfiguration final String data = saveToString(); + if (data.length() == 0) + { + return; + } + + if (!configFile.exists()) + { + try + { + LOGGER.log(Level.INFO, _("creatingEmptyConfig", configFile.toString())); + if (!configFile.createNewFile()) + { + LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString())); + } + } + catch (IOException ex) + { + LOGGER.log(Level.SEVERE, _("failedToCreateConfig", configFile.toString()), ex); + } + } + + final OutputStreamWriter writer = new OutputStreamWriter(new FileOutputStream(file), UTF8); try |