import javax.swing.JPanel;\r
import javax.swing.JTextField;\r
\r
-import org.tianocore.ModuleSurfaceAreaDocument;\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
**/\r
private static final long serialVersionUID = 4171355136991448972L;\r
\r
- private JPanel jContentPane = null; // @jve:decl-index=0:visual-constraint="10,54"\r
+ private JPanel jContentPane = null;\r
\r
private JComboBox jComboBoxExistingPackage = null;\r
\r
private StarLabel jStarLabel4 = null;\r
\r
private StarLabel jStarLabel5 = null;\r
- \r
+\r
private ButtonGroup bg = new ButtonGroup();\r
\r
private WorkspaceTools wt = new WorkspaceTools();\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
private JRadioButton getJRadioButtonYes() {\r
if (jRadioButtonYes == null) {\r
jRadioButtonYes = new JRadioButton();\r
- jRadioButtonYes.setBounds(new java.awt.Rectangle(140,35,100,20));\r
- jRadioButtonYes.setSelected(true);\r
+ jRadioButtonYes.setBounds(new java.awt.Rectangle(140, 35, 100, 20));\r
+ jRadioButtonYes.setSelected(false);\r
jRadioButtonYes.setText("Yes");\r
}\r
return jRadioButtonYes;\r
private JRadioButton getJRadioButtonNo() {\r
if (jRadioButtonNo == null) {\r
jRadioButtonNo = new JRadioButton();\r
- jRadioButtonNo.setBounds(new java.awt.Rectangle(300,35,110,20));\r
- jRadioButtonNo.setSelected(false);\r
+ jRadioButtonNo.setBounds(new java.awt.Rectangle(300, 35, 110, 20));\r
+ jRadioButtonNo.setSelected(true);\r
jRadioButtonNo.setText("No");\r
}\r
return jRadioButtonNo;\r
private JPanel getJContentPane() {\r
if (jContentPane == null) {\r
jLabelIsLibrary = new JLabel();\r
- jLabelIsLibrary.setBounds(new java.awt.Rectangle(15,35,120,20));\r
+ jLabelIsLibrary.setBounds(new java.awt.Rectangle(15, 35, 120, 20));\r
jLabelIsLibrary.setText("Is a Library");\r
jLabelVersion = new JLabel();\r
jLabelVersion.setBounds(new java.awt.Rectangle(15, 135, 120, 20));\r
jLabelPackage.setText("Choose Package");\r
jContentPane = new JPanel();\r
jContentPane.setLayout(null);\r
- jContentPane.setSize(new java.awt.Dimension(490,198));\r
+ jContentPane.setSize(new java.awt.Dimension(490, 198));\r
jContentPane.add(getJComboBoxExistingPackage(), null);\r
jContentPane.add(getJButtonOk(), null);\r
jContentPane.add(getJButtonCancel(), null);\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", "File Path couldn't be empty");\r
return false;\r
}\r
if (isEmpty(this.jTextFieldName.getText())) {\r
- Log.err("Name couldn't be empty");\r
+ Log.wrn("New File", "Name couldn't be empty");\r
return false;\r
}\r
if (isEmpty(this.jTextFieldGuid.getText())) {\r
- Log.err("Guid Value couldn't be empty");\r
+ Log.wrn("New File", "Guid Value couldn't be empty");\r
return false;\r
}\r
if (isEmpty(this.jTextFieldVersion.getText())) {\r
- Log.err("Version couldn't be empty");\r
+ Log.wrn("New File", "Version couldn't be empty");\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 Base 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");\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 existing in 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 existing in database");\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 existing in database");\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
//\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 PackageSurfaceArea 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 FrameworkPlatformDescription 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