MsaOwner.java & ModuleInfo.java

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1644 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
alfred
2006-09-29 08:31:54 +00:00
parent 4a557aceeb
commit 1ea5992991
4 changed files with 269 additions and 242 deletions

View File

@@ -17,6 +17,8 @@ import java.util.*;
import javax.swing.JFileChooser; import javax.swing.JFileChooser;
import org.tianocore.UsageTypes;
public class MigrationTool { public class MigrationTool {
public static UI ui = null; public static UI ui = null;
public static Database db = null; public static Database db = null;
@@ -51,6 +53,13 @@ public class MigrationTool {
} }
new MsaWriter(mi).flush(); new MsaWriter(mi).flush();
/*
mi.addGuid("guid", UsageTypes.ALWAYS_CONSUMED);
mi.addLibraryClass("class", UsageTypes.ALWAYS_CONSUMED);
mi.addPpi("ppi", UsageTypes.ALWAYS_CONSUMED);
mi.addProtocol("protocol", UsageTypes.ALWAYS_CONSUMED);
*/
mi.getMsaOwner().flush(MigrationTool.ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename + File.separator + mi.modulename + ".___");
if (MigrationTool.doCritic) { if (MigrationTool.doCritic) {
Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename); Critic.fireAt(ModuleInfoMap.get(mi) + File.separator + "Migration_" + mi.modulename);

View File

@@ -30,7 +30,7 @@ public final class ModuleInfo {
public final String modulepath; public final String modulepath;
public final String temppath; public final String temppath;
private MsaOwner msaowner = new MsaOwner(); private MsaOwner msaowner = MsaOwner.initNewMsaOwner();
public String modulename = null; public String modulename = null;
public String guidvalue = null; public String guidvalue = null;
@@ -59,23 +59,24 @@ public final class ModuleInfo {
//-----------------------------------------------------------------------------------// //-----------------------------------------------------------------------------------//
public final boolean addProtocol (String proname, UsageTypes.Enum usage) { public final boolean addProtocol (String proname, UsageTypes.Enum usage) {
protocols.add(proname); //protocols.add(proname);
return msaowner.addProtocol(proname, usage); System.out.println("I'm in");
return msaowner.addProtocol(proname, usage);
} }
public final boolean addPpi (String ppiname, UsageTypes.Enum usage) { public final boolean addPpi (String ppiname, UsageTypes.Enum usage) {
ppis.add(ppiname); //ppis.add(ppiname);
return msaowner.addPpi(ppiname, usage); return msaowner.addPpi(ppiname, usage);
} }
public final boolean addGuid (String guidname, UsageTypes.Enum usage) { public final boolean addGuid (String guidname, UsageTypes.Enum usage) {
guids.add(guidname); //guids.add(guidname);
return msaowner.addGuid(guidname, usage); return msaowner.addGuid(guidname, usage);
} }
public final boolean addLibraryClass(String name, UsageTypes.Enum usage) { public final boolean addLibraryClass(String name, UsageTypes.Enum usage) {
hashrequiredr9libs.add(name); //hashrequiredr9libs.add(name);
return msaowner.addLibraryClass(name, usage); return msaowner.addLibraryClass(name, usage);
} }
//-----------------------------------------------------------------------------------// //-----------------------------------------------------------------------------------//
@@ -112,4 +113,8 @@ public final class ModuleInfo {
} }
return false; return false;
} }
public final MsaOwner getMsaOwner() {
return msaowner;
}
} }

View File

@@ -1,16 +1,19 @@
package org.tianocore.migration; package org.tianocore.migration;
import java.io.BufferedWriter;
import java.io.FileWriter;
import java.util.*; import java.util.*;
import org.apache.xmlbeans.XmlOptions;
import org.tianocore.*; import org.tianocore.*;
import org.tianocore.SupportedArchitectures.Enum; import org.tianocore.SupportedArchitectures.Enum;
public class MsaOwner { public class MsaOwner {
public static final String COPYRIGHT = "Copyright (c) 2006, Intel Corporation"; public static final String COPYRIGHT = "Copyright (c) 2006, Intel Corporation";
public static final String VERSION = "1.0"; public static final String VERSION = "1.0";
public static final String ABSTRACT = "Component name for module "; public static final String ABSTRACT = "Component name for module ";
public static final String DESCRIPTION = "FIX ME!"; public static final String DESCRIPTION = "FIX ME!";
public static final String LICENSE = "All rights reserved.\n" + public static final String LICENSE = "All rights reserved.\n" +
" This software and associated documentation (if any) is furnished\n" + " This software and associated documentation (if any) is furnished\n" +
" under a license and may only be used or copied in accordance\n" + " under a license and may only be used or copied in accordance\n" +
" with the terms of the license. Except as permitted by such\n" + " with the terms of the license. Except as permitted by such\n" +
@@ -18,12 +21,12 @@ public class MsaOwner {
" reproduced, stored in a retrieval system, or transmitted in any\n" + " reproduced, stored in a retrieval system, or transmitted in any\n" +
" form or by any means without the express written consent of\n" + " form or by any means without the express written consent of\n" +
" Intel Corporation."; " Intel Corporation.";
public static final String SPECIFICATION = "FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052"; public static final String SPECIFICATION = "FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052";
public static final Enum IA32 = SupportedArchitectures.IA_32; public static final Enum IA32 = SupportedArchitectures.IA_32;
public static final Enum X64 = SupportedArchitectures.X_64; public static final Enum X64 = SupportedArchitectures.X_64;
public static final Enum IPF = SupportedArchitectures.IPF; public static final Enum IPF = SupportedArchitectures.IPF;
public static final Enum EBC = SupportedArchitectures.EBC; public static final Enum EBC = SupportedArchitectures.EBC;
private ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance(); private ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance();
@@ -40,346 +43,356 @@ public class MsaOwner {
private ExternsDocument.Externs externs = null; private ExternsDocument.Externs externs = null;
private List<Enum> listarch = new ArrayList<Enum>(); private List<Enum> listarch = new ArrayList<Enum>();
//private Map<String, Enum> mapfilenames = new HashMap<String, Enum>(); //this need to be installed manually when msa is to be written //private Map<String, Enum> mapfilenames = new HashMap<String, Enum>(); //this need to be installed manually when msa is to be written
//private Map<String, UsageTypes.Enum> mapprotocols = new HashMap<String, UsageTypes.Enum>(); //private Map<String, UsageTypes.Enum> mapprotocols = new HashMap<String, UsageTypes.Enum>();
//-----------------------------msaheader-------------------------------------// //-----------------------------msaheader-------------------------------------//
public final boolean addLibraryClass (String name, UsageTypes.Enum usage) { public final boolean addLibraryClass (String name, UsageTypes.Enum usage) {
Iterator<LibraryClassDocument.LibraryClass> classit = libclassdefs.getLibraryClassList().iterator(); Iterator<LibraryClassDocument.LibraryClass> classit = libclassdefs.getLibraryClassList().iterator();
while (classit.hasNext()) { while (classit.hasNext()) {
if (classit.next().getKeyword() == name) { if (classit.next().getKeyword() == name) {
MigrationTool.ui.println ("Warning: Duplicate LibraryClass"); MigrationTool.ui.println ("Warning: Duplicate LibraryClass");
return false; return false;
} }
} }
LibraryClassDocument.LibraryClass classname; LibraryClassDocument.LibraryClass classname;
List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>(); List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();
classname = libclassdefs.addNewLibraryClass(); classname = libclassdefs.addNewLibraryClass();
classname.setKeyword(name); classname.setKeyword(name);
arch.add(usage); arch.add(usage);
classname.setSupArchList(arch); classname.setSupArchList(arch);
return true; return true;
} }
public final boolean addGuid (String guidname, UsageTypes.Enum usage) { public final boolean addGuid (String guidname, UsageTypes.Enum usage) {
if (guids == null) { if (guids == null) {
guids = msa.addNewGuids(); guids = msa.addNewGuids();
} }
Iterator<GuidsDocument.Guids.GuidCNames> guidit = guids.getGuidCNamesList().iterator(); Iterator<GuidsDocument.Guids.GuidCNames> guidit = guids.getGuidCNamesList().iterator();
while (guidit.hasNext()) { while (guidit.hasNext()) {
if (guidit.next().getGuidCName() == guidname) { if (guidit.next().getGuidCName() == guidname) {
MigrationTool.ui.println ("Warning: Duplicate Guid"); MigrationTool.ui.println ("Warning: Duplicate Guid");
return false; return false;
} }
} }
GuidsDocument.Guids.GuidCNames guid; GuidsDocument.Guids.GuidCNames guid;
List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>(); List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();
guid = guids.addNewGuidCNames(); guid = guids.addNewGuidCNames();
guid.setGuidCName(guidname); guid.setGuidCName(guidname);
arch.add(usage); arch.add(usage);
guid.setSupArchList(arch); guid.setSupArchList(arch);
return true; return true;
} }
public final boolean addPpi (String ppiname, UsageTypes.Enum usage) { public final boolean addPpi (String ppiname, UsageTypes.Enum usage) {
if (ppis == null) { if (ppis == null) {
ppis = msa.addNewPPIs(); ppis = msa.addNewPPIs();
} }
Iterator<PPIsDocument.PPIs.Ppi> ppiit = ppis.getPpiList().iterator(); Iterator<PPIsDocument.PPIs.Ppi> ppiit = ppis.getPpiList().iterator();
while (ppiit.hasNext()) { while (ppiit.hasNext()) {
if (ppiit.next().getPpiCName() == ppiname) { if (ppiit.next().getPpiCName() == ppiname) {
MigrationTool.ui.println ("Warning: Duplicate Ppi"); MigrationTool.ui.println ("Warning: Duplicate Ppi");
return false; return false;
} }
} }
PPIsDocument.PPIs.Ppi ppi; PPIsDocument.PPIs.Ppi ppi;
List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>(); List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();
ppi = ppis.addNewPpi(); ppi = ppis.addNewPpi();
ppi.setPpiCName(ppiname); ppi.setPpiCName(ppiname);
arch.add(usage); arch.add(usage);
ppi.setSupArchList(arch); ppi.setSupArchList(arch);
return true; return true;
} }
/* /*
private final boolean installProtocols () { private final boolean installProtocols () {
if (mapprotocols.isEmpty()) { if (mapprotocols.isEmpty()) {
return false; return false;
} }
Set<String> setprotocols = mapprotocols.keySet(); Set<String> setprotocols = mapprotocols.keySet();
ProtocolsDocument.Protocols.Protocol protocol; ProtocolsDocument.Protocols.Protocol protocol;
Iterator<String> it = setprotocols.iterator(); Iterator<String> it = setprotocols.iterator();
while (it.hasNext()) { while (it.hasNext()) {
protocol = protocols.addNewProtocol(); protocol = protocols.addNewProtocol();
protocol.setProtocolCName(it.next()); protocol.setProtocolCName(it.next());
protocol.setUsage(mapprotocols.get(protocol.getProtocolCName())); protocol.setUsage(mapprotocols.get(protocol.getProtocolCName()));
} }
return true; return true;
} }
public final boolean addProtocols (String protocol, UsageTypes.Enum usage) { public final boolean addProtocols (String protocol, UsageTypes.Enum usage) {
if (mapprotocols.containsKey(protocol)) { if (mapprotocols.containsKey(protocol)) {
return false; return false;
} else { } else {
mapprotocols.put(protocol, usage); mapprotocols.put(protocol, usage);
return true; return true;
} }
} }
*/ */
public final boolean addProtocol (String proname, UsageTypes.Enum usage) { public final boolean addProtocol (String proname, UsageTypes.Enum usage) {
if (protocols == null) { if (protocols == null) {
protocols = msa.addNewProtocols(); protocols = msa.addNewProtocols();
} }
Iterator<ProtocolsDocument.Protocols.Protocol> proit = protocols.getProtocolList().iterator(); Iterator<ProtocolsDocument.Protocols.Protocol> proit = protocols.getProtocolList().iterator();
while (proit.hasNext()) { while (proit.hasNext()) {
if (proit.next().getProtocolCName() == proname) { if (proit.next().getProtocolCName() == proname) {
MigrationTool.ui.println ("Warning: Duplicate Protocol"); MigrationTool.ui.println ("Warning: Duplicate Protocol");
return false; return false;
} }
} }
ProtocolsDocument.Protocols.Protocol protocol; ProtocolsDocument.Protocols.Protocol protocol;
List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>(); List<UsageTypes.Enum> arch = new ArrayList<UsageTypes.Enum>();
protocol = protocols.addNewProtocol(); protocol = protocols.addNewProtocol();
protocol.setProtocolCName(proname); protocol.setProtocolCName(proname);
arch.add(usage); arch.add(usage);
protocol.setSupArchList(arch); protocol.setSupArchList(arch);
return true; return true;
} }
/* /*
private final boolean installHashFilename () { private final boolean installHashFilename () {
if (mapfilenames.isEmpty()) { if (mapfilenames.isEmpty()) {
return false; return false;
} }
Set<String> setfilename = mapfilenames.keySet(); Set<String> setfilename = mapfilenames.keySet();
FilenameDocument.Filename filename; FilenameDocument.Filename filename;
List<Enum> arch = new ArrayList<Enum>(); List<Enum> arch = new ArrayList<Enum>();
Iterator<String> it = setfilename.iterator(); Iterator<String> it = setfilename.iterator();
while (it.hasNext()) { while (it.hasNext()) {
filename = sourcefiles.addNewFilename(); filename = sourcefiles.addNewFilename();
filename.setStringValue(it.next()); filename.setStringValue(it.next());
arch.add(mapfilenames.get(filename.getStringValue())); arch.add(mapfilenames.get(filename.getStringValue()));
filename.setSupArchList(arch); filename.setSupArchList(arch);
} }
return true; return true;
} }
public final boolean addSourceFile (String filename, Enum arch) { // dummy & null how to imply? public final boolean addSourceFile (String filename, Enum arch) { // dummy & null how to imply?
if (mapfilenames.containsKey(filename)) { if (mapfilenames.containsKey(filename)) {
return false; return false;
} else { } else {
mapfilenames.put(filename, arch); mapfilenames.put(filename, arch);
return true; return true;
} }
} }
*/ */
public final boolean addSourceFile (String name, Enum en) { public final boolean addSourceFile (String name, Enum en) {
Iterator<FilenameDocument.Filename> fileit = sourcefiles.getFilenameList().iterator(); Iterator<FilenameDocument.Filename> fileit = sourcefiles.getFilenameList().iterator();
while (fileit.hasNext()) { while (fileit.hasNext()) {
if (fileit.next().getStringValue() == name) { if (fileit.next().getStringValue() == name) {
MigrationTool.ui.println ("Warning: Duplicate SourceFileName"); MigrationTool.ui.println ("Warning: Duplicate SourceFileName");
return false; return false;
} }
} }
FilenameDocument.Filename filename; FilenameDocument.Filename filename;
List<Enum> arch = new ArrayList<Enum>(); List<Enum> arch = new ArrayList<Enum>();
filename = sourcefiles.addNewFilename(); filename = sourcefiles.addNewFilename();
filename.setStringValue(name); filename.setStringValue(name);
arch.add(en); arch.add(en);
filename.setSupArchList(arch); filename.setSupArchList(arch);
return true; return true;
} }
// entry point todo // entry point todo
public final boolean setupExternSpecification () { public final boolean setupExternSpecification () {
addExternSpecification("EFI_SPECIFICATION_VERSION 0x00020000"); addExternSpecification("EFI_SPECIFICATION_VERSION 0x00020000");
addExternSpecification("EDK_RELEASE_VERSION 0x00020000"); addExternSpecification("EDK_RELEASE_VERSION 0x00020000");
return true; return true;
} }
public final boolean addExternSpecification (String specification) { public final boolean addExternSpecification (String specification) {
if (externs.getSpecificationList().contains(specification)) { if (externs.getSpecificationList().contains(specification)) {
return false; return false;
} else { } else {
externs.addSpecification(specification); externs.addSpecification(specification);
return true; return true;
} }
} }
public final boolean setupPackageDependencies() { public final boolean setupPackageDependencies() {
addPackage("5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec"); addPackage("5e0e9358-46b6-4ae2-8218-4ab8b9bbdcec");
addPackage("68169ab0-d41b-4009-9060-292c253ac43d"); addPackage("68169ab0-d41b-4009-9060-292c253ac43d");
return true; return true;
} }
public final boolean addPackage (String guid) { public final boolean addPackage (String guid) {
if (packagedependencies.getPackageList().contains(guid)) { if (packagedependencies.getPackageList().contains(guid)) {
return false; return false;
} else { } else {
packagedependencies.addNewPackage().setPackageGuid(guid); packagedependencies.addNewPackage().setPackageGuid(guid);
return true; return true;
} }
} }
public final boolean setupModuleDefinitions () { //????????? give this job to moduleinfo public final boolean setupModuleDefinitions () { //????????? give this job to moduleinfo
moduledefinitions.setBinaryModule(false); moduledefinitions.setBinaryModule(false);
moduledefinitions.setOutputFileBasename(msaheader.getModuleName()); moduledefinitions.setOutputFileBasename(msaheader.getModuleName());
return true; return true;
} }
public final boolean addSupportedArchitectures (Enum arch) { public final boolean addSupportedArchitectures (Enum arch) {
if (listarch.contains(arch)) { if (listarch.contains(arch)) {
return false; return false;
} else { } else {
listarch.add(arch); listarch.add(arch);
return true; return true;
} }
} }
public final boolean addSpecification (String specification) { public final boolean addSpecification (String specification) {
if (msaheader.getSpecification() == null) { if (msaheader.getSpecification() == null) {
if (specification == null) { if (specification == null) {
msaheader.setSpecification(SPECIFICATION); msaheader.setSpecification(SPECIFICATION);
} else { } else {
msaheader.setSpecification(specification); msaheader.setSpecification(specification);
} }
return true; return true;
} else { } else {
MigrationTool.ui.println ("Warning: Duplicate Specification"); MigrationTool.ui.println ("Warning: Duplicate Specification");
return false; return false;
} }
} }
public final boolean addLicense (String licensecontent) { public final boolean addLicense (String licensecontent) {
if (msaheader.getLicense() == null) { if (msaheader.getLicense() == null) {
license = msaheader.addNewLicense(); license = msaheader.addNewLicense();
if (licensecontent == null) { if (licensecontent == null) {
license.setStringValue(LICENSE); license.setStringValue(LICENSE);
} else { } else {
license.setStringValue(licensecontent); license.setStringValue(licensecontent);
} }
return true; return true;
} else { } else {
MigrationTool.ui.println ("Warning: Duplicate License"); MigrationTool.ui.println ("Warning: Duplicate License");
return false; return false;
} }
} }
public final boolean addDescription (String description) { public final boolean addDescription (String description) {
if (msaheader.getDescription() == null) { if (msaheader.getDescription() == null) {
if (description == null) { if (description == null) {
msaheader.setDescription(DESCRIPTION); msaheader.setDescription(DESCRIPTION);
} else { } else {
msaheader.setDescription(description); msaheader.setDescription(description);
} }
return true; return true;
} else { } else {
MigrationTool.ui.println ("Warning: Duplicate Description"); MigrationTool.ui.println ("Warning: Duplicate Description");
return false; return false;
} }
} }
public final boolean addAbstract (String abs) { public final boolean addAbstract (String abs) {
if (msaheader.getAbstract() == null) { if (msaheader.getAbstract() == null) {
if (abs == null) { if (abs == null) {
msaheader.setAbstract(ABSTRACT + msaheader.getModuleName()); msaheader.setAbstract(ABSTRACT + msaheader.getModuleName());
} else { } else {
msaheader.setVersion(abs); msaheader.setVersion(abs);
} }
return true; return true;
} else { } else {
MigrationTool.ui.println ("Warning: Duplicate Abstract"); MigrationTool.ui.println ("Warning: Duplicate Abstract");
return false; return false;
} }
} }
public final boolean addVersion (String version) { public final boolean addVersion (String version) {
if (msaheader.getVersion() == null) { if (msaheader.getVersion() == null) {
if (version == null) { if (version == null) {
msaheader.setVersion(VERSION); msaheader.setVersion(VERSION);
} else { } else {
msaheader.setVersion(version); msaheader.setVersion(version);
} }
return true; return true;
} else { } else {
MigrationTool.ui.println ("Warning: Duplicate Version"); MigrationTool.ui.println ("Warning: Duplicate Version");
return false; return false;
} }
} }
public final boolean addCopyRight (String copyright) { public final boolean addCopyRight (String copyright) {
if (msaheader.getCopyright() == null) { if (msaheader.getCopyright() == null) {
if (copyright == null) { if (copyright == null) {
msaheader.setCopyright(COPYRIGHT); msaheader.setCopyright(COPYRIGHT);
} else { } else {
msaheader.setCopyright(copyright); msaheader.setCopyright(copyright);
} }
return true; return true;
} else { } else {
MigrationTool.ui.println ("Warning: Duplicate CopyRight"); MigrationTool.ui.println ("Warning: Duplicate CopyRight");
return false; return false;
} }
} }
public final boolean addModuleType (String moduletype) { public final boolean addModuleType (String moduletype) {
if (msaheader.getModuleType() == null) { if (msaheader.getModuleType() == null) {
msaheader.setModuleType(ModuleTypeDef.Enum.forString(moduletype)); msaheader.setModuleType(ModuleTypeDef.Enum.forString(moduletype));
return true; return true;
} else { } else {
MigrationTool.ui.println ("Warning: Duplicate ModuleType"); MigrationTool.ui.println ("Warning: Duplicate ModuleType");
return false; return false;
} }
} }
public final boolean addGuidValue (String guidvalue) { public final boolean addGuidValue (String guidvalue) {
if (msaheader.getGuidValue() == null) { if (msaheader.getGuidValue() == null) {
msaheader.setGuidValue(guidvalue); msaheader.setGuidValue(guidvalue);
return true; return true;
} else { } else {
MigrationTool.ui.println ("Warning: Duplicate GuidValue"); MigrationTool.ui.println ("Warning: Duplicate GuidValue");
return false; return false;
} }
} }
public final boolean addModuleName (String modulename) { public final boolean addModuleName (String modulename) {
if (msaheader.getModuleName() == null) { if (msaheader.getModuleName() == null) {
msaheader.setModuleName(modulename); msaheader.setModuleName(modulename);
return true; return true;
} else { } else {
MigrationTool.ui.println ("Warning: Duplicate ModuleName"); MigrationTool.ui.println ("Warning: Duplicate ModuleName");
return false; return false;
} }
} }
//-----------------------------msaheader-------------------------------------// //-----------------------------msaheader-------------------------------------//
public final void addSourceFiles (String filename, int arch) { public final void flush(String outputpath) throws Exception {
XmlOptions options = new XmlOptions();
options.setCharacterEncoding("UTF-8");
options.setSavePrettyPrint();
options.setSavePrettyPrintIndent(2);
options.setUseDefaultNamespace();
BufferedWriter bw = new BufferedWriter(new FileWriter(outputpath));
msadoc.save(bw, options);
bw.flush();
bw.close();
} }
private final MsaOwner init () { private final MsaOwner init () {
msa = msadoc.addNewModuleSurfaceArea(); msa = msadoc.addNewModuleSurfaceArea();
msaheader = msa.addNewMsaHeader(); msaheader = msa.addNewMsaHeader();
moduledefinitions = msa.addNewModuleDefinitions(); moduledefinitions = msa.addNewModuleDefinitions();
moduledefinitions.setSupportedArchitectures(listarch); moduledefinitions.setSupportedArchitectures(listarch);
sourcefiles = msa.addNewSourceFiles(); sourcefiles = msa.addNewSourceFiles();
packagedependencies = msa.addNewPackageDependencies(); packagedependencies = msa.addNewPackageDependencies();
libclassdefs = msa.addNewLibraryClassDefinitions(); libclassdefs = msa.addNewLibraryClassDefinitions();
externs = msa.addNewExterns(); externs = msa.addNewExterns();
return this; return this;
} }
public static final MsaOwner initNewMsaOwner() { public static final MsaOwner initNewMsaOwner() {
return new MsaOwner().init(); return new MsaOwner().init();
} }
} }

View File

@@ -20,9 +20,9 @@ import org.tianocore.SupportedArchitectures.Enum;
import org.apache.xmlbeans.*; import org.apache.xmlbeans.*;
public class MsaWriter { public class MsaWriter {
MsaWriter(ModuleInfo moduleinfo) { MsaWriter(ModuleInfo moduleinfo) {
mi = moduleinfo; mi = moduleinfo;
} }
private ModuleInfo mi; private ModuleInfo mi;
private ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance(); private ModuleSurfaceAreaDocument msadoc = ModuleSurfaceAreaDocument.Factory.newInstance();