BETA: Using xml filter in zones and skill trees

L2J_Server_BETA/java/com/l2jserver/gameserver/datatables/SkillTreesData.java

@@ -39,6 +39,7 @@ import com.l2jserver.gameserver.model.base.Race;
 import com.l2jserver.gameserver.model.base.SubClass;
 import com.l2jserver.gameserver.templates.StatsSet;
 import com.l2jserver.gameserver.util.Util;
+import com.l2jserver.util.file.filter.XMLFilter;
 
 /**
  * @author Zoey76
@@ -69,7 +70,7 @@ public final class SkillTreesData
 	/**
 	 * Parent class IDs are read from XML and stored in this map, to allow easy customization.
 	 */
-	private FastMap<ClassId, ClassId> _parentClassMap = new FastMap<ClassId, ClassId>();
+	private final FastMap<ClassId, ClassId> _parentClassMap = new FastMap<ClassId, ClassId>();
 	
 	private SkillTreesData()
 	{
@@ -138,13 +139,10 @@ public final class SkillTreesData
 	private boolean loadFiles()
 	{
 		File folder = new File(Config.DATAPACK_ROOT, "data/skillTrees/");
-		File[] listOfFiles = folder.listFiles();
+		File[] listOfFiles = folder.listFiles(new XMLFilter());
 		for (File f : listOfFiles)
 		{
-			if (f.getName().endsWith(".xml"))
-			{
-				loadSkillTree(f);
-			}
+			loadSkillTree(f);
 		}
 		return false;
 	}

L2J_Server_BETA/java/com/l2jserver/gameserver/instancemanager/ZoneManager.java

@@ -49,6 +49,7 @@ import com.l2jserver.gameserver.model.zone.form.ZoneNPoly;
 import com.l2jserver.gameserver.model.zone.type.L2ArenaZone;
 import com.l2jserver.gameserver.model.zone.type.L2OlympiadStadiumZone;
 import com.l2jserver.gameserver.model.zone.type.L2RespawnZone;
+import com.l2jserver.util.file.filter.XMLFilter;
 
 /**
  * This class manages the zones
@@ -138,14 +139,14 @@ public class ZoneManager
 				return;
 			}
 			
-			File[] files = dir.listFiles();
+			File[] files = dir.listFiles(new XMLFilter());
 			FastList<File> hash = new FastList<File>(files.length);
 			for (File f : files)
 			{
 				// default file first
 				if ("zone.xml".equalsIgnoreCase(f.getName()))
 					hash.addFirst(f);
-				else if (f.getName().endsWith(".xml"))
+				else
 					hash.add(f);
 			}
 			

L2J_Server_BETA/java/com/l2jserver/util/file/filter/XMLFilter.java

@@ -32,9 +32,7 @@ public class XMLFilter implements FileFilter
 	@Override
 	public boolean accept(File pathname)
 	{
-		if (pathname.getName().endsWith(".xml"))
-			return true;
-		return false;
+		return pathname.getName().endsWith(".xml");
 	}
 	
 }