gitignore

Tobias Wiessner · Tobias Wiessner · commit 508f53408ada · 2025-05-27T09:53:36.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,31 @@
+# Build
+out
+
+# Intellij
+.idea
+*.iml
+
+# Compiled class file
+*.class
+
+# Log file
+*.log
+
+# BlueJ files
+*.ctxt
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.nar
+*.ear
+*.zip
+*.tar.gz
+*.rar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+replay_pid*
diff --git a/LICENSE b/LICENSE
diff --git a/Main.java b/Main.java
@@ -0,0 +1,22 @@
+import de.uni_stuttgart.ils.reqif4j.reqif.ReqIF;
+import de.uni_stuttgart.ils.reqif4j.reqif.ReqIFCoreContent;
+import de.uni_stuttgart.ils.reqif4j.reqif.ReqIFDocument;
+import de.uni_stuttgart.ils.reqif4j.reqif.ReqIFz;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+public class Main {
+    public static void main(String[] args){
+        ReqIFz reqIFz;
+        try {
+            reqIFz = new ReqIFz("");
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+        String name = reqIFz.getName();
+        ReqIFDocument reqIFDocument = reqIFz.getReqIFDocuments().get("Requirements.reqif");
+        ReqIFCoreContent reqIFCoreContent = reqIFDocument.getCoreContent();
+        //reqIFCoreContent.getSpecObjects()
+    }
+}
diff --git a/README.md b/README.md
@@ -3,4 +3,4 @@ Java classes to access Specifications &amp; Requirements stored in the Requireme
 
 This implementation of the Requirements Interchange Format currently uses http://www.lingala.net/zip4j/ for access to .reqifz files.
 
-TODO:	Change to java.util.zip
+Fixed old library dependencies.
diff --git a/de/uni_stuttgart/ils/reqif4j/attributes/AttributeDefinitionDate.java b/de/uni_stuttgart/ils/reqif4j/attributes/AttributeDefinitionDate.java
@@ -0,0 +1,13 @@
+package de.uni_stuttgart.ils.reqif4j.attributes;
+
+import de.uni_stuttgart.ils.reqif4j.datatypes.Datatype;
+import org.w3c.dom.Node;
+
+import java.util.Map;
+
+public class AttributeDefinitionDate extends AttributeDefinition{
+
+    public AttributeDefinitionDate(Node attributeDefinition, Map<String, Datatype> dataTypes) {
+        super(attributeDefinition, dataTypes);
+    }
+}
diff --git a/de/uni_stuttgart/ils/reqif4j/attributes/AttributeValueBoolean.java b/de/uni_stuttgart/ils/reqif4j/attributes/AttributeValueBoolean.java
@@ -6,7 +6,7 @@ public class AttributeValueBoolean extends AttributeValue {
 	public AttributeValueBoolean(String value, AttributeDefinition type) {
 		super(value, type);
 		
-		if(value.toLowerCase().equals("true")) {
+		if(value != null && value.toLowerCase().equals("true")) {
 			this.value = true;
 		}else{
 			this.value = false;
diff --git a/de/uni_stuttgart/ils/reqif4j/attributes/AttributeValueDate.java b/de/uni_stuttgart/ils/reqif4j/attributes/AttributeValueDate.java
@@ -0,0 +1,14 @@
+package de.uni_stuttgart.ils.reqif4j.attributes;
+
+public class AttributeValueDate extends AttributeValue{
+    public AttributeValueDate(String value, AttributeDefinition type) {
+        super(value, type);
+
+
+    }
+
+    @Override
+    public Object getValue() {
+        return (String)this.value;
+    }
+}
diff --git a/de/uni_stuttgart/ils/reqif4j/attributes/AttributeValueXHTML.java b/de/uni_stuttgart/ils/reqif4j/attributes/AttributeValueXHTML.java
@@ -37,12 +37,13 @@ private AttributeValueXHTMLElementList deconstructXHTML(Node xhtmlContent) {
 		
 		AttributeValueXHTMLElementList xhtmlElementList = new AttributeValueXHTMLElementList();
 		
-		Node div = ((Element)xhtmlContent).getElementsByTagName("xhtml:div").item(0);
+		Node div = ((Element)xhtmlContent).getElementsByTagName(XHTML.DIV).item(0);
 		
 		for(int e=0; e < div.getChildNodes().getLength(); e++) {
 			Node xhtmlElement = div.getChildNodes().item(e);
 			String elementName = div.getChildNodes().item(e).getNodeName();
-			if(elementName.contains("xhtml:")) {
+			xhtmlElementList.add(elementName, decostructXHTMLElement(elementName, xhtmlElement));
+			/*if(elementName.contains("xhtml:")) {
 				if(elementName.endsWith("p")) {
 					xhtmlElementList.add("P",decostructXHTMLElement("P", xhtmlElement));
 				}else if(elementName.endsWith("table")) {
@@ -54,7 +55,7 @@ private AttributeValueXHTMLElementList deconstructXHTML(Node xhtmlContent) {
 				}else if(elementName.contains("object")) {
 					xhtmlElementList.add("OBJ",decostructXHTMLElement("OBJ", xhtmlElement));
 				}
-			}
+			}*/
 		}
 		return xhtmlElementList;
 	}
diff --git a/de/uni_stuttgart/ils/reqif4j/attributes/XHTML.java b/de/uni_stuttgart/ils/reqif4j/attributes/XHTML.java
@@ -2,26 +2,26 @@
 
 public class XHTML {
 	
-	public static final String DIV = "xhtml:div";
+	public static final String DIV = "div";
 
 	// beginsWith
-	public static final String BR = "xhtml:br";
-	public static final String H = "xhtml:h";
+	public static final String BR = "br";
+	public static final String H = "h";
 	
 	// equals
-	public static final String LI = "xhtml:li";
-	public static final String OBJECT = "xhtml:object";
-	public static final String P = "xhtml:p";
-	public static final String SPAN = "xhtml:span";
-	public static final String TBODY = "xhtml:tbody";
-	public static final String TBL = "xhtml:table";
-	public static final String TEXT = "xhtml:text";
-	public static final String TD = "xhtml:td";
-	public static final String TH = "xhtml:th";
-	public static final String THEAD = "xhtml:thead";
-	public static final String TR = "xhtml:tr";
-	public static final String UL = "xhtml:ul";
-	public static final String VAR = "xhtml:var";
+	public static final String LI = "li";
+	public static final String OBJECT = "object";
+	public static final String P = "p";
+	public static final String SPAN = "span";
+	public static final String TBODY = "tbody";
+	public static final String TBL = "table";
+	public static final String TEXT = "text";
+	public static final String TD = "td";
+	public static final String TH = "th";
+	public static final String THEAD = "thead";
+	public static final String TR = "tr";
+	public static final String UL = "ul";
+	public static final String VAR = "var";
 	
 	//#text
 	public static final String _TEXT = "#text";
diff --git a/de/uni_stuttgart/ils/reqif4j/datatypes/DatatypeDate.java b/de/uni_stuttgart/ils/reqif4j/datatypes/DatatypeDate.java
@@ -0,0 +1,11 @@
+package de.uni_stuttgart.ils.reqif4j.datatypes;
+
+import de.uni_stuttgart.ils.reqif4j.reqif.ReqIFConst;
+
+import javax.xml.crypto.Data;
+
+public class DatatypeDate extends Datatype {
+    public DatatypeDate(String id, String name) {
+        super(id, name, ReqIFConst.DATE);
+    }
+}
diff --git a/de/uni_stuttgart/ils/reqif4j/datatypes/DatatypeEnumeration.java b/de/uni_stuttgart/ils/reqif4j/datatypes/DatatypeEnumeration.java
@@ -26,6 +26,9 @@ public String getName() {
 	}
 	
 	public String getEnumValueName(String id) {
+		if(this.enumValues.get(id) == null) {
+			return null;
+		}
 		return this.enumValues.get(id).getName();
 	}
 	
diff --git a/de/uni_stuttgart/ils/reqif4j/reqif/ReqIFConst.java b/de/uni_stuttgart/ils/reqif4j/reqif/ReqIFConst.java
@@ -47,6 +47,7 @@ public class ReqIFConst {
 	public final static String STRING = "STRING";
 	public final static String ENUMERATION = "ENUMERATION";
 	public final static String XHTML = "XHTML";
+	public final static String DATE = "DATE";
 	public final static String UNDEFINED = "UNDEFINED";
 	
 	public final static String REQ = "REQ";
diff --git a/de/uni_stuttgart/ils/reqif4j/reqif/ReqIFCoreContent.java b/de/uni_stuttgart/ils/reqif4j/reqif/ReqIFCoreContent.java
@@ -5,16 +5,11 @@
 import java.util.List;
 import java.util.Map;
 
+import de.uni_stuttgart.ils.reqif4j.datatypes.*;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
-import de.uni_stuttgart.ils.reqif4j.datatypes.Datatype;
-import de.uni_stuttgart.ils.reqif4j.datatypes.DatatypeBoolean;
-import de.uni_stuttgart.ils.reqif4j.datatypes.DatatypeEnumeration;
-import de.uni_stuttgart.ils.reqif4j.datatypes.DatatypeInteger;
-import de.uni_stuttgart.ils.reqif4j.datatypes.DatatypeString;
-import de.uni_stuttgart.ils.reqif4j.datatypes.DatatypeXHTML;
 import de.uni_stuttgart.ils.reqif4j.specification.SpecHierarchy;
 import de.uni_stuttgart.ils.reqif4j.specification.SpecObject;
 import de.uni_stuttgart.ils.reqif4j.specification.SpecObjectType;
@@ -122,6 +117,7 @@ public ReqIFCoreContent(Element coreContent) {
 						
 						case ReqIFConst.XHTML: 			this.dataTypes.put(dataTypeID, new DatatypeXHTML(dataTypeID, dataTypeName));
 														break;
+						case ReqIFConst.DATE:			this.dataTypes.put(dataTypeID, new DatatypeDate(dataTypeID, dataTypeName));
 											
 						default:						this.dataTypes.put(null, new Datatype(dataTypeID, dataTypeName, ReqIFConst.UNDEFINED));
 														break;
diff --git a/de/uni_stuttgart/ils/reqif4j/reqif/ReqIFz.java b/de/uni_stuttgart/ils/reqif4j/reqif/ReqIFz.java
@@ -1,56 +1,74 @@
 package de.uni_stuttgart.ils.reqif4j.reqif;
 
-import java.io.InputStream;
+import java.io.*;
 import java.util.HashMap;
-
-import net.lingala.zip4j.core.ZipFile;
-import net.lingala.zip4j.exception.ZipException;
-import net.lingala.zip4j.model.FileHeader;
+import java.util.Map;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
 
 public class ReqIFz extends ReqIFFile {
-	
-	
-	public ReqIFz(String filePath) {				//		TODO: use java.util.zip
-		
-		try {
-			
-			ZipFile zipFile = new ZipFile(filePath);
-			
-			this.path = zipFile.getFile().getPath();
-			this.name = zipFile.getFile().getName();
-			
-			for(Object object: zipFile.getFileHeaders()) {
-				
-				FileHeader fileHeader = (FileHeader) object;
-				
-				if(fileHeader != null && fileHeader.getFileName().endsWith("reqif")) {
-					
-					this.numberOfReqIFDocuments++;
-					FileHeader picturesFolderFileHeader = zipFile.getFileHeader(fileHeader.getFileName().split("\\.")[0]);
-					if(picturesFolderFileHeader != null) {
-						
-						picturesIS = new HashMap<String, InputStream>();
-						for(Object obj2: zipFile.getFileHeaders()) {
-							
-							FileHeader pictureFileHeader = (FileHeader) obj2;
-							String pictureFileName = pictureFileHeader.getFileName().substring(pictureFileHeader.getFileName().lastIndexOf(System.getProperty("file.separator")));
-							if( pictureFileName.endsWith("png")   ||
-								pictureFileName.endsWith("jpeg")  ||
-								pictureFileName.endsWith("jpg")		  ) {
-								
-								this.picturesIS.put(pictureFileName, zipFile.getInputStream(pictureFileHeader));
-							}
-						}
-						this.picturesInReqIFDocument.put(fileHeader.getFileName().split(".")[0], this.picturesIS);
-					}
-					this.reqifDocuments.put(fileHeader.getFileName(), new ReqIFDocument(zipFile.getInputStream(fileHeader), zipFile.getFile().getPath(), fileHeader.getFileName()));
-				}
-			}
-			
-		} catch (ZipException e) {
-			e.printStackTrace();
-			System.exit(1);
-		}
-	}
 
+    private String path;
+    private String name;
+    private int numberOfReqIFDocuments = 0;
+    private Map<String, ReqIFDocument> reqifDocuments = new HashMap<>();
+    private Map<String, Map<String, InputStream>> picturesInReqIFDocument = new HashMap<>();
+
+    public ReqIFz(String filePath) throws IOException {
+        File destDir = new File(filePath + "_unzipped"); // Extract to a separate directory
+        if (!destDir.exists() && !destDir.mkdirs()) {
+            throw new IOException("Failed to create extraction directory " + destDir);
+        }
+
+        byte[] buffer = new byte[1024];
+        try (ZipInputStream zis = new ZipInputStream(new FileInputStream(filePath))) {
+            ZipEntry zipEntry = zis.getNextEntry();
+
+            while (zipEntry != null) {
+                File newFile = new File(destDir, zipEntry.getName());
+                if (zipEntry.isDirectory()) {
+                    if (!newFile.isDirectory() && !newFile.mkdirs()) {
+                        throw new IOException("Failed to create directory " + newFile);
+                    }
+                } else {
+                    // Fix for Windows-created archives
+                    File parent = newFile.getParentFile();
+                    if (!parent.isDirectory() && !parent.mkdirs()) {
+                        throw new IOException("Failed to create directory " + parent);
+                    }
+
+                    // Write file content
+                    try (FileOutputStream fos = new FileOutputStream(newFile)) {
+                        int len;
+                        while ((len = zis.read(buffer)) > 0) {
+                            fos.write(buffer, 0, len);
+                        }
+                    }
+
+                    // Process reqif files and associated images
+                    if (zipEntry.getName().endsWith("reqif")) {
+                        this.numberOfReqIFDocuments++;
+                        String reqifBaseName = zipEntry.getName().split("\\.")[0];
+                        Map<String, InputStream> picturesIS = new HashMap<>();
+
+                        // Iterate again for images within the same loop
+                        try (ZipInputStream imageZis = new ZipInputStream(new FileInputStream(filePath))) {
+                            ZipEntry imageEntry = imageZis.getNextEntry();
+                            while (imageEntry != null) {
+                                String pictureFileName = new File(imageEntry.getName()).getName();
+                                if (pictureFileName.endsWith("png") || pictureFileName.endsWith("jpeg") || pictureFileName.endsWith("jpg")) {
+                                    picturesIS.put(pictureFileName, new FileInputStream(new File(destDir, imageEntry.getName())));
+                                }
+                                imageEntry = imageZis.getNextEntry();
+                            }
+                        }
+
+                        this.picturesInReqIFDocument.put(reqifBaseName, picturesIS);
+                        this.reqifDocuments.put(zipEntry.getName(), new ReqIFDocument(new FileInputStream(newFile), filePath, zipEntry.getName()));
+                    }
+                }
+                zipEntry = zis.getNextEntry();
+            }
+        }
+    }
 }
diff --git a/de/uni_stuttgart/ils/reqif4j/specification/SpecObject.java b/de/uni_stuttgart/ils/reqif4j/specification/SpecObject.java
diff --git a/de/uni_stuttgart/ils/reqif4j/specification/SpecType.java b/de/uni_stuttgart/ils/reqif4j/specification/SpecType.java

Original file line number	Diff line number	Diff line change
`@@ -3,4 +3,4 @@ Java classes to access Specifications & Requirements stored in the Requireme`
`3`	`3`
`4`	`4`	`This implementation of the Requirements Interchange Format currently uses http://www.lingala.net/zip4j/ for access to .reqifz files.`
`5`	`5`
`6`		`-TODO: Change to java.util.zip`
	`6`	`+Fixed old library dependencies.`