Move attribute inheritance until all libraries are loaded

3 files changed, 29 insertions, 17 deletions

diff --git a/.classpath b/.classpath
index c66ea76..a64fc14 100644
--- a/.classpath
+++ b/.classpath
@@ -11,7 +11,6 @@
 	<classpathentry kind="lib" path="lib/org.eclipse.core.commands_3.6.100.v20140528-1422.jar"/>

 	<classpathentry kind="lib" path="lib/org.eclipse.core.runtime-3.10.0-v20140318-2214.jar"/>

 	<classpathentry kind="lib" path="lib/org.eclipse.equinox.common-3.6.200.v20130402-1505.jar"/>

-	<classpathentry kind="lib" path="lib/org.eclipse.jface_3.10.2.v20141021-1035.jar"/>

 	<classpathentry kind="lib" path="lib/org.eclipse.jgit-4.4.1.201607150455-r.jar"/>

 	<classpathentry kind="lib" path="lib/jgit/jsch-0.1.54.jar"/>

 	<classpathentry kind="lib" path="lib/jgit/log4j-1.2-api-2.6.2.jar"/>

@@ -19,5 +18,6 @@
 	<classpathentry kind="lib" path="lib/jgit/log4j-core-2.6.2.jar"/>

 	<classpathentry kind="lib" path="lib/jgit/slf4j-api-1.7.21.jar"/>

 	<classpathentry kind="lib" path="lib/jgit/slf4j-log4j12-1.7.21.jar"/>

+	<classpathentry kind="lib" path="lib/org.eclipse.jface_3.12.0.v20160518-1929.jar"/>

 	<classpathentry kind="output" path="bin"/>

 </classpath>

diff --git a/src/com/ibm/ServerWizard2/model/SystemModel.java b/src/com/ibm/ServerWizard2/model/SystemModel.java
index ba6a394..4140111 100644
--- a/src/com/ibm/ServerWizard2/model/SystemModel.java
+++ b/src/com/ibm/ServerWizard2/model/SystemModel.java
@@ -225,8 +225,27 @@ public class SystemModel {
 			    		this.loadTargetTypes(file.getPath());
 			    	}
 			    }
-			}	
+			}
+			//Add inherited attributes
+			//must load twice so inherited attributes pick up their 
+			//inherited attributes
+			for (int i=0;i<2;i++) {
+				for (Map.Entry<String, Target> entry : targetModels.entrySet()) {
+					Target target = entry.getValue();
+					
+					// add inherited attributes
+					addParentAttributes(target, target);
+					if (target.getAttribute("CLASS").equals("BUS")) {
+						busTypesTree.put(entry.getKey(),target);
+					}
+				}
+			}
+			busTypes.removeAllElements();
+			for (Target t : busTypesTree.values()) {
+				busTypes.add(t);
+			}		
 		}
+
 		File partsDir = new File(path+File.separator+"parts"+File.separator);
 		File filesList[] = partsDir.listFiles();
 		if (filesList == null) {
@@ -614,19 +633,6 @@ public class SystemModel {
 				}
 			}
 		}
-		for (Map.Entry<String, Target> entry : targetModels.entrySet()) {
-			Target target = entry.getValue();
-
-			// add inherited attributes
-			addParentAttributes(target, target);
-			if (target.getAttribute("CLASS").equals("BUS")) {
-				busTypesTree.put(entry.getKey(),target);
-			}
-		}
-		busTypes.removeAllElements();
-		for (Target t : busTypesTree.values()) {
-			busTypes.add(t);
-		}
 	}
 
 	public void loadAttributes(String fileName) throws SAXException,
diff --git a/src/com/ibm/ServerWizard2/model/Target.java b/src/com/ibm/ServerWizard2/model/Target.java
index ef452f4..2641380 100644
--- a/src/com/ibm/ServerWizard2/model/Target.java
+++ b/src/com/ibm/ServerWizard2/model/Target.java
@@ -336,8 +336,14 @@ public class Target implements Comparable<Target>, java.io.Serializable {
 	////////////////////////////////////////////////////
 	// XML file handling
 	public void readModelXML(Element target, HashMap<String, Attribute> attrMap) {
-		type = SystemModel.getElement(target, "id");
-		parent = SystemModel.getElement(target, "parent");
+		String tmptype = SystemModel.getElement(target, "id");
+		String tmpparent = SystemModel.getElement(target, "parent");
+		if (!tmptype.isEmpty()) {
+			type = tmptype;
+		}
+		if (!tmpparent.isEmpty()) {
+			parent = tmpparent;
+		}
 		NodeList parentList = target.getElementsByTagName("parent_type");
 		for (int i = 0; i < parentList.getLength(); i++) {
 			Element e = (Element) parentList.item(i);