Rename and clean up MapleDataEntity

This commit is contained in:
P0nk
2021-09-09 21:49:29 +02:00
parent f3cae06288
commit 3f0d0bbffe
8 changed files with 15 additions and 16 deletions

View File

@@ -25,7 +25,7 @@ import provider.wz.DataType;
import java.util.List; import java.util.List;
public interface Data extends MapleDataEntity, Iterable<Data> { public interface Data extends DataEntity, Iterable<Data> {
@Override @Override
String getName(); String getName();
DataType getType(); DataType getType();

View File

@@ -22,10 +22,9 @@
package provider; package provider;
/** /**
*
* @author Matze * @author Matze
*/ */
public interface MapleDataEntity { public interface DataEntity {
String getName(); String getName();
MapleDataEntity getParent(); DataEntity getParent();
} }

View File

@@ -25,7 +25,7 @@ package provider;
* *
* @author Matze * @author Matze
*/ */
public interface MapleDataEntry extends MapleDataEntity { public interface MapleDataEntry extends DataEntity {
String getName(); String getName();
int getSize(); int getSize();
int getChecksum(); int getChecksum();

View File

@@ -155,7 +155,7 @@ public class MapleDataTool {
public static String getFullDataPath(Data data) { public static String getFullDataPath(Data data) {
String path = ""; String path = "";
MapleDataEntity myData = data; DataEntity myData = data;
while (myData != null) { while (myData != null) {
path = myData.getName() + "/" + path; path = myData.getName() + "/" + path;
myData = myData.getParent(); myData = myData.getParent();

View File

@@ -22,7 +22,7 @@
package provider.wz; package provider.wz;
import provider.DataDirectoryEntry; import provider.DataDirectoryEntry;
import provider.MapleDataEntity; import provider.DataEntity;
import provider.MapleDataEntry; import provider.MapleDataEntry;
import provider.MapleDataFileEntry; import provider.MapleDataFileEntry;
@@ -33,7 +33,7 @@ public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry {
private List<MapleDataFileEntry> files = new ArrayList<>(); private List<MapleDataFileEntry> files = new ArrayList<>();
private Map<String, MapleDataEntry> entries = new HashMap<>(); private Map<String, MapleDataEntry> entries = new HashMap<>();
public WZDirectoryEntry(String name, int size, int checksum, MapleDataEntity parent) { public WZDirectoryEntry(String name, int size, int checksum, DataEntity parent) {
super(name, size, checksum, parent); super(name, size, checksum, parent);
} }

View File

@@ -21,7 +21,7 @@
*/ */
package provider.wz; package provider.wz;
import provider.MapleDataEntity; import provider.DataEntity;
import provider.MapleDataEntry; import provider.MapleDataEntry;
public class WZEntry implements MapleDataEntry { public class WZEntry implements MapleDataEntry {
@@ -29,9 +29,9 @@ public class WZEntry implements MapleDataEntry {
private int size; private int size;
private int checksum; private int checksum;
private int offset; private int offset;
private MapleDataEntity parent; private DataEntity parent;
public WZEntry(String name, int size, int checksum, MapleDataEntity parent) { public WZEntry(String name, int size, int checksum, DataEntity parent) {
super(); super();
this.name = name; this.name = name;
this.size = size; this.size = size;
@@ -55,7 +55,7 @@ public class WZEntry implements MapleDataEntry {
return offset; return offset;
} }
public MapleDataEntity getParent() { public DataEntity getParent() {
return parent; return parent;
} }
} }

View File

@@ -21,13 +21,13 @@
*/ */
package provider.wz; package provider.wz;
import provider.MapleDataEntity; import provider.DataEntity;
import provider.MapleDataFileEntry; import provider.MapleDataFileEntry;
public class WZFileEntry extends WZEntry implements MapleDataFileEntry { public class WZFileEntry extends WZEntry implements MapleDataFileEntry {
private int offset; private int offset;
public WZFileEntry(String name, int size, int checksum, MapleDataEntity parent) { public WZFileEntry(String name, int size, int checksum, DataEntity parent) {
super(name, size, checksum, parent); super(name, size, checksum, parent);
} }

View File

@@ -28,7 +28,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
import org.xml.sax.SAXException; import org.xml.sax.SAXException;
import provider.Data; import provider.Data;
import provider.MapleDataEntity; import provider.DataEntity;
import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.DocumentBuilderFactory;
@@ -186,7 +186,7 @@ public class XMLDomMapleData implements Data {
} }
@Override @Override
public synchronized MapleDataEntity getParent() { public synchronized DataEntity getParent() {
Node parentNode; Node parentNode;
parentNode = node.getParentNode(); parentNode = node.getParentNode();
if (parentNode.getNodeType() == Node.DOCUMENT_NODE) { if (parentNode.getNodeType() == Node.DOCUMENT_NODE) {