summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authornjames <nkskjames@gmail.com>2017-01-09 12:18:07 -0600
committernjames <nkskjames@gmail.com>2017-01-09 12:18:07 -0600
commit37d248dea50285545991defde5f33bdc0be6bd21 (patch)
tree6e467498eb3639a9b7c8f1e256bbf1db01b74745 /src
parent75735adde51b4962a319eb5833c3bc46a71f750f (diff)
downloadserverwiz-37d248dea50285545991defde5f33bdc0be6bd21.tar.gz
serverwiz-37d248dea50285545991defde5f33bdc0be6bd21.zip
Read targetTypeExtension tag from target_types_hb.xml
Diffstat (limited to 'src')
-rw-r--r--src/com/ibm/ServerWizard2/model/SystemModel.java25
1 files changed, 14 insertions, 11 deletions
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<String, Target> entry : targetModels.entrySet()) {
OpenPOWER on IntegriCloud