diff -r 3ca85da78515 -r b42bfc9e9983 src/main/java/de/unixwork/uwproj/TargetData.java --- a/src/main/java/de/unixwork/uwproj/TargetData.java Wed Sep 06 21:08:04 2023 +0200 +++ b/src/main/java/de/unixwork/uwproj/TargetData.java Wed Sep 06 22:55:42 2023 +0200 @@ -1,24 +1,16 @@ -/* - * To change this license header, choose License Headers in Project Properties. - * To change this template file, choose Tools | Templates - * and open the template in the editor. - */ package de.unixwork.uwproj; -import java.util.LinkedList; -import java.util.List; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -/** - * - * @author olaf - */ +import java.util.LinkedList; +import java.util.List; + public class TargetData { - private List defines = new LinkedList<>(); - private List dependencies = new LinkedList<>(); - private StringBuilder make = new StringBuilder(); + private final List defines = new LinkedList<>(); + private final List dependencies = new LinkedList<>(); + private final StringBuilder make = new StringBuilder(); public static TargetData parse(Element element) throws Exception { TargetData data = new TargetData(); @@ -32,19 +24,19 @@ if(n.equals("define")) { String def = elm.getAttribute("name"); String defval = elm.getAttribute("value"); - if(def == null) { + if (def.isBlank()) { throw new Exception("define element requires name attribute"); } data.addDefine(new Define(def, defval)); } else if(n.equals("dependencies")) { - String deps = Xml.getContent(elm); + String deps = Util.getContent(elm); String[] dependencies = deps.split(","); for(String dependency : dependencies) { dependency = dependency.trim(); data.addDependency(dependency); } } else if(n.equals("make")) { - String m = Xml.getContent(elm); + String m = Util.getContent(elm); data.addMake(m); } }