**/\r
package org.tianocore.frameworkwizard;\r
\r
+import java.awt.Component;\r
import java.awt.event.ActionEvent;\r
import java.io.File;\r
import java.util.Vector;\r
\r
+import javax.swing.ButtonGroup;\r
import javax.swing.JButton;\r
import javax.swing.JComboBox;\r
import javax.swing.JFileChooser;\r
import org.tianocore.frameworkwizard.common.ui.IDialog;\r
import org.tianocore.frameworkwizard.common.ui.IFrame;\r
import org.tianocore.frameworkwizard.common.ui.StarLabel;\r
-import org.tianocore.frameworkwizard.module.Identification.ModuleIdentification;\r
+import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
import org.tianocore.frameworkwizard.packaging.PackageIdentification;\r
import org.tianocore.frameworkwizard.platform.PlatformIdentification;\r
import org.tianocore.frameworkwizard.workspace.Workspace;\r
import org.tianocore.frameworkwizard.workspace.WorkspaceTools;\r
+import javax.swing.JRadioButton;\r
\r
public class SelectModuleBelong extends IDialog {\r
\r
**/\r
private static final long serialVersionUID = 4171355136991448972L;\r
\r
- private JPanel jContentPane = null;\r
+ private JPanel jContentPane = null; // @jve:decl-index=0:visual-constraint="10,54"\r
\r
private JComboBox jComboBoxExistingPackage = null;\r
\r
private StarLabel jStarLabel4 = null;\r
\r
private StarLabel jStarLabel5 = null;\r
+ \r
+ private ButtonGroup bg = new ButtonGroup();\r
\r
private WorkspaceTools wt = new WorkspaceTools();\r
\r
\r
private int mode = -1;\r
\r
+ private JLabel jLabelIsLibrary = null;\r
+\r
+ private JRadioButton jRadioButtonYes = null;\r
+\r
+ private JRadioButton jRadioButtonNo = null;\r
+\r
/**\r
* This method initializes jComboBoxExistingPackage \r
* \r
private JButton getJButtonOk() {\r
if (jButtonOk == null) {\r
jButtonOk = new JButton();\r
- jButtonOk.setBounds(new java.awt.Rectangle(310, 140, 80, 20));\r
+ jButtonOk.setBounds(new java.awt.Rectangle(310, 165, 80, 20));\r
jButtonOk.setText("Ok");\r
jButtonOk.addActionListener(this);\r
}\r
private JButton getJButtonCancel() {\r
if (jButtonCancel == null) {\r
jButtonCancel = new JButton();\r
- jButtonCancel.setBounds(new java.awt.Rectangle(395, 140, 80, 20));\r
+ jButtonCancel.setBounds(new java.awt.Rectangle(395, 165, 80, 20));\r
jButtonCancel.setText("Cancel");\r
jButtonCancel.addActionListener(this);\r
}\r
private JTextField getJTextFieldFilePath() {\r
if (jTextFieldFilePath == null) {\r
jTextFieldFilePath = new JTextField();\r
- jTextFieldFilePath.setBounds(new java.awt.Rectangle(140, 35, 250, 20));\r
+ jTextFieldFilePath.setBounds(new java.awt.Rectangle(140, 60, 250, 20));\r
}\r
return jTextFieldFilePath;\r
}\r
private JButton getJButtonBrowse() {\r
if (jButtonBrowse == null) {\r
jButtonBrowse = new JButton();\r
- jButtonBrowse.setBounds(new java.awt.Rectangle(395, 35, 85, 20));\r
+ jButtonBrowse.setBounds(new java.awt.Rectangle(395, 60, 85, 20));\r
jButtonBrowse.setText("Browse");\r
jButtonBrowse.addActionListener(this);\r
}\r
private JTextField getJTextFieldName() {\r
if (jTextFieldName == null) {\r
jTextFieldName = new JTextField();\r
- jTextFieldName.setBounds(new java.awt.Rectangle(140, 60, 340, 20));\r
+ jTextFieldName.setBounds(new java.awt.Rectangle(140, 85, 340, 20));\r
}\r
return jTextFieldName;\r
}\r
private JTextField getJTextFieldGuid() {\r
if (jTextFieldGuid == null) {\r
jTextFieldGuid = new JTextField();\r
- jTextFieldGuid.setBounds(new java.awt.Rectangle(140, 85, 250, 20));\r
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(140, 110, 250, 20));\r
}\r
return jTextFieldGuid;\r
}\r
private JButton getJButtonGen() {\r
if (jButtonGen == null) {\r
jButtonGen = new JButton();\r
- jButtonGen.setBounds(new java.awt.Rectangle(395, 85, 85, 20));\r
+ jButtonGen.setBounds(new java.awt.Rectangle(395, 110, 85, 20));\r
jButtonGen.setText("GEN");\r
jButtonGen.addActionListener(this);\r
}\r
private JTextField getJTextFieldVersion() {\r
if (jTextFieldVersion == null) {\r
jTextFieldVersion = new JTextField();\r
- jTextFieldVersion.setBounds(new java.awt.Rectangle(140, 110, 340, 20));\r
+ jTextFieldVersion.setBounds(new java.awt.Rectangle(140, 135, 340, 20));\r
}\r
return jTextFieldVersion;\r
}\r
\r
+ /**\r
+ * This method initializes jRadioButtonYes \r
+ * \r
+ * @return javax.swing.JRadioButton \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.setText("Yes");\r
+ }\r
+ return jRadioButtonYes;\r
+ }\r
+\r
+ /**\r
+ * This method initializes jRadioButtonNo \r
+ * \r
+ * @return javax.swing.JRadioButton \r
+ */\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.setText("No");\r
+ }\r
+ return jRadioButtonNo;\r
+ }\r
+\r
/**\r
* @param args\r
*/\r
this.jStarLabel1.setVisible(false);\r
this.jLabelPackage.setVisible(false);\r
this.jComboBoxExistingPackage.setVisible(false);\r
+ this.jLabelIsLibrary.setVisible(false);\r
+ this.jRadioButtonYes.setVisible(false);\r
+ this.jRadioButtonNo.setVisible(false);\r
+ upLocation(this.jStarLabel2, 50);\r
+ upLocation(this.jStarLabel3, 50);\r
+ upLocation(this.jStarLabel4, 50);\r
+ upLocation(this.jStarLabel5, 50);\r
+ upLocation(this.jLabelFilePath, 50);\r
+ upLocation(this.jLabelName, 50);\r
+ upLocation(this.jLabelGuid, 50);\r
+ upLocation(this.jLabelVersion, 50);\r
+ upLocation(this.jTextFieldFilePath, 50);\r
+ upLocation(this.jTextFieldName, 50);\r
+ upLocation(this.jTextFieldGuid, 50);\r
+ upLocation(this.jTextFieldVersion, 50);\r
+ upLocation(this.jButtonBrowse, 50);\r
+ upLocation(this.jButtonGen, 50);\r
}\r
}\r
\r
* @return void\r
*/\r
private void init() {\r
- this.setSize(500, 200);\r
+ this.setSize(500, 230);\r
this.setContentPane(getJContentPane());\r
- this.setTitle("New Module");\r
+ this.setTitle("New");\r
this.centerWindow();\r
}\r
\r
*/\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.setText("Is a Library");\r
jLabelVersion = new JLabel();\r
- jLabelVersion.setBounds(new java.awt.Rectangle(15, 110, 120, 20));\r
+ jLabelVersion.setBounds(new java.awt.Rectangle(15, 135, 120, 20));\r
jLabelVersion.setText("Version");\r
jLabelGuid = new JLabel();\r
- jLabelGuid.setBounds(new java.awt.Rectangle(15, 85, 120, 20));\r
+ jLabelGuid.setBounds(new java.awt.Rectangle(15, 110, 120, 20));\r
jLabelGuid.setText("Guid");\r
jLabelName = new JLabel();\r
- jLabelName.setBounds(new java.awt.Rectangle(15, 60, 120, 20));\r
+ jLabelName.setBounds(new java.awt.Rectangle(15, 85, 120, 20));\r
jLabelName.setText("Name");\r
jLabelFilePath = new JLabel();\r
- jLabelFilePath.setBounds(new java.awt.Rectangle(15, 35, 120, 20));\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
jContentPane = new JPanel();\r
jContentPane.setLayout(null);\r
- jContentPane.setSize(new java.awt.Dimension(490, 175));\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
jStarLabel1 = new StarLabel();\r
jStarLabel1.setLocation(new java.awt.Point(0, 10));\r
jStarLabel2 = new StarLabel();\r
- jStarLabel2.setLocation(new java.awt.Point(0, 35));\r
+ jStarLabel2.setLocation(new java.awt.Point(0, 60));\r
jStarLabel3 = new StarLabel();\r
- jStarLabel3.setLocation(new java.awt.Point(0, 60));\r
+ jStarLabel3.setLocation(new java.awt.Point(0, 85));\r
jStarLabel4 = new StarLabel();\r
- jStarLabel4.setLocation(new java.awt.Point(0, 85));\r
+ jStarLabel4.setLocation(new java.awt.Point(0, 110));\r
jStarLabel5 = new StarLabel();\r
- jStarLabel5.setLocation(new java.awt.Point(0, 110));\r
+ jStarLabel5.setLocation(new java.awt.Point(0, 135));\r
jContentPane.add(jStarLabel1, null);\r
jContentPane.add(jStarLabel2, null);\r
jContentPane.add(jStarLabel3, null);\r
jContentPane.add(jStarLabel4, null);\r
jContentPane.add(jStarLabel5, null);\r
+ jContentPane.add(jLabelIsLibrary, null);\r
+ jContentPane.add(getJRadioButtonYes(), null);\r
+ jContentPane.add(getJRadioButtonNo(), null);\r
+ bg.add(getJRadioButtonNo());\r
+ bg.add(getJRadioButtonYes());\r
}\r
return jContentPane;\r
}\r
String packagePath = packages.elementAt(this.jComboBoxExistingPackage.getSelectedIndex()).getPath();\r
String modulePath = Tools.convertPathToCurrentOsType(this.jTextFieldFilePath.getText());\r
Vector<String> msaFile = wt.getAllModulesOfPackage(packagePath);\r
- packagePath = packagePath.substring(0, packagePath.lastIndexOf(DataType.FILE_SEPARATOR));\r
- String path = Tools.getRelativePath(modulePath, packagePath);\r
\r
for (int index = 0; index < msaFile.size(); index++) {\r
- if (msaFile.elementAt(index).equals(path)) {\r
+ if (msaFile.elementAt(index).equals(modulePath)) {\r
Log.err("This module is already existing in selected package");\r
return false;\r
}\r
// Save to identification\r
//\r
mid = new ModuleIdentification(this.jTextFieldName.getText(), this.jTextFieldGuid.getText(),\r
- this.jTextFieldVersion.getText(), path);\r
+ this.jTextFieldVersion.getText(), path, jRadioButtonYes.isSelected());\r
mid.setPackageId(packages.elementAt(this.jComboBoxExistingPackage.getSelectedIndex()));\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
projects / mirror_edk2.git / blobdiff