import javax.swing.JPanel;\r
import javax.swing.JTextField;\r
\r
-import org.tianocore.ModuleSurfaceAreaDocument;\r
+import org.tianocore.ModuleTypeDef;\r
import org.tianocore.MsaHeaderDocument;\r
import org.tianocore.SpdHeaderDocument;\r
+import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;\r
import org.tianocore.PackageSurfaceAreaDocument.PackageSurfaceArea;\r
import org.tianocore.PlatformHeaderDocument.PlatformHeader;\r
import org.tianocore.PlatformSurfaceAreaDocument.PlatformSurfaceArea;\r
private PackageIdentification pid = null;\r
\r
private PlatformIdentification fid = null;\r
+ \r
+ private ModuleSurfaceArea msa = null;\r
+ \r
+ private PackageSurfaceArea spd = null;\r
+ \r
+ private PlatformSurfaceArea fpd = null;\r
\r
private int mode = -1;\r
\r
if (jContentPane == null) {\r
jLabelIsLibrary = new JLabel();\r
jLabelIsLibrary.setBounds(new java.awt.Rectangle(15, 35, 120, 20));\r
- jLabelIsLibrary.setText("Is a Library");\r
+ jLabelIsLibrary.setText("Is this a Library");\r
jLabelVersion = new JLabel();\r
jLabelVersion.setBounds(new java.awt.Rectangle(15, 135, 120, 20));\r
jLabelVersion.setText("Version");\r
jLabelGuid.setText("Guid");\r
jLabelName = new JLabel();\r
jLabelName.setBounds(new java.awt.Rectangle(15, 85, 120, 20));\r
- jLabelName.setText("Name");\r
+ jLabelName.setText("Module Name");\r
jLabelFilePath = new JLabel();\r
jLabelFilePath.setBounds(new java.awt.Rectangle(15, 60, 120, 20));\r
jLabelFilePath.setText("File Path");\r
jLabelPackage = new JLabel();\r
jLabelPackage.setBounds(new java.awt.Rectangle(15, 10, 120, 20));\r
- jLabelPackage.setText("Choose Package");\r
+ jLabelPackage.setText("Choose a Package");\r
jContentPane = new JPanel();\r
jContentPane.setLayout(null);\r
jContentPane.setSize(new java.awt.Dimension(490, 198));\r
// Check if all required fields are not empty\r
//\r
if (isEmpty(this.jTextFieldFilePath.getText())) {\r
- Log.err("File Path couldn't be empty");\r
+ Log.wrn("New File", "A File Path must be entered!");\r
return false;\r
}\r
if (isEmpty(this.jTextFieldName.getText())) {\r
- Log.err("Name couldn't be empty");\r
+ Log.wrn("New File", "A Name must be entered");\r
return false;\r
}\r
if (isEmpty(this.jTextFieldGuid.getText())) {\r
- Log.err("Guid Value couldn't be empty");\r
+ Log.wrn("New File", "The Guid must be entered!");\r
return false;\r
}\r
if (isEmpty(this.jTextFieldVersion.getText())) {\r
- Log.err("Version couldn't be empty");\r
+ Log.wrn("New File", "A Version number must be entered!");\r
return false;\r
}\r
\r
// Check if all fields have correct data types \r
//\r
if (!DataValidation.isBaseName(this.jTextFieldName.getText())) {\r
- Log.err("Incorrect data type for Base Name");\r
+ Log.wrn("New File", "Incorrect data type for the Name!");\r
return false;\r
}\r
if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r
- Log.err("Incorrect data type for Guid");\r
+ Log.wrn("New File", "Incorrect data type for Guid, which must be in registry format! (8-4-4-4-12)");\r
return false;\r
}\r
\r
\r
for (int index = 0; index < msaFile.size(); index++) {\r
if (msaFile.elementAt(index).equals(modulePath)) {\r
- Log.err("This module is already existing in selected package");\r
+ Log.wrn("New File", "This module is already exists in the selected package!");\r
return false;\r
}\r
}\r
if (vPackageList != null && vPackageList.size() > 0) {\r
for (int index = 0; index < vPackageList.size(); index++) {\r
if (vPackageList.get(index).getPath().equals(path)) {\r
- Log.err("This package is already existing in database");\r
+ Log.wrn("New File", "This package is already exists in this workspace!");\r
return false;\r
}\r
}\r
if (vPlatfromList != null && vPlatfromList.size() > 0) {\r
for (int index = 0; index < vPlatfromList.size(); index++) {\r
if (vPlatfromList.get(index).getPath().equals(path)) {\r
- Log.err("This platform is already existing in database");\r
+ Log.wrn("New File", "This platform is already exists in this workspace!");\r
return false;\r
}\r
}\r
\r
**/\r
private void saveModule() {\r
- ModuleSurfaceAreaDocument.ModuleSurfaceArea msa = null;\r
+ msa = null;\r
String path = Tools.convertPathToCurrentOsType(this.jTextFieldFilePath.getText());\r
\r
//\r
try {\r
MsaHeaderDocument.MsaHeader msaHeader = null;\r
\r
- msa = ModuleSurfaceAreaDocument.ModuleSurfaceArea.Factory.newInstance();\r
+ msa = ModuleSurfaceArea.Factory.newInstance();\r
msaHeader = MsaHeaderDocument.MsaHeader.Factory.newInstance();\r
\r
msaHeader.setModuleName(this.jTextFieldName.getText());\r
msaHeader.setGuidValue(this.jTextFieldGuid.getText());\r
msaHeader.setVersion(this.jTextFieldVersion.getText());\r
+ msaHeader.setModuleType(ModuleTypeDef.BASE);\r
\r
msa.setMsaHeader(msaHeader);\r
} catch (Exception e) {\r
//\r
try {\r
SaveFile.saveMsaFile(path, msa);\r
-\r
} catch (Exception e) {\r
+ Log.wrn("Save Module to file system", e.getMessage());\r
Log.err("Save Module to file system", e.getMessage());\r
return;\r
}\r
\r
**/\r
private void savePackage() {\r
- PackageSurfaceArea spd = null;\r
+ spd = null;\r
String path = Tools.convertPathToCurrentOsType(this.jTextFieldFilePath.getText());\r
\r
//\r
\r
spd.setSpdHeader(spdHeader);\r
} catch (Exception e) {\r
- Log.err("Save PackageSurfaceArea Document", e.getMessage());\r
+ Log.wrn("Save Package Surface Area Description Document", e.getMessage());\r
return;\r
}\r
\r
SaveFile.saveSpdFile(path, spd);\r
\r
} catch (Exception e) {\r
+ Log.wrn("Save Package to file system", e.getMessage());\r
Log.err("Save Package to file system", e.getMessage());\r
return;\r
}\r
\r
**/\r
private void savePlatform() {\r
- PlatformSurfaceArea fpd = null;\r
+ fpd = null;\r
String path = Tools.convertPathToCurrentOsType(this.jTextFieldFilePath.getText());\r
\r
//\r
\r
fpd.setPlatformHeader(fpdHeader);\r
} catch (Exception e) {\r
- Log.err("Save FrameworkPlatformDescription Document", e.getMessage());\r
+ Log.wrn("Save Framework Platform Description Document", e.getMessage());\r
return;\r
}\r
\r
SaveFile.saveFpdFile(path, fpd);\r
\r
} catch (Exception e) {\r
+ Log.wrn("Save Platform to file system", e.getMessage());\r
Log.err("Save Platform to file system", e.getMessage());\r
return;\r
}\r
return mid;\r
}\r
\r
- public void setMid(ModuleIdentification mid) {\r
- this.mid = mid;\r
- }\r
-\r
public PlatformIdentification getFid() {\r
return fid;\r
}\r
\r
- public void setFid(PlatformIdentification fid) {\r
- this.fid = fid;\r
- }\r
-\r
public PackageIdentification getPid() {\r
return pid;\r
}\r
\r
- public void setPid(PackageIdentification pid) {\r
- this.pid = pid;\r
- }\r
-\r
private void upLocation(Component c, int size) {\r
c.setLocation(c.getLocation().x, c.getLocation().y - size);\r
}\r
+\r
+ public PlatformSurfaceArea getFpd() {\r
+ return fpd;\r
+ }\r
+\r
+ public ModuleSurfaceArea getMsa() {\r
+ return msa;\r
+ }\r
+\r
+ public PackageSurfaceArea getSpd() {\r
+ return spd;\r
+ }\r
}\r