--- a/src/main/java/de/unixwork/uwproj/Target.java Wed Sep 06 21:08:04 2023 +0200 +++ b/src/main/java/de/unixwork/uwproj/Target.java Wed Sep 06 22:55:42 2023 +0200 @@ -1,29 +1,21 @@ -/* - * 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 Target { private String name; private String prefix; - private List<String> dependencies = new LinkedList<>(); - private List<String> optionalDependencies = new LinkedList<>(); - private List<Define> defines = new LinkedList<>(); - private List<Feature> features = new LinkedList<>(); - private List<Option> options = new LinkedList<>(); + private final List<String> dependencies = new LinkedList<>(); + private final List<String> optionalDependencies = new LinkedList<>(); + private final List<Define> defines = new LinkedList<>(); + private final List<Feature> features = new LinkedList<>(); + private final List<Option> options = new LinkedList<>(); private boolean allDependencies = false; @@ -31,7 +23,7 @@ Target target = new Target(); String name = element.getAttribute("name"); - if(name.length() > 0) { + if(!name.isEmpty()) { target.setName(name); } @@ -47,12 +39,12 @@ } else 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"); } target.addDefine(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();