From 214b0d1914b48d651b25e58f321ddb77a46903b8 Mon Sep 17 00:00:00 2001 From: lhauch Date: Thu, 5 Oct 2006 22:19:16 +0000 Subject: [PATCH] Changed spelling to manifest git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1673 6f19259b-4bc3-4df7-8a09-765794883524 --- .../frameworkwizard/far/DistributeRule.java | 2 +- .../tianocore/frameworkwizard/far/Far.java | 32 +++---- .../far/{Mainfest.java => Manifest.java} | 96 +++++++++---------- .../far/installui/InstallStepTwo.java | 6 +- .../far/updateui/UpdateStepTwo.java | 2 +- 5 files changed, 69 insertions(+), 69 deletions(-) rename Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/{Mainfest.java => Manifest.java} (90%) diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/DistributeRule.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/DistributeRule.java index 16faf4e408..730e385c74 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/DistributeRule.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/DistributeRule.java @@ -39,7 +39,7 @@ public class DistributeRule { // Get Far packages list; // try { - farPkgList = myFar.mainfest.getPackageList(); + farPkgList = myFar.manifest.getPackageList(); Iterator pkgItems = farPkgList.iterator(); while (pkgItems.hasNext()) { PackageIdentification id = (PackageIdentification) pkgItems.next(); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Far.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Far.java index ffaace86ab..6dbf1afd40 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Far.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Far.java @@ -35,9 +35,9 @@ import org.tianocore.frameworkwizard.workspace.Workspace; public class Far { // - // Class member Mainfest + // Class member Manifest // - public Mainfest mainfest = null; + public Manifest manifest = null; // // Jar file @@ -60,7 +60,7 @@ public class Far { // public Far(JarFile farFile) throws Exception { jf = farFile; - this.mainfest = new Mainfest(getMainfestFile()); + this.manifest = new Manifest(getManifestFile()); } public void creatFar(List pkgList, List plfList, @@ -70,23 +70,23 @@ public class Far { // // Generate Manifest and get file lists // - this.mainfest = new Mainfest(); - this.mainfest.setFarHeader(fHeader); - this.mainfest.createManifest(pkgList, plfList, fileFilter); + this.manifest = new Manifest(); + this.manifest.setFarHeader(fHeader); + this.manifest.createManifest(pkgList, plfList, fileFilter); - this.mainfest.hibernateToFile(); + this.manifest.hibernateToFile(); // // Write Mainifest file to JAR. // - if (this.mainfest.mfFile != null) { - writeToJar(this.mainfest.mfFile, jos); + if (this.manifest.mfFile != null) { + writeToJar(this.manifest.mfFile, jos); } // // Write all files to JAR // - Set files = this.mainfest.files; + Set files = this.manifest.files; Iterator iter = files.iterator(); while (iter.hasNext()) { writeToJar(iter.next(), jos); @@ -109,7 +109,7 @@ public class Far { } public void InstallFar(String dir) throws Exception { - List allFile = mainfest.getAllFileItem(); + List allFile = manifest.getAllFileItem(); extract(allFile, dir); } @@ -119,7 +119,7 @@ public class Far { Iterator plfIter = plfKeys.iterator(); while (plfIter.hasNext()) { PlatformIdentification item = plfIter.next(); - extract(this.mainfest.getPlatformContents(item), plfMap.get(item).getPath()); + extract(this.manifest.getPlatformContents(item), plfMap.get(item).getPath()); } Set pkgKeys = pkgMap.keySet(); @@ -132,15 +132,15 @@ public class Far { } public void installPackage(PackageIdentification packageId, File installPath) throws Exception { - List contents = this.mainfest.getPackageContents(packageId); + List contents = this.manifest.getPackageContents(packageId); extract(contents, installPath.getPath()); } - public InputStream getMainfestFile() throws Exception { + public InputStream getManifestFile() throws Exception { JarEntry je = null; for (Enumeration e = jf.entries(); e.hasMoreElements();) { je = (JarEntry) e.nextElement(); - if (je.getName().equalsIgnoreCase(Mainfest.mfFileName)) + if (je.getName().equalsIgnoreCase(Manifest.mfFileName)) return jf.getInputStream(je); } return null; @@ -262,7 +262,7 @@ public class Far { PackageQuery pkgQ = new PackageQuery(); List result = new ArrayList(); - entry = this.mainfest.getPackgeSpd(pkgId); + entry = this.manifest.getPackgeSpd(pkgId); if (entry == null) { return result; } diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Mainfest.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Manifest.java similarity index 90% rename from Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Mainfest.java rename to Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Manifest.java index 63517d3513..89fb5b6d42 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Mainfest.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/Manifest.java @@ -1,6 +1,6 @@ /** @file - The file is used to create Far's mainfest file + The file is used to create Far's manifest file Copyright (c) 2006, Intel Corporation All rights reserved. This program and the accompanying materials @@ -47,16 +47,16 @@ import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; -public class Mainfest implements ManifestInterface { +public class Manifest implements ManifestInterface { // / - // / mainfest document + // / manifest document // / - Document mainfestDoc = null; + Document manifestDoc = null; // / - // / Mainfest file element name + // / Manfiest file element name // / - final static String mfFileName = "FrameworkArhciveMainfest.xml"; + final static String mfFileName = "FrameworkArchiveManifest.xml"; // // Header @@ -110,7 +110,7 @@ public class Mainfest implements ManifestInterface { final static String farFileName_Md5sum = "Md5sum"; // - // mainfest header information. + // manifest header information. // FarHeader fhInfo = new FarHeader(); @@ -127,7 +127,7 @@ public class Mainfest implements ManifestInterface { Set files = new LinkedHashSet(); // - // Mainfest file + // Manifest file // public File mfFile = null; @@ -135,21 +135,21 @@ public class Mainfest implements ManifestInterface { return fhInfo; } - public Mainfest() throws Exception { + public Manifest() throws Exception { DocumentBuilderFactory domfac = DocumentBuilderFactory.newInstance(); DocumentBuilder dombuilder = domfac.newDocumentBuilder(); Document document = dombuilder.newDocument(); - this.mainfestDoc = document; + this.manifestDoc = document; } - public Mainfest(InputStream mainfestInputStream) throws Exception { + public Manifest(InputStream manifestInputStream) throws Exception { DocumentBuilderFactory domfac = DocumentBuilderFactory.newInstance(); try { - if (mainfestInputStream != null) { + if (manifestInputStream != null) { DocumentBuilder dombuilder = domfac.newDocumentBuilder(); - this.mainfestDoc = dombuilder.parse(mainfestInputStream); - parseMainfest(); + this.manifestDoc = dombuilder.parse(manifestInputStream); + parseManifest(); } } catch (Exception e) { @@ -194,11 +194,11 @@ public class Mainfest implements ManifestInterface { } } - public void setManifestFile(File mainfestFile) throws Exception { + public void setManifestFile(File manifestFile) throws Exception { DocumentBuilderFactory domfac = DocumentBuilderFactory.newInstance(); DocumentBuilder dombuilder = domfac.newDocumentBuilder(); - InputStream is = new FileInputStream(mainfestFile); - this.mainfestDoc = dombuilder.parse(is); + InputStream is = new FileInputStream(manifestFile); + this.manifestDoc = dombuilder.parse(is); } public void addPkgToPkgList(PackageIdentification packageId, Set fileFilter) throws Exception { @@ -554,7 +554,7 @@ public class Mainfest implements ManifestInterface { // // Add far files in to list // - NodeList elementList = this.mainfestDoc.getElementsByTagName(farPlatformList); + NodeList elementList = this.manifestDoc.getElementsByTagName(farPlatformList); for (int i = 0; i < elementList.getLength(); i++) { // // Get node list. @@ -589,56 +589,56 @@ public class Mainfest implements ManifestInterface { public void hibernateToFile() throws Exception { // - // create mainfest root node + // create manifest root node // - Element rootNode = this.mainfestDoc.createElement("FrameworkArchiveManifest"); - this.mainfestDoc.appendChild(rootNode); + Element rootNode = this.manifestDoc.createElement("FrameworkArchiveManifest"); + this.manifestDoc.appendChild(rootNode); // - // create mainfest header node + // create manifest header node // - Element headerNode = this.mainfestDoc.createElement(farHeader); + Element headerNode = this.manifestDoc.createElement(farHeader); rootNode.appendChild(headerNode); // // Add FarHeader to headerNode. // - Element farName = this.mainfestDoc.createElement(farHeader_FarName); + Element farName = this.manifestDoc.createElement(farHeader_FarName); farName.setTextContent(this.fhInfo.getFarName()); headerNode.appendChild(farName); - Element gv = this.mainfestDoc.createElement(guidValue); + Element gv = this.manifestDoc.createElement(guidValue); gv.setTextContent(this.fhInfo.getGuidValue()); headerNode.appendChild(gv); - Element ver = this.mainfestDoc.createElement(version); + Element ver = this.manifestDoc.createElement(version); ver.setTextContent(this.fhInfo.getVersion()); headerNode.appendChild(ver); - Element abstra = this.mainfestDoc.createElement(farHeader_Abstract); + Element abstra = this.manifestDoc.createElement(farHeader_Abstract); abstra.setTextContent(this.fhInfo.getAbstractStr()); headerNode.appendChild(abstra); - Element descr = this.mainfestDoc.createElement(farHeader_Description); + Element descr = this.manifestDoc.createElement(farHeader_Description); descr.setTextContent(this.fhInfo.getDescription()); headerNode.appendChild(descr); - Element copyright = this.mainfestDoc.createElement(farHeader_CopyRight); + Element copyright = this.manifestDoc.createElement(farHeader_CopyRight); copyright.setTextContent(this.fhInfo.getCopyright()); headerNode.appendChild(copyright); - Element license = this.mainfestDoc.createElement(farHeader_License); + Element license = this.manifestDoc.createElement(farHeader_License); license.setTextContent(this.fhInfo.getLicense()); headerNode.appendChild(license); - Element spec = this.mainfestDoc.createElement(farHeader_Specification); + Element spec = this.manifestDoc.createElement(farHeader_Specification); spec.setTextContent(this.fhInfo.getSpecification()); System.out.println(this.fhInfo.getSpecification()); headerNode.appendChild(spec); // - // create mainfest FarPackageList node + // create manifest FarPackageList node // - Element pkgListNode = this.mainfestDoc.createElement(farPackageList); + Element pkgListNode = this.manifestDoc.createElement(farPackageList); rootNode.appendChild(pkgListNode); // @@ -651,9 +651,9 @@ public class Mainfest implements ManifestInterface { } // - // create mainfest FarPlatformList node + // create manifest FarPlatformList node // - Element plfListNode = this.mainfestDoc.createElement(farPlatformList); + Element plfListNode = this.manifestDoc.createElement(farPlatformList); rootNode.appendChild(plfListNode); // @@ -675,7 +675,7 @@ public class Mainfest implements ManifestInterface { // // Prepare the DOM document for writing // - Source source = new DOMSource(this.mainfestDoc); + Source source = new DOMSource(this.manifestDoc); // // Prepare the output file, get the Mainifest file name from // . @@ -693,7 +693,7 @@ public class Mainfest implements ManifestInterface { } public void pkgToFarPkgNode(Element parentNode, FarPackage pkgItem) { - Element pkgNode = this.mainfestDoc.createElement(farPackageList_FarPackage); + Element pkgNode = this.manifestDoc.createElement(farPackageList_FarPackage); // // Add // @@ -714,7 +714,7 @@ public class Mainfest implements ManifestInterface { // // Add // - Element contentNode = this.mainfestDoc.createElement(contents); + Element contentNode = this.manifestDoc.createElement(contents); Iterator iterator = pkgItem.getContentList().iterator(); while (iterator.hasNext()) { ffiToFfNode(contentNode, (FarFileItem) iterator.next()); @@ -724,7 +724,7 @@ public class Mainfest implements ManifestInterface { } public void PlfToPlatformNode(Element parentNode, FarPlatformItem fplItem) { - Element fplNode = this.mainfestDoc.createElement(farPlatformList_FarPlatform); + Element fplNode = this.manifestDoc.createElement(farPlatformList_FarPlatform); // // Add // @@ -745,7 +745,7 @@ public class Mainfest implements ManifestInterface { } public void ffiToFfNode(Element parentNode, FarFileItem ffi) { - Element farFileName = this.mainfestDoc.createElement(farPackage_FarfileName); + Element farFileName = this.manifestDoc.createElement(farPackage_FarfileName); farFileName.setTextContent(ffi.getRelativeFilename()); System.out.println(farFileName.getTextContent()); System.out.println(ffi.getRelativeFilename()); @@ -754,12 +754,12 @@ public class Mainfest implements ManifestInterface { } public void setStrItemToNode(Element parentNode, String strValue, String strName) { - Element node = this.mainfestDoc.createElement(strName); + Element node = this.manifestDoc.createElement(strName); node.setTextContent(strValue); parentNode.appendChild(node); } - private void parseMainfest() { + private void parseManifest() { // // Parse header @@ -773,11 +773,11 @@ public class Mainfest implements ManifestInterface { // // parse // - NodeList ele = this.mainfestDoc.getElementsByTagName(farPlatformList); + NodeList ele = this.manifestDoc.getElementsByTagName(farPlatformList); Node plfNode; if (ele.getLength() > 0) { // - // Only have one node under mainfest root node. + // Only have one node under manifest root node. // plfNode = ele.item(0); parseFarPlatformList(plfNode, this.fPlfList); @@ -786,10 +786,10 @@ public class Mainfest implements ManifestInterface { private void parseMfHeader() { Node headerNode; - NodeList ele = this.mainfestDoc.getElementsByTagName(farHeader); + NodeList ele = this.manifestDoc.getElementsByTagName(farHeader); if (ele.getLength() > 0) { // - // For mainfest file only have one + // For manifest file only have one // headerNode = ele.item(0); } else { @@ -824,10 +824,10 @@ public class Mainfest implements ManifestInterface { public void parseHeaderFarPackageList() { Node farPkgNode; - NodeList ele = this.mainfestDoc.getElementsByTagName(farPackageList); + NodeList ele = this.manifestDoc.getElementsByTagName(farPackageList); if (ele.getLength() > 0) { // - // For mainfest file only have one + // For manifest file only have one // farPkgNode = ele.item(0); } else { diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java index 5fd53a531a..68d286cdf5 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/installui/InstallStepTwo.java @@ -197,7 +197,7 @@ public class InstallStepTwo extends IDialog implements MouseListener { try { Far far = stepOne.getFar(); - packageVector = far.mainfest.getPackageList(); + packageVector = far.manifest.getPackageList(); Iterator iter = packageVector.iterator(); while (iter.hasNext()) { String[] str = new String[4]; @@ -257,7 +257,7 @@ public class InstallStepTwo extends IDialog implements MouseListener { try { Far far = stepOne.getFar(); - platformVector = far.mainfest.getPlatformList(); + platformVector = far.manifest.getPlatformList(); Iterator iter = platformVector.iterator(); while (iter.hasNext()) { String[] str = new String[4]; @@ -384,7 +384,7 @@ public class InstallStepTwo extends IDialog implements MouseListener { // Add to database // WorkspaceTools wt = new WorkspaceTools(); - wt.addFarToDb(packageList, platformList, far.mainfest.getHeader()); + wt.addFarToDb(packageList, platformList, far.manifest.getHeader()); } catch (Exception ex) { Log.wrn("Install far", ex.getMessage()); Log.err("Install far", ex.getMessage()); diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java index 287d559e08..6785803453 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/updateui/UpdateStepTwo.java @@ -181,7 +181,7 @@ public class UpdateStepTwo extends IDialog implements MouseListener { model.setRowCount(0); try { Far far = stepOne.getFar(); - List packagesInFar = far.mainfest.getPackageList(); + List packagesInFar = far.manifest.getPackageList(); WorkspaceTools wt = new WorkspaceTools(); List packagesInDb = wt.getAllPackages();