import org.tianocore.frameworkwizard.common.ui.IFrame;\r
import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
import org.tianocore.frameworkwizard.far.FarHeader;\r
+import org.tianocore.frameworkwizard.far.FarStringDefinition;\r
\r
public class CreateStepOne extends IDialog implements MouseListener {\r
\r
\r
private StarLabel jStarLabel12 = null;\r
\r
- private JTextField jTextFieldCopyright = null;\r
-\r
private JLabel jLabelURL = null;\r
\r
private JTextField jTextFieldURL = null;\r
\r
private FarHeader farHeader = new FarHeader();\r
\r
+ private JScrollPane jScrollPaneCopyright = null;\r
+\r
+ private JTextArea jTextAreaCopyright = null;\r
+\r
/**\r
* This method initializes jTextFieldBaseName\r
* \r
if (jTextFieldBaseName == null) {\r
jTextFieldBaseName = new JTextField();\r
jTextFieldBaseName.setBounds(new java.awt.Rectangle(160, 10, 520, 20));\r
- jTextFieldBaseName.setToolTipText("An brief Identifier, such as USB I/O Library, of the module");\r
+ jTextFieldBaseName.setToolTipText("A brief Identifier, such as USB I/O Drivers, of the Framework Archive.");\r
}\r
return jTextFieldBaseName;\r
}\r
jTextAreaLicense = new JTextArea();\r
jTextAreaLicense.setText("");\r
jTextAreaLicense.setLineWrap(true);\r
- jTextAreaLicense.setToolTipText("The License for this file");\r
+ jTextAreaLicense.setWrapStyleWord(true);\r
+ jTextAreaLicense.setToolTipText("The License for this FAR file.");\r
}\r
return jTextAreaLicense;\r
}\r
if (jTextAreaDescription == null) {\r
jTextAreaDescription = new JTextArea();\r
jTextAreaDescription.setLineWrap(true);\r
- jTextAreaDescription.setToolTipText("A verbose description of the module");\r
+ jTextAreaDescription.setWrapStyleWord(true);\r
+ jTextAreaDescription.setToolTipText("A verbose description of the FAR contents.");\r
}\r
return jTextAreaDescription;\r
}\r
if (jTextFieldSpecification == null) {\r
jTextFieldSpecification = new JTextField();\r
jTextFieldSpecification.setText("FRAMEWORK_BUILD_PACKAGING_SPECIFICATION 0x00000052");\r
- jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 290, 520, 20));\r
+ jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 310, 520, 20));\r
jTextFieldSpecification.setEditable(false);\r
}\r
return jTextFieldSpecification;\r
if (jScrollPaneLicense == null) {\r
jScrollPaneLicense = new JScrollPane();\r
jScrollPaneLicense.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);\r
- jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 200, 520, 60));\r
+ jScrollPaneLicense.setBounds(new java.awt.Rectangle(160, 220, 520, 60));\r
jScrollPaneLicense.setViewportView(getJTextAreaLicense());\r
}\r
return jScrollPaneLicense;\r
if (jTextFieldAbstract == null) {\r
jTextFieldAbstract = new JTextField();\r
jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 85, 520, 20));\r
- jTextFieldAbstract.setToolTipText("A one sentence description of this module");\r
+ jTextFieldAbstract.setToolTipText("A one sentence description of this FAR package.");\r
}\r
return jTextFieldAbstract;\r
}\r
\r
- /**\r
- * This method initializes jTextFieldCopyright\r
- * \r
- * @return javax.swing.JTextField jTextFieldCopyright\r
- * \r
- */\r
- private JTextField getJTextFieldCopyright() {\r
- if (jTextFieldCopyright == null) {\r
- jTextFieldCopyright = new JTextField();\r
- jTextFieldCopyright.setBounds(new java.awt.Rectangle(160, 175, 520, 20));\r
- jTextFieldCopyright.setToolTipText("One or more copyright lines");\r
- }\r
- return jTextFieldCopyright;\r
- }\r
-\r
/**\r
* This method initializes jTextFieldURL\r
* \r
private JTextField getJTextFieldURL() {\r
if (jTextFieldURL == null) {\r
jTextFieldURL = new JTextField();\r
- jTextFieldURL.setBounds(new java.awt.Rectangle(160, 265, 520, 20));\r
+ jTextFieldURL.setBounds(new java.awt.Rectangle(160, 285, 520, 20));\r
jTextFieldURL.setToolTipText("A URL for the latest version of the license");\r
}\r
return jTextFieldURL;\r
private JButton getJButtonCancel() {\r
if (jButtonCancel == null) {\r
jButtonCancel = new JButton();\r
- jButtonCancel.setBounds(new java.awt.Rectangle(590, 330, 90, 20));\r
+ jButtonCancel.setBounds(new java.awt.Rectangle(590, 350, 90, 20));\r
jButtonCancel.setText("Cancel");\r
jButtonCancel.addMouseListener(this);\r
}\r
private JButton getJButtonNext() {\r
if (jButtonNext == null) {\r
jButtonNext = new JButton();\r
- jButtonNext.setBounds(new java.awt.Rectangle(480, 330, 90, 20));\r
+ jButtonNext.setBounds(new java.awt.Rectangle(480, 350, 90, 20));\r
jButtonNext.setText("Next");\r
jButtonNext.addMouseListener(this);\r
}\r
return jButtonNext;\r
}\r
\r
+ /**\r
+ * This method initializes jScrollPaneCopyright \r
+ * \r
+ * @return javax.swing.JScrollPane \r
+ */\r
+ private JScrollPane getJScrollPaneCopyright() {\r
+ if (jScrollPaneCopyright == null) {\r
+ jScrollPaneCopyright = new JScrollPane();\r
+ jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 175, 520, 40));\r
+ jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());\r
+ }\r
+ return jScrollPaneCopyright;\r
+ }\r
+\r
+ /**\r
+ * This method initializes jTextAreaCopyright \r
+ * \r
+ * @return javax.swing.JTextArea \r
+ */\r
+ private JTextArea getJTextAreaCopyright() {\r
+ if (jTextAreaCopyright == null) {\r
+ jTextAreaCopyright = new JTextArea();\r
+ }\r
+ return jTextAreaCopyright;\r
+ }\r
+\r
public static void main(String[] args) {\r
CreateStepOne c = new CreateStepOne(new IFrame(), true);\r
c.setVisible(true);\r
this.jTextFieldGuid.setEnabled(!isView);\r
this.jTextFieldVersion.setEnabled(!isView);\r
this.jTextAreaLicense.setEnabled(!isView);\r
- this.jTextFieldCopyright.setEnabled(!isView);\r
+ this.jScrollPaneCopyright.setEnabled(!isView);\r
+ this.jTextAreaCopyright.setEnabled(!isView);\r
this.jTextAreaDescription.setEnabled(!isView);\r
this.jTextFieldSpecification.setEnabled(!isView);\r
this.jTextFieldAbstract.setEnabled(!isView);\r
* \r
*/\r
private void initialize() {\r
- this.setSize(700, 400);\r
+ this.setSize(700, 425);\r
this.setContentPane(getJScrollPane());\r
- this.setTitle("Create Framework Archive(FAR) - Step 1: Set FAR's baseic information");\r
+ this.setTitle(FarStringDefinition.CREATE_STEP_ONE_TITLE);\r
this.centerWindow();\r
}\r
\r
\r
jLabelURL = new JLabel();\r
jLabelURL.setText("License URL");\r
- jLabelURL.setBounds(new java.awt.Rectangle(35, 265, 120, 20));\r
+ jLabelURL.setBounds(new java.awt.Rectangle(35, 285, 120, 20));\r
jLabelBaseName = new JLabel();\r
jLabelBaseName.setText("FAR Name");\r
jLabelBaseName.setBounds(new java.awt.Rectangle(35, 10, 120, 20));\r
jLabelCopyright.setBounds(new java.awt.Rectangle(35, 175, 120, 20));\r
jLabelLicense = new JLabel();\r
jLabelLicense.setText("License");\r
- jLabelLicense.setBounds(new java.awt.Rectangle(35, 200, 120, 20));\r
+ jLabelLicense.setBounds(new java.awt.Rectangle(35, 220, 120, 20));\r
jLabelSpecification = new JLabel();\r
jLabelSpecification.setText("Specification");\r
- jLabelSpecification.setBounds(new java.awt.Rectangle(35, 290, 120, 20));\r
+ jLabelSpecification.setBounds(new java.awt.Rectangle(35, 310, 120, 20));\r
\r
jContentPane = new JPanel();\r
jContentPane.setLayout(null);\r
jContentPane.add(getJTextFieldAbstract(), null);\r
jContentPane.add(jLabelURL, null);\r
jContentPane.add(getJTextFieldURL(), null);\r
- jContentPane.add(getJTextFieldCopyright(), null);\r
jStarLabel1 = new StarLabel();\r
jStarLabel1.setLocation(new java.awt.Point(20, 10));\r
jStarLabel4 = new StarLabel();\r
jStarLabel7 = new StarLabel();\r
jStarLabel7.setLocation(new java.awt.Point(20, 175));\r
jStarLabel8 = new StarLabel();\r
- jStarLabel8.setLocation(new java.awt.Point(20, 200));\r
+ jStarLabel8.setLocation(new java.awt.Point(20, 220));\r
jStarLabel10 = new StarLabel();\r
jStarLabel10.setLocation(new java.awt.Point(20, 85));\r
jStarLabel12 = new StarLabel();\r
- jStarLabel12.setLocation(new java.awt.Point(20, 290));\r
+ jStarLabel12.setLocation(new java.awt.Point(20, 310));\r
\r
jContentPane.add(jStarLabel1, null);\r
jContentPane.add(jStarLabel4, null);\r
jContentPane.add(jStarLabel12, null);\r
jContentPane.add(getJButtonCancel(), null);\r
jContentPane.add(getJButtonNext(), null);\r
+ jContentPane.add(getJScrollPaneCopyright(), null);\r
}\r
return jContentPane;\r
}\r
// Check BaseName\r
//\r
if (isEmpty(this.jTextFieldBaseName.getText())) {\r
- Log.err("Base Name couldn't be empty");\r
+ Log.wrn("Create far", "FAR Name must be entered.");\r
return false;\r
}\r
if (!DataValidation.isBaseName(this.jTextFieldBaseName.getText())) {\r
- Log.err("Incorrect data type for Base Name");\r
+ Log.wrn("Create far", "Incorrect data type for FAR Name");\r
return false;\r
}\r
farHeader.setFarName(this.jTextFieldBaseName.getText());\r
// Check Guid\r
//\r
if (isEmpty(this.jTextFieldGuid.getText())) {\r
- Log.err("Guid Value couldn't be empty");\r
+ Log.wrn("Create far", "A GUID must be entered.");\r
return false;\r
}\r
if (!DataValidation.isGuid((this.jTextFieldGuid).getText())) {\r
- Log.err("Incorrect data type for Guid");\r
+ Log.wrn("Create far", "Incorrect data type for Guid");\r
return false;\r
}\r
farHeader.setGuidValue(this.jTextFieldGuid.getText());\r
// Check Version\r
//\r
if (isEmpty(this.jTextFieldVersion.getText())) {\r
- Log.err("Version couldn't be empty");\r
+ Log.wrn("Create far", "A Version must be entered.");\r
return false;\r
}\r
if (!DataValidation.isVersion(this.jTextFieldVersion.getText())) {\r
- Log.err("Incorrect data type for Version");\r
+ Log.wrn("Create far", "Incorrect data type for Version");\r
return false;\r
}\r
farHeader.setVersion(this.jTextFieldVersion.getText());\r
// Check Abstact\r
//\r
if (isEmpty(this.jTextFieldAbstract.getText())) {\r
- Log.err("Abstract couldn't be empty");\r
+ Log.wrn("Create far", "An Abstract must be entered.");\r
return false;\r
}\r
if (!DataValidation.isAbstract(this.jTextFieldAbstract.getText())) {\r
- Log.err("Incorrect data type for Abstract");\r
+ Log.wrn("Create far", "Incorrect data type for Abstract");\r
return false;\r
}\r
farHeader.setAbstractStr(this.jTextFieldAbstract.getText());\r
// Check Description\r
//\r
if (isEmpty(this.jTextAreaDescription.getText())) {\r
- Log.err("Description couldn't be empty");\r
+ Log.wrn("Create far", "A Description must be entered.");\r
return false;\r
}\r
farHeader.setDescription(this.jTextAreaDescription.getText());\r
//\r
// Check Copyright\r
//\r
- if (isEmpty(this.jTextFieldCopyright.getText())) {\r
- Log.err("Copyright couldn't be empty");\r
+ if (isEmpty(this.jTextAreaCopyright.getText())) {\r
+ Log.wrn("Create far", "The Copyright must be entered.");\r
return false;\r
}\r
- farHeader.setCopyright(this.jTextFieldCopyright.getText());\r
+ farHeader.setCopyright(this.jTextAreaCopyright.getText());\r
\r
//\r
// Check License\r
//\r
if (isEmpty(this.jTextAreaLicense.getText())) {\r
- Log.err("License couldn't be empty");\r
+ Log.wrn("Create far", "The License must be entered.");\r
return false;\r
}\r
farHeader.setLicense(this.jTextAreaLicense.getText());\r
// Add some logic process here\r
//\r
if (!valid()) {\r
- return;\r
+ return ;\r
}\r
if (stepTwo == null) {\r
stepTwo = new CreateStepTwo(this, true, this);\r
projects / mirror_edk2.git / blobdiff