Sweetgum/sweetgum-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename and clean up MapleData

Browse Source
This commit is contained in:
P0nk
2021-09-09 21:48:28 +02:00
parent 48f2647742
commit 2281aec440
64 changed files with 432 additions and 433 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/provider/wz/XMLDomMapleData.java
View File

@@ -27,7 +27,7 @@ import org.w3c.dom.NamedNodeMap;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
import provider.MapleData;
import provider.Data;
import provider.MapleDataEntity;
import javax.xml.parsers.DocumentBuilder;
@@ -41,7 +41,7 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
public class XMLDomMapleData implements MapleData {
public class XMLDomMapleData implements Data {
private Node node;
private File imageDataDir;
@@ -66,10 +66,10 @@ public class XMLDomMapleData implements MapleData {
}
@Override
public synchronized MapleData getChildByPath(String path) { // the whole XML reading system seems susceptible to give nulls on strenuous read scenarios
public synchronized Data getChildByPath(String path) { // the whole XML reading system seems susceptible to give nulls on strenuous read scenarios
String[] segments = path.split("/");
if (segments[0].equals("..")) {
return ((MapleData) getParent()).getChildByPath(path.substring(path.indexOf("/") + 1));
return ((Data) getParent()).getChildByPath(path.substring(path.indexOf("/") + 1));
}
Node myNode;
@@ -96,8 +96,8 @@ public class XMLDomMapleData implements MapleData {
}
@Override
public synchronized List<MapleData> getChildren() {
List<MapleData> ret = new ArrayList<>();
public synchronized List<Data> getChildren() {
List<Data> ret = new ArrayList<>();
NodeList childNodes = node.getChildNodes();
for (int i = 0; i < childNodes.getLength(); i++) {
@@ -203,7 +203,7 @@ public class XMLDomMapleData implements MapleData {
}
@Override
public synchronized Iterator<MapleData> iterator() {
public synchronized Iterator<Data> iterator() {
return getChildren().iterator();
}
}

9
src/main/java/provider/wz/XMLWZFile.java
View File

@@ -21,13 +21,14 @@
*/
package provider.wz;
import provider.Data;
import provider.MapleDataDirectoryEntry;
import provider.MapleDataProvider;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import provider.MapleData;
import provider.MapleDataDirectoryEntry;
import provider.MapleDataProvider;
public class XMLWZFile implements MapleDataProvider {
private File root;
@@ -53,7 +54,7 @@ public class XMLWZFile implements MapleDataProvider {
}
@Override
public synchronized MapleData getData(String path) {
public synchronized Data getData(String path) {
File dataFile = new File(root, path + ".xml");
File imageDataDir = new File(root, path);
if (!dataFile.exists()) {