Add back legacy XML support

AustinLMayes · AustinLMayes · commit 9d518c50d2a5 · 2020-07-13T23:51:18.000-05:00
diff --git a/Bukkit/src/main/java/net/avicus/compendium/AvicusBukkitCommandManager.java b/Bukkit/src/main/java/net/avicus/compendium/AvicusBukkitCommandManager.java
@@ -1,6 +1,5 @@
 package net.avicus.compendium;
 
-import net.avicus.compendium.commands.AvicusCommandsRegistration;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;
 
diff --git a/Bukkit/src/main/java/net/avicus/compendium/locale/LocaleStrings.java b/Bukkit/src/main/java/net/avicus/compendium/locale/LocaleStrings.java
@@ -1,23 +1,14 @@
 package net.avicus.compendium.locale;
 
-import com.google.common.base.Preconditions;
 import java.io.IOException;
-import java.io.InputStream;
 import java.nio.file.Path;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
-import java.util.Optional;
 import lombok.Getter;
 import lombok.ToString;
 import net.avicus.compendium.utils.FileBackedKVSet;
-import net.avicus.compendium.utils.Strings;
 import net.md_5.bungee.api.ChatColor;
-import org.jdom2.Content;
-import org.jdom2.Document;
-import org.jdom2.Element;
-import org.jdom2.JDOMException;
-import org.jdom2.input.SAXBuilder;
 
 /**
  * A key->value represtantation of strings for a specific {@link Locale} that can be retrieved for
diff --git a/Bukkit/src/main/java/net/avicus/compendium/locale/TranslationProvider.java b/Bukkit/src/main/java/net/avicus/compendium/locale/TranslationProvider.java
@@ -2,18 +2,13 @@
 
 import com.google.common.base.Joiner;
 import java.io.IOException;
-import java.io.InputStream;
 import java.lang.reflect.Field;
 import java.lang.reflect.Modifier;
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Locale;
-import net.avicus.compendium.locale.LocaleBundle;
-import net.avicus.compendium.locale.LocaleStrings;
 import net.avicus.compendium.locale.text.LocalizedFormat;
-import org.bukkit.plugin.Plugin;
-import org.jdom2.JDOMException;
 
 public class TranslationProvider {
 
diff --git a/Bukkit/src/main/java/net/avicus/compendium/menu/inventory/ClickableInventoryHandler.java b/Bukkit/src/main/java/net/avicus/compendium/menu/inventory/ClickableInventoryHandler.java
@@ -1,7 +1,6 @@
 package net.avicus.compendium.menu.inventory;
 
 import java.util.Optional;
-import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
 
 /**
diff --git a/Bukkit/src/main/java/net/avicus/compendium/menu/inventory/ClickableInventoryMenuItem.java b/Bukkit/src/main/java/net/avicus/compendium/menu/inventory/ClickableInventoryMenuItem.java
@@ -1,7 +1,6 @@
 package net.avicus.compendium.menu.inventory;
 
 import net.avicus.compendium.menu.MenuItem;
-import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
 
 /**
diff --git a/Bukkit/src/main/java/net/avicus/compendium/menu/inventory/InventoryHandler.java b/Bukkit/src/main/java/net/avicus/compendium/menu/inventory/InventoryHandler.java
@@ -1,7 +1,6 @@
 package net.avicus.compendium.menu.inventory;
 
 import java.util.Optional;
-import org.bukkit.event.inventory.ClickType;
 import org.bukkit.event.inventory.InventoryClickEvent;
 
 /**
diff --git a/Bukkit/src/main/java/net/avicus/compendium/menu/inventory/InventoryMenuAdapter.java b/Bukkit/src/main/java/net/avicus/compendium/menu/inventory/InventoryMenuAdapter.java
@@ -2,7 +2,6 @@
 
 import lombok.AccessLevel;
 import lombok.Getter;
-import org.bukkit.World;
 import org.bukkit.inventory.Inventory;
 import org.bukkit.inventory.InventoryHolder;
 
diff --git a/Bukkit/src/main/java/net/avicus/compendium/plugin/CompendiumPlugin.java b/Bukkit/src/main/java/net/avicus/compendium/plugin/CompendiumPlugin.java
@@ -6,22 +6,17 @@
 import com.sk89q.minecraft.util.commands.CommandUsageException;
 import com.sk89q.minecraft.util.commands.WrappedCommandException;
 import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
 import lombok.Getter;
 import net.avicus.compendium.AvicusBukkitCommandManager;
+import net.avicus.compendium.AvicusCommandsManager;
 import net.avicus.compendium.boss.BossBarManager;
 import net.avicus.compendium.boss.LegacyBossBarContext;
-import net.avicus.compendium.AvicusCommandsManager;
 import net.avicus.compendium.commands.AvicusCommandsRegistration;
 import net.avicus.compendium.commands.UtilityCommands;
 import net.avicus.compendium.commands.exception.AbstractTranslatableCommandException;
 import net.avicus.compendium.countdown.CountdownCommands;
 import net.avicus.compendium.countdown.CountdownManager;
 import net.avicus.compendium.locale.LocaleBundle;
-import net.avicus.compendium.locale.LocaleStrings;
 import net.avicus.compendium.locale.TranslationProvider;
 import net.avicus.compendium.locale.text.UnlocalizedText;
 import net.avicus.compendium.menu.inventory.InventoryListener;
@@ -32,7 +27,6 @@
 import org.bukkit.plugin.PluginManager;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitScheduler;
-import org.jdom2.JDOMException;
 
 public class CompendiumPlugin extends JavaPlugin {
 
@@ -118,6 +112,6 @@ public boolean onCommand(CommandSender sender, Command command, String name, Str
   }
 
   private void locales() throws IllegalStateException {
-    bundle = TranslationProvider.loadBundle(getDataFolder().getAbsolutePath() + File.separator + "locales", "en_US", "en_ES");
+    bundle = TranslationProvider.loadBundle(getDataFolder().getAbsolutePath() + File.separator + "locales", "en_US", "es_ES");
   }
 }
diff --git a/Bukkit/src/main/java/net/avicus/compendium/utils/FileBackedKVSet.java b/Bukkit/src/main/java/net/avicus/compendium/utils/FileBackedKVSet.java
@@ -1,5 +1,6 @@
 package net.avicus.compendium.utils;
 
+import com.google.common.collect.Maps;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
@@ -11,6 +12,10 @@
 import java.util.Map.Entry;
 import java.util.Optional;
 import java.util.Properties;
+import org.jdom2.Content;
+import org.jdom2.Document;
+import org.jdom2.Element;
+import org.jdom2.input.SAXBuilder;
 
 /**
  * A key->value representation of objects which can be parsed from .properties and .txt files.
@@ -50,13 +55,10 @@ public void load(Path root) throws IOException {
         .forEach(
             (f) -> {
               String file = f.toString();
-              if (file.endsWith(".properties") || file.endsWith(".xml")) {
+              if (file.endsWith(".properties")) {
                 try (InputStream stream = new FileInputStream(file)) {
                   Properties prop = new Properties();
-                  if (file.endsWith(".xml"))
-                    prop.loadFromXML(stream);
-                  else
-                    prop.load(stream);
+                  prop.load(stream);
                   for (Entry<Object, Object> entry : prop.entrySet()) {
                     Object k = entry.getKey();
                     Object v = entry.getValue();
@@ -76,10 +78,55 @@ public void load(Path root) throws IOException {
                 } catch (IOException e) {
                   e.printStackTrace();
                 }
+              } else if (file.endsWith(".xml")) {
+                SAXBuilder sax = new SAXBuilder();
+                try (InputStream stream = new FileInputStream(file)) {
+                  Document doc = sax.build(stream);
+                  addAll(fromXml(doc.getRootElement()));
+                } catch (Exception e) {
+                  e.printStackTrace();
+                }
               }
             });
   }
 
+  /**
+   * Create from an XML element.
+   *
+   * @param el The &lt;locale lang="en" country="us"/&gt;
+   */
+  public Map<String, V> fromXml(Element el) {
+    Map<String, V> data = Maps.newHashMap();
+    for (Content content : el.getDescendants()) {
+      if (content instanceof Element) {
+        Element child = (Element) content;
+
+        if (child.getChildren().size() > 0) {
+          continue;
+        }
+
+        String path = getPath(el, child);
+        data.put(path, parse(child.getTextTrim().replaceAll(" +", " ")));
+      }
+    }
+
+    return data;
+  }
+
+  private static String getPath(Element exclude, Element nested) {
+    String result = nested.getName();
+    Element curr = nested.getParentElement();
+    while (!curr.equals(exclude)) {
+      result = curr.getName() + "." + result;
+      curr = curr.getParentElement();
+    }
+    return result;
+  }
+
+  public void addAll(Map<String, V> toAdd) {
+    data.putAll(toAdd);
+  }
+
   /**
    * Add a value represented by a key to the collection of parsed data
    *
diff --git a/Bukkit/src/main/resources/locales/en_US/en_US.xml b/Bukkit/src/main/resources/locales/en_US/en_US.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE locale>
 <locale country="us" lang="en">
   <generic>
     <settings>Settings</settings>
diff --git a/Bukkit/src/main/resources/locales/es_ES/es_ES.xml b/Bukkit/src/main/resources/locales/es_ES/es_ES.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
+<!DOCTYPE locale>
 <locale country="es" lang="es">
   <generic>
     <settings>Opciones</settings>
diff --git a/Bukkit/src/test/java/net/avicus/compendium/LocaleTests.java b/Bukkit/src/test/java/net/avicus/compendium/LocaleTests.java
@@ -1,7 +1,6 @@
 package net.avicus.compendium;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.net.URISyntaxException;
 import java.net.URL;
 import java.nio.file.Paths;

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`<?xml version="1.0" encoding="utf-8" ?>`
	`2`	`+<!DOCTYPE locale>`
`2`	`3`	`<locale country="us" lang="en">`
`3`	`4`	`<generic>`
`4`	`5`	`<settings>Settings</settings>`