1 files changed, 16 insertions, 57 deletions

diff --git a/src/com/ibm/ServerWizard2/LibraryManager.java b/src/com/ibm/ServerWizard2/LibraryManager.java
index 3d9c3f5..fae64c9 100644
--- a/src/com/ibm/ServerWizard2/LibraryManager.java
+++ b/src/com/ibm/ServerWizard2/LibraryManager.java
@@ -1,71 +1,30 @@
 package com.ibm.ServerWizard2;
 
+import com.ibm.ServerWizard2.LibraryFile.FileTypes;
+
 
 public class LibraryManager {
-	private String processScript = "";
-	private String processDirectory = "";
-	public static String REPO = "open-power/serverwiz/";
-	GithubFile files[] = new GithubFile[7];
+	LibraryFile files[] = new LibraryFile[5];
 
 	public void loadModel(SystemModel model) throws Exception {
-		for (GithubFile libFile : files) {
-			if (libFile.getType() == GithubFile.FileTypes.ATTRIBUTE_TYPE_XML) {
-				model.loadAttributes(new XmlHandler(), libFile.getLocalPath());
+		for (LibraryFile libFile : files) {
+			if (libFile.getType() == LibraryFile.FileTypes.ATTRIBUTE_TYPE_XML) {
+				model.loadAttributes(new XmlHandler(), libFile.getPath());
 			}
-			if (libFile.getType() == GithubFile.FileTypes.TARGET_TYPE_XML) {
-				model.loadTargetTypes(new XmlHandler(), libFile.getLocalPath());
+			if (libFile.getType() == LibraryFile.FileTypes.TARGET_TYPE_XML) {
+				model.loadTargetTypes(new XmlHandler(), libFile.getPath());
 			}
-			if (libFile.getType() == GithubFile.FileTypes.TARGET_INSTANCES_XML) {
-				model.loadTargetInstances(libFile.getLocalPath());
+			if (libFile.getType() == LibraryFile.FileTypes.TARGET_INSTANCES_XML) {
+				model.loadTargetInstances(libFile.getPath());
 			}
 		}
 	}
 
-	public void init(String version) {
-		files[0] = new GithubFile(REPO,version,
-				                  "attribute_types.xml",GithubFile.FileTypes.ATTRIBUTE_TYPE_XML,ServerWizard2.LOGGER);
-
-		files[1] = new GithubFile(REPO,version,
-                                  "attribute_types_hb.xml",GithubFile.FileTypes.ATTRIBUTE_TYPE_XML,ServerWizard2.LOGGER);
-
-		files[2] = new GithubFile(REPO,version,
-                                  "attribute_types_mrw.xml",GithubFile.FileTypes.ATTRIBUTE_TYPE_XML,ServerWizard2.LOGGER);
-
-		files[3] = new GithubFile(REPO,version,
-                                  "target_types_mrw.xml",GithubFile.FileTypes.TARGET_TYPE_XML,ServerWizard2.LOGGER);
-
-		files[4] = new GithubFile(REPO,version,
-                                  "target_instances_v3.xml",GithubFile.FileTypes.TARGET_INSTANCES_XML,ServerWizard2.LOGGER);
-
-		files[5] = new GithubFile(REPO,version,
-                                  "processMrw.pl",GithubFile.FileTypes.SCRIPT,ServerWizard2.LOGGER);
-
-		files[6] = new GithubFile(REPO,version,
-                                  "Targets.pm",GithubFile.FileTypes.SCRIPT,ServerWizard2.LOGGER);
-
-		processScript = files[5].getLocalPath();
-		processDirectory = files[5].getLocalDirectory();
-	}
-	public String getProcessingScript() {
-		return this.processScript;
-	}
-	public String getProcessingDirectory() {
-		return this.processDirectory;
-	}
-
-
-	/*
-	 * check if files exist yes- files exist, check if github is newer if yes,
-	 * then ask user if wishes to update if no or can't download, then continue
-	 * no- files don't exist; download if can't download, then exit
-	 */
-	public void update(String version) throws Exception {
-		if (!version.isEmpty()) {
-			ServerWizard2.LOGGER.info("Updating XML lib to version: "+version+"\n");
-			for (GithubFile libFile : files) {
-				libFile.update();
-				libFile.download();
-			}
-		}
+	public void init() {
+		files[0] = new LibraryFile("xml/attribute_types.xml",FileTypes.ATTRIBUTE_TYPE_XML);
+		files[1] = new LibraryFile("xml/attribute_types_hb.xml",FileTypes.ATTRIBUTE_TYPE_XML);
+		files[2] = new LibraryFile("xml/attribute_types_mrw.xml",FileTypes.ATTRIBUTE_TYPE_XML);
+		files[3] = new LibraryFile("xml/target_types_mrw.xml",FileTypes.TARGET_TYPE_XML);
+		files[4] = new LibraryFile("xml/target_instances_v3.xml",FileTypes.TARGET_INSTANCES_XML);
 	}
 }