diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/ArchivePacker.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/ArchivePacker.java index 239a5ebb280456fc58be9bc047830cee584982e9..947697e6cc8d85673b0f736494bb329cdb0aaa18 100644 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/ArchivePacker.java +++ b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/utils/ArchivePacker.java @@ -3,7 +3,6 @@ package de.hft.stuttgart.citydoctor2.utils; import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel; import de.hft.stuttgart.citydoctor2.zip.CityGmlZipArchive; import de.hft.stuttgart.citydoctor2.zip.CityGmlZipEntry; -import de.hft.stuttgart.citydoctor2.zip.ErroneousEntry; import org.apache.commons.io.FileUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -32,7 +31,7 @@ public class ArchivePacker { tmpDir = Files.createTempDirectory("zipTmp"); tmpDir.toFile().deleteOnExit(); for (CityGmlZipEntry entry : archive.getEntries()) { - if (entry instanceof ErroneousEntry){ + if (entry.getErrorType() != null){ continue; } CityDoctorModel model = entry.getModel(); diff --git a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/ErroneousEntry.java b/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/ErroneousEntry.java deleted file mode 100644 index 16bdd0cdc71aa42cab77e98b27045ae56d93d163..0000000000000000000000000000000000000000 --- a/CityDoctorParent/CityDoctorModel/src/main/java/de/hft/stuttgart/citydoctor2/zip/ErroneousEntry.java +++ /dev/null @@ -1,25 +0,0 @@ -package de.hft.stuttgart.citydoctor2.zip; - -import de.hft.stuttgart.citydoctor2.datastructure.CityDoctorModel; - -import java.util.zip.ZipEntry; - -public class ErroneousEntry extends CityGmlZipEntry { - - private ZipEntryErrorType errorType = null; - - public ErroneousEntry(String filename, ZipEntryErrorType errorType){ - super(filename, true); - this.errorType = errorType; - } - - - @Override - public CityDoctorModel getModel(){ - return null; - } - - public ZipEntryErrorType getErrorType() { - return errorType; - } -} diff --git a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java index 0dd44396e38b5cc6c3f26d69079a95266e2bf2dc..cbd09cbdce17f79a7e79375dc9f04bc7350517c0 100644 --- a/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java +++ b/CityDoctorParent/CityDoctorModel/src/test/java/de/hft/stuttgart/citydoctor2/zip/ZipTest.java @@ -34,7 +34,7 @@ public class ZipTest { for (CityGmlZipEntry entry : cgmlArch.getEntries()) { assertNotNull(entry); assertTrue(entry.getFileName().matches("^mock[1-5].gml$")); - assertFalse(entry instanceof ErroneousEntry); + assertNull(entry.getErrorType()); assertNotNull(entry.getModel()); assertEquals(1, entry.getModel().getNumberOfFeatures()); }