From 3f0d0bbffe695458ce55d30a2219f17da751b822 Mon Sep 17 00:00:00 2001 From: P0nk Date: Thu, 9 Sep 2021 21:49:29 +0200 Subject: [PATCH] Rename and clean up MapleDataEntity --- src/main/java/provider/Data.java | 2 +- .../provider/{MapleDataEntity.java => DataEntity.java} | 5 ++--- src/main/java/provider/MapleDataEntry.java | 2 +- src/main/java/provider/MapleDataTool.java | 2 +- src/main/java/provider/wz/WZDirectoryEntry.java | 4 ++-- src/main/java/provider/wz/WZEntry.java | 8 ++++---- src/main/java/provider/wz/WZFileEntry.java | 4 ++-- src/main/java/provider/wz/XMLDomMapleData.java | 4 ++-- 8 files changed, 15 insertions(+), 16 deletions(-) rename src/main/java/provider/{MapleDataEntity.java => DataEntity.java} (93%) diff --git a/src/main/java/provider/Data.java b/src/main/java/provider/Data.java index fb72c66250..77457d8a80 100644 --- a/src/main/java/provider/Data.java +++ b/src/main/java/provider/Data.java @@ -25,7 +25,7 @@ import provider.wz.DataType; import java.util.List; -public interface Data extends MapleDataEntity, Iterable { +public interface Data extends DataEntity, Iterable { @Override String getName(); DataType getType(); diff --git a/src/main/java/provider/MapleDataEntity.java b/src/main/java/provider/DataEntity.java similarity index 93% rename from src/main/java/provider/MapleDataEntity.java rename to src/main/java/provider/DataEntity.java index 3493587a74..59c2ccffeb 100644 --- a/src/main/java/provider/MapleDataEntity.java +++ b/src/main/java/provider/DataEntity.java @@ -22,10 +22,9 @@ package provider; /** - * * @author Matze */ -public interface MapleDataEntity { +public interface DataEntity { String getName(); - MapleDataEntity getParent(); + DataEntity getParent(); } diff --git a/src/main/java/provider/MapleDataEntry.java b/src/main/java/provider/MapleDataEntry.java index 8ac8abadc9..6c99f84711 100644 --- a/src/main/java/provider/MapleDataEntry.java +++ b/src/main/java/provider/MapleDataEntry.java @@ -25,7 +25,7 @@ package provider; * * @author Matze */ -public interface MapleDataEntry extends MapleDataEntity { +public interface MapleDataEntry extends DataEntity { String getName(); int getSize(); int getChecksum(); diff --git a/src/main/java/provider/MapleDataTool.java b/src/main/java/provider/MapleDataTool.java index 69463f3bb2..93a7e413ed 100644 --- a/src/main/java/provider/MapleDataTool.java +++ b/src/main/java/provider/MapleDataTool.java @@ -155,7 +155,7 @@ public class MapleDataTool { public static String getFullDataPath(Data data) { String path = ""; - MapleDataEntity myData = data; + DataEntity myData = data; while (myData != null) { path = myData.getName() + "/" + path; myData = myData.getParent(); diff --git a/src/main/java/provider/wz/WZDirectoryEntry.java b/src/main/java/provider/wz/WZDirectoryEntry.java index 8c2310cf72..4014cf9f05 100644 --- a/src/main/java/provider/wz/WZDirectoryEntry.java +++ b/src/main/java/provider/wz/WZDirectoryEntry.java @@ -22,7 +22,7 @@ package provider.wz; import provider.DataDirectoryEntry; -import provider.MapleDataEntity; +import provider.DataEntity; import provider.MapleDataEntry; import provider.MapleDataFileEntry; @@ -33,7 +33,7 @@ public class WZDirectoryEntry extends WZEntry implements DataDirectoryEntry { private List files = new ArrayList<>(); private Map 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); } diff --git a/src/main/java/provider/wz/WZEntry.java b/src/main/java/provider/wz/WZEntry.java index 1e921b2082..e91459b960 100644 --- a/src/main/java/provider/wz/WZEntry.java +++ b/src/main/java/provider/wz/WZEntry.java @@ -21,7 +21,7 @@ */ package provider.wz; -import provider.MapleDataEntity; +import provider.DataEntity; import provider.MapleDataEntry; public class WZEntry implements MapleDataEntry { @@ -29,9 +29,9 @@ public class WZEntry implements MapleDataEntry { private int size; private int checksum; 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(); this.name = name; this.size = size; @@ -55,7 +55,7 @@ public class WZEntry implements MapleDataEntry { return offset; } - public MapleDataEntity getParent() { + public DataEntity getParent() { return parent; } } diff --git a/src/main/java/provider/wz/WZFileEntry.java b/src/main/java/provider/wz/WZFileEntry.java index 792371d9cf..acf9aa1eeb 100644 --- a/src/main/java/provider/wz/WZFileEntry.java +++ b/src/main/java/provider/wz/WZFileEntry.java @@ -21,13 +21,13 @@ */ package provider.wz; -import provider.MapleDataEntity; +import provider.DataEntity; import provider.MapleDataFileEntry; public class WZFileEntry extends WZEntry implements MapleDataFileEntry { 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); } diff --git a/src/main/java/provider/wz/XMLDomMapleData.java b/src/main/java/provider/wz/XMLDomMapleData.java index 828823a274..0b92d45328 100644 --- a/src/main/java/provider/wz/XMLDomMapleData.java +++ b/src/main/java/provider/wz/XMLDomMapleData.java @@ -28,7 +28,7 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; import org.xml.sax.SAXException; import provider.Data; -import provider.MapleDataEntity; +import provider.DataEntity; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -186,7 +186,7 @@ public class XMLDomMapleData implements Data { } @Override - public synchronized MapleDataEntity getParent() { + public synchronized DataEntity getParent() { Node parentNode; parentNode = node.getParentNode(); if (parentNode.getNodeType() == Node.DOCUMENT_NODE) {