From 37d248dea50285545991defde5f33bdc0be6bd21 Mon Sep 17 00:00:00 2001 From: njames Date: Mon, 9 Jan 2017 12:18:07 -0600 Subject: Read targetTypeExtension tag from target_types_hb.xml --- src/com/ibm/ServerWizard2/model/SystemModel.java | 25 +++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'src') diff --git a/src/com/ibm/ServerWizard2/model/SystemModel.java b/src/com/ibm/ServerWizard2/model/SystemModel.java index f3f0c41..ba6a394 100644 --- a/src/com/ibm/ServerWizard2/model/SystemModel.java +++ b/src/com/ibm/ServerWizard2/model/SystemModel.java @@ -598,17 +598,20 @@ public class SystemModel { builder.setErrorHandler(new XmlHandler()); Document document = builder.parse(fileName); - NodeList targetList = document.getElementsByTagName("targetType"); - for (int i = 0; i < targetList.getLength(); ++i) { - Element t = (Element) targetList.item(i); - Target target = new Target(); - target.readModelXML(t, attributes); - Target tmp = targetModels.get(target.getType()); - if (tmp != null) { - ServerWizard2.LOGGER.info("Target Exists so merging: " + target.getType()); - tmp.readModelXML(t, attributes); - } else { - targetModels.put(target.getType(), target); + String[] tags = {"targetType","targetTypeExtension"}; + for (String tag : tags) { + NodeList targetList = document.getElementsByTagName(tag); + for (int i = 0; i < targetList.getLength(); ++i) { + Element t = (Element) targetList.item(i); + Target target = new Target(); + target.readModelXML(t, attributes); + Target tmp = targetModels.get(target.getType()); + if (tmp != null) { + ServerWizard2.LOGGER.info("Target Exists so merging: " + target.getType()); + tmp.readModelXML(t, attributes); + } else { + targetModels.put(target.getType(), target); + } } } for (Map.Entry entry : targetModels.entrySet()) { -- cgit v1.2.1