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

6
src/main/java/provider/MapleData.java → src/main/java/provider/Data.java
View File

@@ -25,11 +25,11 @@ import provider.wz.DataType;
import java.util.List;
public interface MapleData extends MapleDataEntity, Iterable<MapleData> {
public interface Data extends MapleDataEntity, Iterable<Data> {
@Override
String getName();
DataType getType();
List<MapleData> getChildren();
MapleData getChildByPath(String path);
List<Data> getChildren();
Data getChildByPath(String path);
Object getData();
}

2
src/main/java/provider/MapleDataProvider.java
View File

@@ -22,6 +22,6 @@
package provider;
public interface MapleDataProvider {
MapleData getData(String path);
Data getData(String path);
MapleDataDirectoryEntry getRoot();
}

42
src/main/java/provider/MapleDataTool.java
View File

@@ -26,11 +26,11 @@ import provider.wz.DataType;
import java.awt.*;
public class MapleDataTool {
public static String getString(MapleData data) {
public static String getString(Data data) {
return ((String) data.getData());
}
public static String getString(MapleData data, String def) {
public static String getString(Data data, String def) {
if (data == null || data.getData() == null) {
return def;
} else {
@@ -38,34 +38,34 @@ public class MapleDataTool {
}
}
public static String getString(String path, MapleData data) {
public static String getString(String path, Data data) {
return getString(data.getChildByPath(path));
}
public static String getString(String path, MapleData data, String def) {
public static String getString(String path, Data data, String def) {
return getString(data.getChildByPath(path), def);
}
public static double getDouble(MapleData data) {
public static double getDouble(Data data) {
return (Double) data.getData();
}
public static float getFloat(MapleData data) {
public static float getFloat(Data data) {
return (Float) data.getData();
}
public static int getInt(MapleData data) {
public static int getInt(Data data) {
if (data == null || data.getData() == null) {
return 0;// DEF?
}
return (Integer) data.getData();
}
public static int getInt(String path, MapleData data) {
public static int getInt(String path, Data data) {
return getInt(data.getChildByPath(path));
}
public static int getIntConvert(MapleData data) {
public static int getIntConvert(Data data) {
if (data.getType() == DataType.STRING) {
return Integer.parseInt(getString(data));
} else {
@@ -73,7 +73,7 @@ public class MapleDataTool {
}
}
public static int getIntConvert(MapleData data, int def) {
public static int getIntConvert(Data data, int def) {
if (data == null) {
return def;
}
@@ -92,8 +92,8 @@ public class MapleDataTool {
}
}
public static int getIntConvert(String path, MapleData data) {
MapleData d = data.getChildByPath(path);
public static int getIntConvert(String path, Data data) {
Data d = data.getChildByPath(path);
if (d.getType() == DataType.STRING) {
return Integer.parseInt(getString(d));
} else {
@@ -101,7 +101,7 @@ public class MapleDataTool {
}
}
public static int getInt(MapleData data, int def) {
public static int getInt(Data data, int def) {
if (data == null || data.getData() == null) {
return def;
} else if (data.getType() == DataType.STRING) {
@@ -116,12 +116,12 @@ public class MapleDataTool {
}
}
public static int getInt(String path, MapleData data, int def) {
public static int getInt(String path, Data data, int def) {
return getInt(data.getChildByPath(path), def);
}
public static int getIntConvert(String path, MapleData data, int def) {
MapleData d = data.getChildByPath(path);
public static int getIntConvert(String path, Data data, int def) {
Data d = data.getChildByPath(path);
if (d == null) {
return def;
}
@@ -137,23 +137,23 @@ public class MapleDataTool {
}
}
public static Point getPoint(MapleData data) {
public static Point getPoint(Data data) {
return ((Point) data.getData());
}
public static Point getPoint(String path, MapleData data) {
public static Point getPoint(String path, Data data) {
return getPoint(data.getChildByPath(path));
}
public static Point getPoint(String path, MapleData data, Point def) {
final MapleData pointData = data.getChildByPath(path);
public static Point getPoint(String path, Data data, Point def) {
final Data pointData = data.getChildByPath(path);
if (pointData == null) {
return def;
}
return getPoint(pointData);
}
public static String getFullDataPath(MapleData data) {
public static String getFullDataPath(Data data) {
String path = "";
MapleDataEntity myData = data;
while (myData != null) {

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()) {