summaryrefslogtreecommitdiff
path: root/Tools
diff options
context:
space:
mode:
Diffstat (limited to 'Tools')
-rw-r--r--Tools/Source/ModuleEditor/MANIFEST.MF1
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdHeader.java71
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java72
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleBootModes.java6
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleDataHubs.java6
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleEvents.java6
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleExterns.java12
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleFormsets.java6
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleGuids.java6
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleHobs.java6
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleIncludes.java74
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleLibraryClassDefinitions.java4
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java8
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePpis.java6
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleProtocols.java6
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java2
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java130
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java127
-rw-r--r--Tools/Source/ModuleEditor/src/org/tianocore/packaging/workspace/common/Workspace.java24
19 files changed, 229 insertions, 344 deletions
diff --git a/Tools/Source/ModuleEditor/MANIFEST.MF b/Tools/Source/ModuleEditor/MANIFEST.MF
index dffa2192fa..544cd0bae9 100644
--- a/Tools/Source/ModuleEditor/MANIFEST.MF
+++ b/Tools/Source/ModuleEditor/MANIFEST.MF
@@ -1,3 +1,2 @@
Manifest-Version: 1.0
Main-Class: org.tianocore.packaging.module.ui.ModuleMain
-Class-Path: ../Jars/SurfaceArea.jar ../bin/xmlbeans/lib/jsr173_1.0_api.jar ../bin/xmlbeans/lib/xbean.jar ../bin/xmlbeans/lib/xbean_xpath.jar ../bin/xmlbeans/lib/xmlpublic.jar ../bin/xmlbeans/lib/saxon8.jar ../bin/xmlbeans/lib/saxon8-jdom.jar ../bin/xmlbeans/lib/saxon8-sql.jar ../bin/xmlbeans/lib/resolver.jar
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdHeader.java
index 9176407277..c9e65d1262 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdHeader.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdHeader.java
@@ -72,8 +72,6 @@ public class MbdHeader extends IInternalFrame {
private JLabel jLabelCopyright = null;
- private JTextArea jTextAreaCopyright = null;
-
private JLabel jLabelDescription = null;
private JTextArea jTextAreaDescription = null;
@@ -84,8 +82,6 @@ public class MbdHeader extends IInternalFrame {
private JScrollPane jScrollPaneLicense = null;
- private JScrollPane jScrollPaneCopyright = null;
-
private JScrollPane jScrollPaneDescription = null;
private StarLabel jStarLabel1 = null;
@@ -102,6 +98,8 @@ public class MbdHeader extends IInternalFrame {
private MbdHeaderDocument.MbdHeader mbdHeader = null;
+ private JTextField jTextFieldCopyright = null;
+
/**
This method initializes jTextFieldBaseName
@@ -125,7 +123,7 @@ public class MbdHeader extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 250, 20));
}
return jTextFieldGuid;
}
@@ -153,7 +151,7 @@ public class MbdHeader extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -176,20 +174,6 @@ public class MbdHeader extends IInternalFrame {
}
/**
- This method initializes jTextAreaCopyright
-
- @return javax.swing.JTextArea jTextAreaCopyright
-
- **/
- private JTextArea getJTextAreaCopyright() {
- if (jTextAreaCopyright == null) {
- jTextAreaCopyright = new JTextArea();
- jTextAreaCopyright.setLineWrap(true);
- }
- return jTextAreaCopyright;
- }
-
- /**
This method initializes jTextAreaDescription
@return javax.swing.JTextArea jTextAreaDescription
@@ -252,22 +236,6 @@ public class MbdHeader extends IInternalFrame {
}
/**
- This method initializes jScrollPaneCopyright
-
- @return javax.swing.JScrollPane jScrollPaneCopyright
-
- **/
- private JScrollPane getJScrollPaneCopyright() {
- if (jScrollPaneCopyright == null) {
- jScrollPaneCopyright = new JScrollPane();
- jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 170, 320, 80));
- jScrollPaneCopyright.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
- jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());
- }
- return jScrollPaneCopyright;
- }
-
- /**
This method initializes jScrollPaneDescription
@return javax.swing.JScrollPane jScrollPaneDescription
@@ -276,13 +244,26 @@ public class MbdHeader extends IInternalFrame {
private JScrollPane getJScrollPaneDescription() {
if (jScrollPaneDescription == null) {
jScrollPaneDescription = new JScrollPane();
- jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 255, 320, 80));
+ jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 195, 320, 80));
jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
jScrollPaneDescription.setViewportView(getJTextAreaDescription());
}
return jScrollPaneDescription;
}
+ /**
+ * This method initializes jTextFieldCopyright
+ *
+ * @return javax.swing.JTextField
+ */
+ private JTextField getJTextFieldCopyright() {
+ if (jTextFieldCopyright == null) {
+ jTextFieldCopyright = new JTextField();
+ jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,170,320,20));
+ }
+ return jTextFieldCopyright;
+ }
+
public static void main(String[] args) {
}
@@ -343,7 +324,7 @@ public class MbdHeader extends IInternalFrame {
this.jTextAreaLicense.setText(this.mbdHeader.getLicense().getStringValue());
}
if (this.mbdHeader.getCopyright() != null) {
- this.jTextAreaCopyright.setText(this.mbdHeader.getCopyright());
+ this.jTextFieldCopyright.setText(this.mbdHeader.getCopyright());
}
if (this.mbdHeader.getDescription() != null) {
this.jTextAreaDescription.setText(this.mbdHeader.getDescription());
@@ -365,7 +346,7 @@ public class MbdHeader extends IInternalFrame {
this.jTextFieldGuid.setEnabled(!isView);
this.jTextFieldVersion.setEnabled(!isView);
this.jTextAreaLicense.setEnabled(!isView);
- this.jTextAreaCopyright.setEnabled(!isView);
+ this.jTextFieldCopyright.setEnabled(!isView);
this.jTextAreaDescription.setEnabled(!isView);
this.jButtonCancel.setEnabled(!isView);
this.jButtonGenerateGuid.setEnabled(!isView);
@@ -383,7 +364,7 @@ public class MbdHeader extends IInternalFrame {
if (jContentPane == null) {
jLabelDescription = new JLabel();
jLabelDescription.setText("Description");
- jLabelDescription.setBounds(new java.awt.Rectangle(15, 255, 140, 20));
+ jLabelDescription.setBounds(new java.awt.Rectangle(15, 195, 140, 20));
jLabelCopyright = new JLabel();
jLabelCopyright.setText("Copyright");
jLabelCopyright.setBounds(new java.awt.Rectangle(15, 170, 140, 20));
@@ -417,7 +398,6 @@ public class MbdHeader extends IInternalFrame {
jContentPane.add(getJButtonOk(), null);
jContentPane.add(getJButtonCancel(), null);
jContentPane.add(getJScrollPaneLicense(), null);
- jContentPane.add(getJScrollPaneCopyright(), null);
jContentPane.add(getJScrollPaneDescription(), null);
jStarLabel1 = new StarLabel();
@@ -431,7 +411,7 @@ public class MbdHeader extends IInternalFrame {
jStarLabel5 = new StarLabel();
jStarLabel5.setLocation(new java.awt.Point(0, 170));
jStarLabel6 = new StarLabel();
- jStarLabel6.setLocation(new java.awt.Point(0, 255));
+ jStarLabel6.setLocation(new java.awt.Point(0, 195));
jContentPane.add(jStarLabel1, null);
jContentPane.add(jStarLabel2, null);
@@ -439,6 +419,7 @@ public class MbdHeader extends IInternalFrame {
jContentPane.add(jStarLabel4, null);
jContentPane.add(jStarLabel5, null);
jContentPane.add(jStarLabel6, null);
+ jContentPane.add(getJTextFieldCopyright(), null);
}
return jContentPane;
}
@@ -494,7 +475,7 @@ public class MbdHeader extends IInternalFrame {
Log.err("License couldn't be empty");
return false;
}
- if (isEmpty(this.jTextAreaCopyright.getText())) {
+ if (isEmpty(this.jTextFieldCopyright.getText())) {
Log.err("Copyright couldn't be empty");
return false;
}
@@ -514,7 +495,7 @@ public class MbdHeader extends IInternalFrame {
Log.err("Incorrect data type for Guid");
return false;
}
- if (!DataValidation.isCopyright(this.jTextAreaCopyright.getText())) {
+ if (!DataValidation.isCopyright(this.jTextFieldCopyright.getText())) {
Log.err("Incorrect data type for Copyright");
return false;
}
@@ -558,7 +539,7 @@ public class MbdHeader extends IInternalFrame {
this.mbdHeader.setLicense(mLicense);
}
- this.mbdHeader.setCopyright(this.jTextAreaCopyright.getText());
+ this.mbdHeader.setCopyright(this.jTextFieldCopyright.getText());
this.mbdHeader.setDescription(this.jTextAreaDescription.getText());
if (this.mbdHeader.getCreated() == null) {
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java
index 7f355c1e4d..8adde849a0 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MbdLibHeader.java
@@ -72,8 +72,6 @@ public class MbdLibHeader extends IInternalFrame {
private JLabel jLabelCopyright = null;
- private JTextArea jTextAreaCopyright = null;
-
private JLabel jLabelDescription = null;
private JTextArea jTextAreaDescription = null;
@@ -84,8 +82,6 @@ public class MbdLibHeader extends IInternalFrame {
private JScrollPane jScrollPaneLicense = null;
- private JScrollPane jScrollPaneCopyright = null;
-
private JScrollPane jScrollPaneDescription = null;
private StarLabel jStarLabel1 = null;
@@ -102,6 +98,8 @@ public class MbdLibHeader extends IInternalFrame {
private MbdLibHeaderDocument.MbdLibHeader mbdLibHeader = null;
+ private JTextField jTextFieldCopyright = null;
+
/**
This method initializes jTextFieldBaseName
@@ -125,7 +123,7 @@ public class MbdLibHeader extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 250, 20));
}
return jTextFieldGuid;
}
@@ -153,7 +151,7 @@ public class MbdLibHeader extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -176,20 +174,6 @@ public class MbdLibHeader extends IInternalFrame {
}
/**
- This method initializes jTextAreaCopyright
-
- @return javax.swing.JTextArea jTextAreaCopyright
-
- **/
- private JTextArea getJTextAreaCopyright() {
- if (jTextAreaCopyright == null) {
- jTextAreaCopyright = new JTextArea();
- jTextAreaCopyright.setLineWrap(true);
- }
- return jTextAreaCopyright;
- }
-
- /**
This method initializes jTextAreaDescription
@return javax.swing.JTextArea jTextAreaDescription
@@ -252,22 +236,6 @@ public class MbdLibHeader extends IInternalFrame {
}
/**
- This method initializes jScrollPaneCopyright
-
- @return javax.swing.JScrollPane jScrollPaneCopyright
-
- **/
- private JScrollPane getJScrollPaneCopyright() {
- if (jScrollPaneCopyright == null) {
- jScrollPaneCopyright = new JScrollPane();
- jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 170, 320, 80));
- jScrollPaneCopyright.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
- jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());
- }
- return jScrollPaneCopyright;
- }
-
- /**
This method initializes jScrollPaneDescription
@return javax.swing.JScrollPane jScrollPaneDescription
@@ -276,13 +244,27 @@ public class MbdLibHeader extends IInternalFrame {
private JScrollPane getJScrollPaneDescription() {
if (jScrollPaneDescription == null) {
jScrollPaneDescription = new JScrollPane();
- jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 255, 320, 80));
+ jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 195, 320, 80));
jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
jScrollPaneDescription.setViewportView(getJTextAreaDescription());
}
return jScrollPaneDescription;
}
+ /**
+ This method initializes jTextFieldCopyright
+
+ @return javax.swing.JTextField jTextFieldCopyright
+
+ **/
+ private JTextField getJTextFieldCopyright() {
+ if (jTextFieldCopyright == null) {
+ jTextFieldCopyright = new JTextField();
+ jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,170,320,20));
+ }
+ return jTextFieldCopyright;
+ }
+
public static void main(String[] args) {
}
@@ -345,7 +327,7 @@ public class MbdLibHeader extends IInternalFrame {
this.jTextAreaLicense.setText(this.mbdLibHeader.getLicense().getStringValue());
}
if (this.mbdLibHeader.getCopyright() != null) {
- this.jTextAreaCopyright.setText(this.mbdLibHeader.getCopyright());
+ this.jTextFieldCopyright.setText(this.mbdLibHeader.getCopyright());
}
if (this.mbdLibHeader.getDescription() != null) {
this.jTextAreaDescription.setText(this.mbdLibHeader.getDescription());
@@ -367,7 +349,7 @@ public class MbdLibHeader extends IInternalFrame {
this.jTextFieldGuid.setEnabled(!isView);
this.jTextFieldVersion.setEnabled(!isView);
this.jTextAreaLicense.setEnabled(!isView);
- this.jTextAreaCopyright.setEnabled(!isView);
+ this.jTextFieldCopyright.setEnabled(!isView);
this.jTextAreaDescription.setEnabled(!isView);
this.jButtonCancel.setEnabled(!isView);
this.jButtonGenerateGuid.setEnabled(!isView);
@@ -385,7 +367,7 @@ public class MbdLibHeader extends IInternalFrame {
if (jContentPane == null) {
jLabelDescription = new JLabel();
jLabelDescription.setText("Description");
- jLabelDescription.setBounds(new java.awt.Rectangle(15, 255, 140, 20));
+ jLabelDescription.setBounds(new java.awt.Rectangle(15, 195, 140, 20));
jLabelCopyright = new JLabel();
jLabelCopyright.setText("Copyright");
jLabelCopyright.setBounds(new java.awt.Rectangle(15, 170, 140, 20));
@@ -419,7 +401,6 @@ public class MbdLibHeader extends IInternalFrame {
jContentPane.add(getJButtonOk(), null);
jContentPane.add(getJButtonCancel(), null);
jContentPane.add(getJScrollPaneLicense(), null);
- jContentPane.add(getJScrollPaneCopyright(), null);
jContentPane.add(getJScrollPaneDescription(), null);
jStarLabel1 = new StarLabel();
@@ -433,7 +414,7 @@ public class MbdLibHeader extends IInternalFrame {
jStarLabel5 = new StarLabel();
jStarLabel5.setLocation(new java.awt.Point(0, 170));
jStarLabel6 = new StarLabel();
- jStarLabel6.setLocation(new java.awt.Point(0, 255));
+ jStarLabel6.setLocation(new java.awt.Point(0, 195));
jContentPane.add(jStarLabel1, null);
jContentPane.add(jStarLabel2, null);
@@ -441,6 +422,7 @@ public class MbdLibHeader extends IInternalFrame {
jContentPane.add(jStarLabel4, null);
jContentPane.add(jStarLabel5, null);
jContentPane.add(jStarLabel6, null);
+ jContentPane.add(getJTextFieldCopyright(), null);
}
return jContentPane;
}
@@ -493,7 +475,7 @@ public class MbdLibHeader extends IInternalFrame {
Log.err("License couldn't be empty");
return false;
}
- if (isEmpty(this.jTextAreaCopyright.getText())) {
+ if (isEmpty(this.jTextFieldCopyright.getText())) {
Log.err("Copyright couldn't be empty");
return false;
}
@@ -513,7 +495,7 @@ public class MbdLibHeader extends IInternalFrame {
Log.err("Incorrect data type for Guid");
return false;
}
- if (!DataValidation.isCopyright(this.jTextAreaCopyright.getText())) {
+ if (!DataValidation.isCopyright(this.jTextFieldCopyright.getText())) {
Log.err("Incorrect data type for Copyright");
return false;
}
@@ -557,7 +539,7 @@ public class MbdLibHeader extends IInternalFrame {
this.mbdLibHeader.setLicense(mLicense);
}
- this.mbdLibHeader.setCopyright(this.jTextAreaCopyright.getText());
+ this.mbdLibHeader.setCopyright(this.jTextFieldCopyright.getText());
this.mbdLibHeader.setDescription(this.jTextAreaDescription.getText());
if (this.mbdLibHeader.getCreated() == null) {
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleBootModes.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleBootModes.java
index 1acfa821e7..308b17dd8e 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleBootModes.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleBootModes.java
@@ -88,7 +88,7 @@ public class ModuleBootModes extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 250, 20));
}
return jTextFieldGuid;
}
@@ -162,7 +162,7 @@ public class ModuleBootModes extends IInternalFrame {
private JTextField getJTextFieldOverrideID() {
if (jTextFieldOverrideID == null) {
jTextFieldOverrideID = new JTextField();
- jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+ jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 85, 50, 20));
}
return jTextFieldOverrideID;
}
@@ -176,7 +176,7 @@ public class ModuleBootModes extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleDataHubs.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleDataHubs.java
index 1d8e88c061..79613d2724 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleDataHubs.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleDataHubs.java
@@ -87,7 +87,7 @@ public class ModuleDataHubs extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 250, 20));
}
return jTextFieldGuid;
}
@@ -161,7 +161,7 @@ public class ModuleDataHubs extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -177,7 +177,7 @@ public class ModuleDataHubs extends IInternalFrame {
private JTextField getJTextFieldOverrideID() {
if (jTextFieldOverrideID == null) {
jTextFieldOverrideID = new JTextField();
- jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+ jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 85, 50, 20));
}
return jTextFieldOverrideID;
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleEvents.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleEvents.java
index abc3653d29..5d6151ff13 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleEvents.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleEvents.java
@@ -154,7 +154,7 @@ public class ModuleEvents extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 250, 20));
}
return jTextFieldGuid;
}
@@ -229,7 +229,7 @@ public class ModuleEvents extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 60, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 60, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -245,7 +245,7 @@ public class ModuleEvents extends IInternalFrame {
private JTextField getJTextFieldOverrideID() {
if (jTextFieldOverrideID == null) {
jTextFieldOverrideID = new JTextField();
- jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 135, 320, 20));
+ jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 135, 50, 20));
}
return jTextFieldOverrideID;
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleExterns.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleExterns.java
index ad466eb621..263f1b44e4 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleExterns.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleExterns.java
@@ -181,7 +181,7 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
private JTextField getJTextFieldOverrideID() {
if (jTextFieldOverrideID == null) {
jTextFieldOverrideID = new JTextField();
- jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+ jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 60, 50, 20));
}
return jTextFieldOverrideID;
}
@@ -763,11 +763,11 @@ public class ModuleExterns extends IInternalFrame implements ItemListener {
jComboBoxUsage.addItem("ALWAYS_CONSUMED");
jComboBoxUsage.addItem("ALWAYS_PRODUCED");
- jComboBoxType.addItem("Type 1");
- jComboBoxType.addItem("Type 2");
- jComboBoxType.addItem("Type 3");
- jComboBoxType.addItem("Type 4");
- jComboBoxType.addItem("Type 5");
+ jComboBoxType.addItem("Entry/Unload");
+ jComboBoxType.addItem("Library");
+ jComboBoxType.addItem("Driver Bindings");
+ jComboBoxType.addItem("Call Backs");
+ jComboBoxType.addItem("Other");
jPanelType1.setVisible(true);
jPanelType2.setVisible(false);
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleFormsets.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleFormsets.java
index f725379ca8..192c029f61 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleFormsets.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleFormsets.java
@@ -100,7 +100,7 @@ public class ModuleFormsets extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 250, 20));
}
return jTextFieldGuid;
}
@@ -160,7 +160,7 @@ public class ModuleFormsets extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -176,7 +176,7 @@ public class ModuleFormsets extends IInternalFrame {
private JTextField getJTextFieldOverrideID() {
if (jTextFieldOverrideID == null) {
jTextFieldOverrideID = new JTextField();
- jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 85, 320, 20));
+ jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 85, 50, 20));
}
return jTextFieldOverrideID;
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleGuids.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleGuids.java
index 186709644f..c4ac34b089 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleGuids.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleGuids.java
@@ -124,7 +124,7 @@ public class ModuleGuids extends IInternalFrame {
private JTextField getJTextFieldGuidValsue() {
if (jTextFieldGuidValue == null) {
jTextFieldGuidValue = new JTextField();
- jTextFieldGuidValue.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+ jTextFieldGuidValue.setBounds(new java.awt.Rectangle(160, 35, 250, 20));
}
return jTextFieldGuidValue;
}
@@ -273,7 +273,7 @@ public class ModuleGuids extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -289,7 +289,7 @@ public class ModuleGuids extends IInternalFrame {
private JTextField getJTextFieldOverrideID() {
if (jTextFieldOverrideID == null) {
jTextFieldOverrideID = new JTextField();
- jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 210, 320, 20));
+ jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 210, 50, 20));
}
return jTextFieldOverrideID;
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleHobs.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleHobs.java
index 3d209e5634..0ea8ac8cba 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleHobs.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleHobs.java
@@ -117,7 +117,7 @@ public class ModuleHobs extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 250, 20));
}
return jTextFieldGuid;
}
@@ -238,7 +238,7 @@ public class ModuleHobs extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 60, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 60, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -254,7 +254,7 @@ public class ModuleHobs extends IInternalFrame {
private JTextField getJTextFieldOverrideID() {
if (jTextFieldOverrideID == null) {
jTextFieldOverrideID = new JTextField();
- jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 320, 20));
+ jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 50, 20));
}
return jTextFieldOverrideID;
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleIncludes.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleIncludes.java
index dccee3148a..b4dcce7373 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleIncludes.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleIncludes.java
@@ -36,6 +36,7 @@ import org.tianocore.common.Log;
import org.tianocore.packaging.common.ui.IDefaultMutableTreeNode;
import org.tianocore.packaging.common.ui.IInternalFrame;
import org.tianocore.packaging.common.ui.StarLabel;
+import org.tianocore.packaging.workspace.common.Workspace;
/**
The class is used to create, update Include of MSA/MBD file
@@ -91,8 +92,6 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
private StarLabel jStarLabel1 = null;
- private JTextField jTextFieldPackageName = null;
-
private JComboBox jComboBoxFileList = null;
private JButton jButtonAdd = null;
@@ -109,6 +108,12 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
private JComboBox jComboBoxArch = null;
+ private JComboBox jComboBoxPackageName = null;
+
+ private Workspace ws = null;
+
+ private Vector vecPackageName = null;
+
/**
This method initializes jButtonOk
@@ -171,20 +176,6 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
}
/**
- This method initializes jTextFieldPackageName
-
- @return javax.swing.JTextField jTextFieldPackageName
-
- **/
- private JTextField getJTextFieldPackageName() {
- if (jTextFieldPackageName == null) {
- jTextFieldPackageName = new JTextField();
- jTextFieldPackageName.setBounds(new java.awt.Rectangle(160, 10, 320, 20));
- }
- return jTextFieldPackageName;
- }
-
- /**
This method initializes jComboBoxFileList
@return javax.swing.JComboBox jComboBoxFileList
@@ -293,6 +284,19 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
return jComboBoxArch;
}
+ /**
+ * This method initializes jComboBoxPackageName
+ *
+ * @return javax.swing.JComboBox
+ */
+ private JComboBox getJComboBoxPackageName() {
+ if (jComboBoxPackageName == null) {
+ jComboBoxPackageName = new JComboBox();
+ jComboBoxPackageName.setBounds(new java.awt.Rectangle(160,10,320,20));
+ }
+ return jComboBoxPackageName;
+ }
+
public static void main(String[] args) {
}
@@ -465,7 +469,7 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
if (isView) {
this.jComboBoxPackageType.setEnabled(!isView);
this.jComboBoxUsage.setEnabled(!isView);
- this.jTextFieldPackageName.setEnabled(!isView);
+ this.jComboBoxPackageName.setEnabled(!isView);
this.jButtonAdd.setEnabled(!isView);
this.jButtonUpdate.setEnabled(!isView);
this.jButtonRemove.setEnabled(!isView);
@@ -512,7 +516,6 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
jStarLabel1.setLocation(new java.awt.Point(0, 10));
jContentPane.add(jStarLabel1, null);
- jContentPane.add(getJTextFieldPackageName(), null);
jContentPane.add(getJComboBoxFileList(), null);
jContentPane.add(getJButtonAdd(), null);
jContentPane.add(getJButtonUpdate(), null);
@@ -521,6 +524,7 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
jContentPane.add(getJTextFieldUpdatedDate(), null);
jContentPane.add(getJCheckBoxArch(), null);
jContentPane.add(getJComboBoxArch(), null);
+ jContentPane.add(getJComboBoxPackageName(), null);
}
return jContentPane;
}
@@ -573,6 +577,12 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
**/
private void initFrame() {
+ ws = new Workspace();
+ vecPackageName = ws.getAllPackageName();
+ for (int index = 0; index < vecPackageName.size(); index++) {
+ jComboBoxPackageName.addItem(vecPackageName.elementAt(index));
+ }
+
jComboBoxUsage.addItem("ALWAYS_CONSUMED");
jComboBoxUsage.addItem("ALWAYS_PRODUCED");
jComboBoxUsage.addItem("DEFAULT");
@@ -596,12 +606,12 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
**/
private void addToList() {
intSelectedItemId = vPackageName.size();
- vPackageName.addElement(this.jTextFieldPackageName.getText());
+ vPackageName.addElement(this.jComboBoxPackageName.getSelectedItem().toString());
vUsage.addElement(this.jComboBoxUsage.getSelectedItem().toString());
vPackageType.addElement(this.jComboBoxPackageType.getSelectedItem().toString());
vUpdatedDate.addElement(this.jTextFieldUpdatedDate.getText());
- jComboBoxFileList.addItem(this.jTextFieldPackageName.getText());
- jComboBoxFileList.setSelectedItem(this.jTextFieldPackageName.getText());
+ jComboBoxFileList.addItem(this.jComboBoxPackageName.getSelectedItem().toString());
+ jComboBoxFileList.setSelectedItem(this.jComboBoxPackageName.getSelectedItem().toString());
//
// Reset select item index
@@ -647,7 +657,7 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
//
int intTempIndex = intSelectedItemId;
- vPackageName.setElementAt(this.jTextFieldPackageName.getText(), intSelectedItemId);
+ vPackageName.setElementAt(this.jComboBoxPackageName.getSelectedItem().toString(), intSelectedItemId);
vUsage.setElementAt(this.jComboBoxUsage.getSelectedItem().toString(), intSelectedItemId);
vPackageType.setElementAt(this.jComboBoxPackageType.getSelectedItem().toString(), intSelectedItemId);
vUpdatedDate.setElementAt(this.jTextFieldUpdatedDate.getText(), intSelectedItemId);
@@ -684,14 +694,14 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
//
intSelectedItemId = jComboBoxFileList.getSelectedIndex();
- this.jTextFieldPackageName.setText(vPackageName.elementAt(intSelectedItemId).toString());
+ this.jComboBoxPackageName.setSelectedItem(vPackageName.elementAt(intSelectedItemId).toString());
this.jComboBoxUsage.setSelectedItem(vUsage.elementAt(intSelectedItemId).toString());
this.jComboBoxPackageType.setSelectedItem(vPackageType.elementAt(intSelectedItemId).toString());
this.jTextFieldUpdatedDate.setText(vUpdatedDate.elementAt(intSelectedItemId).toString());
} else {
- this.jTextFieldPackageName.setText("");
- this.jComboBoxUsage.setSelectedItem("");
- this.jComboBoxPackageType.setSelectedItem("");
+ this.jComboBoxPackageName.setSelectedIndex(0);
+ this.jComboBoxUsage.setSelectedIndex(0);
+ this.jComboBoxPackageType.setSelectedIndex(0);
this.jTextFieldUpdatedDate.setText("");
}
}
@@ -752,20 +762,8 @@ public class ModuleIncludes extends IInternalFrame implements ItemListener {
**/
public boolean checkAdd() {
//
- // Check if all required fields are not empty
- //
- if (isEmpty(this.jTextFieldPackageName.getText())) {
- Log.err("File Name couldn't be empty");
- return false;
- }
-
- //
// Check if all fields have correct data types
//
- if (!DataValidation.isPackageName(this.jTextFieldPackageName.getText())) {
- Log.err("Incorrect data type for Package Name");
- return false;
- }
if (!isEmpty(this.jTextFieldUpdatedDate.getText())
&& !DataValidation.isDateType(this.jTextFieldUpdatedDate.getText())) {
Log.err("Incorrect data type for Update Date");
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleLibraryClassDefinitions.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleLibraryClassDefinitions.java
index dfd6893f18..ed81e8e065 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleLibraryClassDefinitions.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleLibraryClassDefinitions.java
@@ -111,7 +111,7 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
if (jRadioButtonSelect == null) {
jRadioButtonSelect = new JRadioButton();
jRadioButtonSelect.setBounds(new java.awt.Rectangle(15, 10, 205, 20));
- jRadioButtonSelect.setText("Select an existed Library Class");
+ jRadioButtonSelect.setText("Select an existing Library Class");
jRadioButtonSelect.addActionListener(this);
jRadioButtonSelect.setSelected(true);
}
@@ -605,7 +605,7 @@ public class ModuleLibraryClassDefinitions extends IInternalFrame {
/**
Get LibraryClassDefinitionsDocument.LibraryClassDefinitions
- @return
+ @return LibraryClassDefinitionsDocument.LibraryClassDefinitions
**/
public LibraryClassDefinitionsDocument.LibraryClassDefinitions getLibraryClassDefinitions() {
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java
index a9a0c21e5b..883c0a5f60 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleMain.java
@@ -1491,7 +1491,7 @@ public class ModuleMain extends IFrame implements MouseListener, TreeSelectionLi
Log.err("Open Msa " + strMsaFilePath, e.getMessage());
return;
} catch (Exception e) {
- Log.err("Open Msa " + strMsaFilePath, e.getMessage());
+ Log.err("Open Msa " + strMsaFilePath, "Invalid file type");
return;
}
@@ -1539,7 +1539,7 @@ public class ModuleMain extends IFrame implements MouseListener, TreeSelectionLi
Log.err("Open Mbd " + strMbdFilePath, e.getMessage());
return;
} catch (Exception e) {
- Log.err("Open Mbd " + strMbdFilePath, e.getMessage());
+ Log.err("Open Mbd " + strMbdFilePath, "Invalid file type");
return;
}
@@ -1587,7 +1587,7 @@ public class ModuleMain extends IFrame implements MouseListener, TreeSelectionLi
Log.err("Open Mlsa " + strMlsaFilePath, e.getMessage());
return;
} catch (Exception e) {
- Log.err("Open Mlsa " + strMlsaFilePath, e.getMessage());
+ Log.err("Open Mlsa " + strMlsaFilePath, "Invalid file type");
return;
}
@@ -1635,7 +1635,7 @@ public class ModuleMain extends IFrame implements MouseListener, TreeSelectionLi
Log.err("Open Mlbd " + strMlbdFilePath, e.getMessage());
return;
} catch (Exception e) {
- Log.err("Open Mlbd " + strMlbdFilePath, e.getMessage());
+ Log.err("Open Mlbd " + strMlbdFilePath, "Invalid file type");
return;
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePpis.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePpis.java
index 41435d1483..42d0fb8d70 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePpis.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModulePpis.java
@@ -158,7 +158,7 @@ public class ModulePpis extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 250, 20));
}
return jTextFieldGuid;
}
@@ -265,7 +265,7 @@ public class ModulePpis extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 60, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 60, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -281,7 +281,7 @@ public class ModulePpis extends IInternalFrame {
private JTextField getJTextFieldOverrideID() {
if (jTextFieldOverrideID == null) {
jTextFieldOverrideID = new JTextField();
- jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 320, 20));
+ jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 50, 20));
}
return jTextFieldOverrideID;
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleProtocols.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleProtocols.java
index cd7a9b0324..46955ce68f 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleProtocols.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleProtocols.java
@@ -123,7 +123,7 @@ public class ModuleProtocols extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 60, 250, 20));
}
return jTextFieldGuid;
}
@@ -264,7 +264,7 @@ public class ModuleProtocols extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 60, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 60, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -280,7 +280,7 @@ public class ModuleProtocols extends IInternalFrame {
private JTextField getJTextFieldOverrideID() {
if (jTextFieldOverrideID == null) {
jTextFieldOverrideID = new JTextField();
- jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 320, 20));
+ jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 160, 50, 20));
}
return jTextFieldOverrideID;
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java
index aeaf88f9fd..aff195ea5b 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/ModuleSystemTables.java
@@ -139,7 +139,7 @@ public class ModuleSystemTables extends IInternalFrame {
private JTextField getJTextFieldOverrideID() {
if (jTextFieldOverrideID == null) {
jTextFieldOverrideID = new JTextField();
- jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 60, 320, 20));
+ jTextFieldOverrideID.setBounds(new java.awt.Rectangle(160, 60, 50, 20));
}
return jTextFieldOverrideID;
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
index f3e7011b3d..e1682887c5 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaHeader.java
@@ -78,8 +78,6 @@ public class MsaHeader extends IInternalFrame {
private JLabel jLabelCopyright = null;
- private JTextArea jTextAreaCopyright = null;
-
private JLabel jLabelDescription = null;
private JTextArea jTextAreaDescription = null;
@@ -88,20 +86,14 @@ public class MsaHeader extends IInternalFrame {
private JTextField jTextFieldSpecification = null;
- private JTextField jTextFieldSpecificationVersion = null;
-
private JButton jButtonOk = null;
private JButton jButtonCancel = null;
private JScrollPane jScrollPaneLicense = null;
- private JScrollPane jScrollPaneCopyright = null;
-
private JScrollPane jScrollPaneDescription = null;
- private JLabel jLabelSpecVersion = null;
-
private JLabel jLabelAbstract = null;
private JTextField jTextFieldAbstract = null;
@@ -138,6 +130,8 @@ public class MsaHeader extends IInternalFrame {
private JTextField jTextFieldAbstractURL = null;
+ private JTextField jTextFieldCopyright = null;
+
/**
This method initializes jTextFieldBaseName
@@ -161,7 +155,7 @@ public class MsaHeader extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 250, 20));
}
return jTextFieldGuid;
}
@@ -189,7 +183,7 @@ public class MsaHeader extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -212,20 +206,6 @@ public class MsaHeader extends IInternalFrame {
}
/**
- This method initializes jTextAreaCopyright
-
- @return javax.swing.JTextArea jTextAreaCopyright
-
- **/
- private JTextArea getJTextAreaCopyright() {
- if (jTextAreaCopyright == null) {
- jTextAreaCopyright = new JTextArea();
- jTextAreaCopyright.setLineWrap(true);
- }
- return jTextAreaCopyright;
- }
-
- /**
This method initializes jTextAreaDescription
@return javax.swing.JTextArea jTextAreaDescription
@@ -248,26 +228,12 @@ public class MsaHeader extends IInternalFrame {
private JTextField getJTextFieldSpecification() {
if (jTextFieldSpecification == null) {
jTextFieldSpecification = new JTextField();
- jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 340, 220, 20));
+ jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 280, 320, 20));
}
return jTextFieldSpecification;
}
/**
- This method initializes jTextFieldSpecificationVersion
-
- @return javax.swing.JTextField jTextFieldSpecificationVersion
-
- **/
- private JTextField getJTextFieldSpecificationVersion() {
- if (jTextFieldSpecificationVersion == null) {
- jTextFieldSpecificationVersion = new JTextField();
- jTextFieldSpecificationVersion.setBounds(new java.awt.Rectangle(400, 340, 80, 20));
- }
- return jTextFieldSpecificationVersion;
- }
-
- /**
This method initializes jButtonOk
@return javax.swing.JButton jButtonOk
@@ -316,22 +282,6 @@ public class MsaHeader extends IInternalFrame {
}
/**
- This method initializes jScrollPaneCopyright
-
- @return javax.swing.JScrollPane jScrollPaneCopyright
-
- **/
- private JScrollPane getJScrollPaneCopyright() {
- if (jScrollPaneCopyright == null) {
- jScrollPaneCopyright = new JScrollPane();
- jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 170, 320, 80));
- jScrollPaneCopyright.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
- jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());
- }
- return jScrollPaneCopyright;
- }
-
- /**
This method initializes jScrollPaneDescription
@return javax.swing.JScrollPane jScrollPaneDescription
@@ -340,7 +290,7 @@ public class MsaHeader extends IInternalFrame {
private JScrollPane getJScrollPaneDescription() {
if (jScrollPaneDescription == null) {
jScrollPaneDescription = new JScrollPane();
- jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 255, 320, 80));
+ jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 195, 320, 80));
jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
jScrollPaneDescription.setViewportView(getJTextAreaDescription());
}
@@ -356,7 +306,7 @@ public class MsaHeader extends IInternalFrame {
private JTextField getJTextFieldAbstract() {
if (jTextFieldAbstract == null) {
jTextFieldAbstract = new JTextField();
- jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 365, 200, 20));
+ jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 305, 320, 20));
}
return jTextFieldAbstract;
}
@@ -370,7 +320,7 @@ public class MsaHeader extends IInternalFrame {
private JComboBox getJComboBoxCompontentType() {
if (jComboBoxCompontentType == null) {
jComboBoxCompontentType = new JComboBox();
- jComboBoxCompontentType.setBounds(new java.awt.Rectangle(160, 415, 320, 20));
+ jComboBoxCompontentType.setBounds(new java.awt.Rectangle(160, 380, 320, 20));
}
return jComboBoxCompontentType;
}
@@ -384,7 +334,7 @@ public class MsaHeader extends IInternalFrame {
private JComboBox getJComboBoxModuleType() {
if (jComboBoxModuleType == null) {
jComboBoxModuleType = new JComboBox();
- jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 390, 320, 20));
+ jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 355, 320, 20));
}
return jComboBoxModuleType;
}
@@ -398,11 +348,25 @@ public class MsaHeader extends IInternalFrame {
private JTextField getJTextFieldAbstractURL() {
if (jTextFieldAbstractURL == null) {
jTextFieldAbstractURL = new JTextField();
- jTextFieldAbstractURL.setBounds(new java.awt.Rectangle(390, 365, 90, 20));
+ jTextFieldAbstractURL.setBounds(new java.awt.Rectangle(160, 330, 320, 20));
}
return jTextFieldAbstractURL;
}
+ /**
+ This method initializes jTextFieldCopyright
+
+ @return javax.swing.JTextField jTextFieldCopyright
+
+ **/
+ private JTextField getJTextFieldCopyright() {
+ if (jTextFieldCopyright == null) {
+ jTextFieldCopyright = new JTextField();
+ jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,170,320, 20));
+ }
+ return jTextFieldCopyright;
+ }
+
public static void main(String[] args) {
}
@@ -444,10 +408,9 @@ public class MsaHeader extends IInternalFrame {
this.jTextFieldGuid.setEnabled(!isView);
this.jTextFieldVersion.setEnabled(!isView);
this.jTextAreaLicense.setEnabled(!isView);
- this.jTextAreaCopyright.setEnabled(!isView);
+ this.jTextFieldCopyright.setEnabled(!isView);
this.jTextAreaDescription.setEnabled(!isView);
- this.jTextFieldSpecification.setEnabled(!isView);
- this.jTextFieldSpecificationVersion.setEnabled(!isView);
+ this.jTextFieldSpecification.setEnabled(!isView);
this.jTextFieldAbstract.setEnabled(!isView);
this.jTextFieldAbstractURL.setEnabled(!isView);
this.jComboBoxModuleType.setEnabled(!isView);
@@ -493,7 +456,7 @@ public class MsaHeader extends IInternalFrame {
this.jTextAreaLicense.setText(this.msaHeader.getLicense().getStringValue());
}
if (this.msaHeader.getCopyright() != null) {
- this.jTextAreaCopyright.setText(this.msaHeader.getCopyright());
+ this.jTextFieldCopyright.setText(this.msaHeader.getCopyright());
}
if (this.msaHeader.getDescription() != null) {
this.jTextAreaDescription.setText(this.msaHeader.getDescription());
@@ -501,9 +464,6 @@ public class MsaHeader extends IInternalFrame {
if (this.msaHeader.getSpecification() != null) {
this.jTextFieldSpecification.setText(this.msaHeader.getSpecification().getStringValue());
}
- if (this.msaHeader.getSpecification() != null) {
- this.jTextFieldSpecificationVersion.setText(this.msaHeader.getSpecification().getVersion());
- }
if (this.msaHeader.getAbstract() != null) {
this.jTextFieldAbstract.setText(this.msaHeader.getAbstract().getStringValue());
this.jTextFieldAbstractURL.setText(this.msaHeader.getAbstract().getURL());
@@ -526,27 +486,23 @@ public class MsaHeader extends IInternalFrame {
private JPanel getJContentPane() {
if (jContentPane == null) {
jLabelURL = new JLabel();
- jLabelURL.setBounds(new java.awt.Rectangle(365, 365, 25, 20));
+ jLabelURL.setBounds(new java.awt.Rectangle(15,330,140,20));
jLabelURL.setText("URL");
jLabelCompontentType = new JLabel();
- jLabelCompontentType.setBounds(new java.awt.Rectangle(15, 415, 140, 20));
+ jLabelCompontentType.setBounds(new java.awt.Rectangle(15, 380, 140, 20));
jLabelCompontentType.setText("Compontent Type");
jLabelModuleType = new JLabel();
- jLabelModuleType.setBounds(new java.awt.Rectangle(15, 390, 140, 20));
+ jLabelModuleType.setBounds(new java.awt.Rectangle(15, 355, 140, 20));
jLabelModuleType.setText("Module Type");
jLabelAbstract = new JLabel();
- jLabelAbstract.setBounds(new java.awt.Rectangle(15, 365, 140, 20));
+ jLabelAbstract.setBounds(new java.awt.Rectangle(15, 305, 140, 20));
jLabelAbstract.setText("Abstract");
- jLabelSpecVersion = new JLabel();
- jLabelSpecVersion.setBounds(new java.awt.Rectangle(382, 340, 15, 20));
- jLabelSpecVersion.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- jLabelSpecVersion.setText("V");
jLabelSpecification = new JLabel();
jLabelSpecification.setText("Specification");
- jLabelSpecification.setBounds(new java.awt.Rectangle(15, 340, 140, 20));
+ jLabelSpecification.setBounds(new java.awt.Rectangle(15, 280, 140, 20));
jLabelDescription = new JLabel();
jLabelDescription.setText("Description");
- jLabelDescription.setBounds(new java.awt.Rectangle(15, 255, 140, 20));
+ jLabelDescription.setBounds(new java.awt.Rectangle(15, 195, 140, 20));
jLabelCopyright = new JLabel();
jLabelCopyright.setText("Copyright");
jLabelCopyright.setBounds(new java.awt.Rectangle(15, 170, 140, 20));
@@ -579,15 +535,12 @@ public class MsaHeader extends IInternalFrame {
jContentPane.add(jLabelDescription, null);
jContentPane.add(jLabelSpecification, null);
jContentPane.add(getJTextFieldSpecification(), null);
- jContentPane.add(getJTextFieldSpecificationVersion(), null);
jContentPane.add(getJButtonOk(), null);
jContentPane.add(getJButtonCancel(), null);
jContentPane.add(getJScrollPaneLicense(), null);
- jContentPane.add(getJScrollPaneCopyright(), null);
jContentPane.add(getJScrollPaneDescription(), null);
jContentPane.add(jLabelAbstract, null);
jContentPane.add(getJTextFieldAbstract(), null);
- jContentPane.add(jLabelSpecVersion, null);
jContentPane.add(jLabelModuleType, null);
jContentPane.add(jLabelCompontentType, null);
jContentPane.add(getJComboBoxCompontentType(), null);
@@ -604,13 +557,13 @@ public class MsaHeader extends IInternalFrame {
jStarLabel5 = new StarLabel();
jStarLabel5.setLocation(new java.awt.Point(0, 170));
jStarLabel6 = new StarLabel();
- jStarLabel6.setLocation(new java.awt.Point(0, 255));
+ jStarLabel6.setLocation(new java.awt.Point(0, 195));
jStarLabel7 = new StarLabel();
- jStarLabel7.setLocation(new java.awt.Point(0, 365));
+ jStarLabel7.setLocation(new java.awt.Point(0, 305));
jStarLabel8 = new StarLabel();
- jStarLabel8.setLocation(new java.awt.Point(0, 390));
+ jStarLabel8.setLocation(new java.awt.Point(0, 355));
jStarLabel9 = new StarLabel();
- jStarLabel9.setLocation(new java.awt.Point(0, 415));
+ jStarLabel9.setLocation(new java.awt.Point(0, 380));
jContentPane.add(jStarLabel1, null);
jContentPane.add(jStarLabel2, null);
@@ -623,6 +576,7 @@ public class MsaHeader extends IInternalFrame {
jContentPane.add(jStarLabel9, null);
jContentPane.add(jLabelURL, null);
jContentPane.add(getJTextFieldAbstractURL(), null);
+ jContentPane.add(getJTextFieldCopyright(), null);
}
return jContentPane;
}
@@ -673,7 +627,7 @@ public class MsaHeader extends IInternalFrame {
Log.err("License couldn't be empty");
return false;
}
- if (isEmpty(this.jTextAreaCopyright.getText())) {
+ if (isEmpty(this.jTextFieldCopyright.getText())) {
Log.err("Copyright couldn't be empty");
return false;
}
@@ -701,7 +655,7 @@ public class MsaHeader extends IInternalFrame {
Log.err("Incorrect data type for Abstract");
return false;
}
- if (!DataValidation.isCopyright(this.jTextAreaCopyright.getText())) {
+ if (!DataValidation.isCopyright(this.jTextFieldCopyright.getText())) {
Log.err("Incorrect data type for Copyright");
return false;
}
@@ -745,17 +699,15 @@ public class MsaHeader extends IInternalFrame {
this.msaHeader.setLicense(mLicense);
}
- this.msaHeader.setCopyright(this.jTextAreaCopyright.getText());
+ this.msaHeader.setCopyright(this.jTextFieldCopyright.getText());
this.msaHeader.setDescription(this.jTextAreaDescription.getText());
if (this.msaHeader.getSpecification() != null) {
this.msaHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText());
- this.msaHeader.getSpecification().setVersion(this.jTextFieldSpecificationVersion.getText());
} else {
SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory
.newInstance();
mSpecification.setStringValue(this.jTextFieldSpecification.getText());
- mSpecification.setVersion(this.jTextFieldSpecificationVersion.getText());
this.msaHeader.setSpecification(mSpecification);
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java
index 0760a76786..c35c84f6d7 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/module/ui/MsaLibHeader.java
@@ -78,8 +78,6 @@ public class MsaLibHeader extends IInternalFrame {
private JLabel jLabelCopyright = null;
- private JTextArea jTextAreaCopyright = null;
-
private JLabel jLabelDescription = null;
private JTextArea jTextAreaDescription = null;
@@ -88,20 +86,14 @@ public class MsaLibHeader extends IInternalFrame {
private JTextField jTextFieldSpecification = null;
- private JTextField jTextFieldSpecificationVersion = null;
-
private JButton jButtonOk = null;
private JButton jButtonCancel = null;
private JScrollPane jScrollPaneLicense = null;
- private JScrollPane jScrollPaneCopyright = null;
-
private JScrollPane jScrollPaneDescription = null;
- private JLabel jLabelSpecVersion = null;
-
private JLabel jLabelAbstract = null;
private JTextField jTextFieldAbstract = null;
@@ -138,6 +130,8 @@ public class MsaLibHeader extends IInternalFrame {
private JTextField jTextFieldAbstractURL = null;
+ private JTextField jTextFieldCopyright = null;
+
/**
This method initializes jTextFieldBaseName
@@ -161,7 +155,7 @@ public class MsaLibHeader extends IInternalFrame {
private JTextField getJTextFieldGuid() {
if (jTextFieldGuid == null) {
jTextFieldGuid = new JTextField();
- jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 240, 20));
+ jTextFieldGuid.setBounds(new java.awt.Rectangle(160, 35, 250, 20));
}
return jTextFieldGuid;
}
@@ -189,7 +183,7 @@ public class MsaLibHeader extends IInternalFrame {
private JButton getJButtonGenerateGuid() {
if (jButtonGenerateGuid == null) {
jButtonGenerateGuid = new JButton();
- jButtonGenerateGuid.setBounds(new java.awt.Rectangle(405, 35, 75, 20));
+ jButtonGenerateGuid.setBounds(new java.awt.Rectangle(415, 35, 65, 20));
jButtonGenerateGuid.setText("GEN");
jButtonGenerateGuid.addActionListener(this);
}
@@ -212,20 +206,6 @@ public class MsaLibHeader extends IInternalFrame {
}
/**
- This method initializes jTextAreaCopyright
-
- @return javax.swing.JTextArea jTextAreaCopyright
-
- **/
- private JTextArea getJTextAreaCopyright() {
- if (jTextAreaCopyright == null) {
- jTextAreaCopyright = new JTextArea();
- jTextAreaCopyright.setLineWrap(true);
- }
- return jTextAreaCopyright;
- }
-
- /**
This method initializes jTextAreaDescription
@return javax.swing.JTextArea jTextAreaDescription
@@ -248,26 +228,12 @@ public class MsaLibHeader extends IInternalFrame {
private JTextField getJTextFieldSpecification() {
if (jTextFieldSpecification == null) {
jTextFieldSpecification = new JTextField();
- jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 340, 220, 20));
+ jTextFieldSpecification.setBounds(new java.awt.Rectangle(160, 280, 320, 20));
}
return jTextFieldSpecification;
}
/**
- This method initializes jTextFieldSpecificationVersion
-
- @return javax.swing.JTextField jTextFieldSpecificationVersion
-
- **/
- private JTextField getJTextFieldSpecificationVersion() {
- if (jTextFieldSpecificationVersion == null) {
- jTextFieldSpecificationVersion = new JTextField();
- jTextFieldSpecificationVersion.setBounds(new java.awt.Rectangle(400, 340, 80, 20));
- }
- return jTextFieldSpecificationVersion;
- }
-
- /**
This method initializes jButtonOk
@return javax.swing.JButton jButtonOk
@@ -316,22 +282,6 @@ public class MsaLibHeader extends IInternalFrame {
}
/**
- This method initializes jScrollPaneCopyright
-
- @return javax.swing.JScrollPane jScrollPaneCopyright
-
- **/
- private JScrollPane getJScrollPaneCopyright() {
- if (jScrollPaneCopyright == null) {
- jScrollPaneCopyright = new JScrollPane();
- jScrollPaneCopyright.setBounds(new java.awt.Rectangle(160, 170, 320, 80));
- jScrollPaneCopyright.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
- jScrollPaneCopyright.setViewportView(getJTextAreaCopyright());
- }
- return jScrollPaneCopyright;
- }
-
- /**
This method initializes jScrollPaneDescription
@return javax.swing.JScrollPane jScrollPaneDescription
@@ -340,7 +290,7 @@ public class MsaLibHeader extends IInternalFrame {
private JScrollPane getJScrollPaneDescription() {
if (jScrollPaneDescription == null) {
jScrollPaneDescription = new JScrollPane();
- jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 255, 320, 80));
+ jScrollPaneDescription.setBounds(new java.awt.Rectangle(160, 195, 320, 80));
jScrollPaneDescription.setHorizontalScrollBarPolicy(javax.swing.JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
jScrollPaneDescription.setViewportView(getJTextAreaDescription());
}
@@ -356,7 +306,7 @@ public class MsaLibHeader extends IInternalFrame {
private JTextField getJTextFieldAbstract() {
if (jTextFieldAbstract == null) {
jTextFieldAbstract = new JTextField();
- jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 365, 200, 20));
+ jTextFieldAbstract.setBounds(new java.awt.Rectangle(160, 305, 320, 20));
}
return jTextFieldAbstract;
}
@@ -370,7 +320,7 @@ public class MsaLibHeader extends IInternalFrame {
private JComboBox getJComboBoxCompontentType() {
if (jComboBoxCompontentType == null) {
jComboBoxCompontentType = new JComboBox();
- jComboBoxCompontentType.setBounds(new java.awt.Rectangle(160, 415, 320, 20));
+ jComboBoxCompontentType.setBounds(new java.awt.Rectangle(160, 380, 320, 20));
}
return jComboBoxCompontentType;
}
@@ -384,7 +334,7 @@ public class MsaLibHeader extends IInternalFrame {
private JComboBox getJComboBoxModuleType() {
if (jComboBoxModuleType == null) {
jComboBoxModuleType = new JComboBox();
- jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 390, 320, 20));
+ jComboBoxModuleType.setBounds(new java.awt.Rectangle(160, 355, 320, 20));
}
return jComboBoxModuleType;
}
@@ -398,11 +348,24 @@ public class MsaLibHeader extends IInternalFrame {
private JTextField getJTextFieldAbstractURL() {
if (jTextFieldAbstractURL == null) {
jTextFieldAbstractURL = new JTextField();
- jTextFieldAbstractURL.setBounds(new java.awt.Rectangle(390, 365, 90, 20));
+ jTextFieldAbstractURL.setBounds(new java.awt.Rectangle(160,330,320,20));
}
return jTextFieldAbstractURL;
}
+ /**
+ * This method initializes jTextFieldCopyright
+ *
+ * @return javax.swing.JTextField
+ */
+ private JTextField getJTextFieldCopyright() {
+ if (jTextFieldCopyright == null) {
+ jTextFieldCopyright = new JTextField();
+ jTextFieldCopyright.setBounds(new java.awt.Rectangle(160,170,320,20));
+ }
+ return jTextFieldCopyright;
+ }
+
public static void main(String[] args) {
}
@@ -465,7 +428,7 @@ public class MsaLibHeader extends IInternalFrame {
this.jTextAreaLicense.setText(this.msaLibHeader.getLicense().getStringValue());
}
if (this.msaLibHeader.getCopyright() != null) {
- this.jTextAreaCopyright.setText(this.msaLibHeader.getCopyright());
+ this.jTextFieldCopyright.setText(this.msaLibHeader.getCopyright());
}
if (this.msaLibHeader.getDescription() != null) {
this.jTextAreaDescription.setText(this.msaLibHeader.getDescription());
@@ -473,9 +436,6 @@ public class MsaLibHeader extends IInternalFrame {
if (this.msaLibHeader.getSpecification() != null) {
this.jTextFieldSpecification.setText(this.msaLibHeader.getSpecification().getStringValue());
}
- if (this.msaLibHeader.getSpecification() != null) {
- this.jTextFieldSpecificationVersion.setText(this.msaLibHeader.getSpecification().getVersion());
- }
if (this.msaLibHeader.getAbstract() != null) {
this.jTextFieldAbstract.setText(this.msaLibHeader.getAbstract().getStringValue());
this.jTextFieldAbstractURL.setText(this.msaLibHeader.getAbstract().getURL());
@@ -503,10 +463,9 @@ public class MsaLibHeader extends IInternalFrame {
this.jTextFieldGuid.setEnabled(!isView);
this.jTextFieldVersion.setEnabled(!isView);
this.jTextAreaLicense.setEnabled(!isView);
- this.jTextAreaCopyright.setEnabled(!isView);
+ this.jTextFieldCopyright.setEnabled(!isView);
this.jTextAreaDescription.setEnabled(!isView);
this.jTextFieldSpecification.setEnabled(!isView);
- this.jTextFieldSpecificationVersion.setEnabled(!isView);
this.jTextFieldAbstract.setEnabled(!isView);
this.jTextFieldAbstractURL.setEnabled(!isView);
this.jComboBoxModuleType.setEnabled(!isView);
@@ -526,27 +485,23 @@ public class MsaLibHeader extends IInternalFrame {
private JPanel getJContentPane() {
if (jContentPane == null) {
jLabelURL = new JLabel();
- jLabelURL.setBounds(new java.awt.Rectangle(365, 365, 25, 20));
+ jLabelURL.setBounds(new java.awt.Rectangle(15,330,140,20));
jLabelURL.setText("URL");
jLabelCompontentType = new JLabel();
- jLabelCompontentType.setBounds(new java.awt.Rectangle(15, 415, 140, 20));
+ jLabelCompontentType.setBounds(new java.awt.Rectangle(15, 380, 140, 20));
jLabelCompontentType.setText("Compontent Type");
jLabelModuleType = new JLabel();
- jLabelModuleType.setBounds(new java.awt.Rectangle(15, 390, 140, 20));
+ jLabelModuleType.setBounds(new java.awt.Rectangle(15, 355, 140, 20));
jLabelModuleType.setText("Module Type");
jLabelAbstract = new JLabel();
- jLabelAbstract.setBounds(new java.awt.Rectangle(15, 365, 140, 20));
+ jLabelAbstract.setBounds(new java.awt.Rectangle(15, 305, 140, 20));
jLabelAbstract.setText("Abstract");
- jLabelSpecVersion = new JLabel();
- jLabelSpecVersion.setBounds(new java.awt.Rectangle(382, 340, 15, 20));
- jLabelSpecVersion.setHorizontalAlignment(javax.swing.SwingConstants.CENTER);
- jLabelSpecVersion.setText("V");
jLabelSpecification = new JLabel();
jLabelSpecification.setText("Specification");
- jLabelSpecification.setBounds(new java.awt.Rectangle(15, 340, 140, 20));
+ jLabelSpecification.setBounds(new java.awt.Rectangle(15, 280, 140, 20));
jLabelDescription = new JLabel();
jLabelDescription.setText("Description");
- jLabelDescription.setBounds(new java.awt.Rectangle(15, 255, 140, 20));
+ jLabelDescription.setBounds(new java.awt.Rectangle(15, 195, 140, 20));
jLabelCopyright = new JLabel();
jLabelCopyright.setText("Copyright");
jLabelCopyright.setBounds(new java.awt.Rectangle(15, 170, 140, 20));
@@ -579,15 +534,12 @@ public class MsaLibHeader extends IInternalFrame {
jContentPane.add(jLabelDescription, null);
jContentPane.add(jLabelSpecification, null);
jContentPane.add(getJTextFieldSpecification(), null);
- jContentPane.add(getJTextFieldSpecificationVersion(), null);
jContentPane.add(getJButtonOk(), null);
jContentPane.add(getJButtonCancel(), null);
jContentPane.add(getJScrollPaneLicense(), null);
- jContentPane.add(getJScrollPaneCopyright(), null);
jContentPane.add(getJScrollPaneDescription(), null);
jContentPane.add(jLabelAbstract, null);
jContentPane.add(getJTextFieldAbstract(), null);
- jContentPane.add(jLabelSpecVersion, null);
jContentPane.add(jLabelModuleType, null);
jContentPane.add(jLabelCompontentType, null);
jContentPane.add(getJComboBoxCompontentType(), null);
@@ -604,13 +556,13 @@ public class MsaLibHeader extends IInternalFrame {
jStarLabel5 = new StarLabel();
jStarLabel5.setLocation(new java.awt.Point(0, 170));
jStarLabel6 = new StarLabel();
- jStarLabel6.setLocation(new java.awt.Point(0, 255));
+ jStarLabel6.setLocation(new java.awt.Point(0, 195));
jStarLabel7 = new StarLabel();
- jStarLabel7.setLocation(new java.awt.Point(0, 365));
+ jStarLabel7.setLocation(new java.awt.Point(0, 305));
jStarLabel8 = new StarLabel();
- jStarLabel8.setLocation(new java.awt.Point(0, 390));
+ jStarLabel8.setLocation(new java.awt.Point(0, 355));
jStarLabel9 = new StarLabel();
- jStarLabel9.setLocation(new java.awt.Point(0, 415));
+ jStarLabel9.setLocation(new java.awt.Point(0, 380));
jContentPane.add(jStarLabel1, null);
jContentPane.add(jStarLabel2, null);
@@ -623,6 +575,7 @@ public class MsaLibHeader extends IInternalFrame {
jContentPane.add(jStarLabel9, null);
jContentPane.add(jLabelURL, null);
jContentPane.add(getJTextFieldAbstractURL(), null);
+ jContentPane.add(getJTextFieldCopyright(), null);
}
return jContentPane;
}
@@ -675,7 +628,7 @@ public class MsaLibHeader extends IInternalFrame {
Log.err("License couldn't be empty");
return false;
}
- if (isEmpty(this.jTextAreaCopyright.getText())) {
+ if (isEmpty(this.jTextFieldCopyright.getText())) {
Log.err("Copyright couldn't be empty");
return false;
}
@@ -703,7 +656,7 @@ public class MsaLibHeader extends IInternalFrame {
Log.err("Incorrect data type for Abstract");
return false;
}
- if (!DataValidation.isCopyright(this.jTextAreaCopyright.getText())) {
+ if (!DataValidation.isCopyright(this.jTextFieldCopyright.getText())) {
Log.err("Incorrect data type for Copyright");
return false;
}
@@ -747,17 +700,15 @@ public class MsaLibHeader extends IInternalFrame {
this.msaLibHeader.setLicense(mLicense);
}
- this.msaLibHeader.setCopyright(this.jTextAreaCopyright.getText());
+ this.msaLibHeader.setCopyright(this.jTextFieldCopyright.getText());
this.msaLibHeader.setDescription(this.jTextAreaDescription.getText());
if (this.msaLibHeader.getSpecification() != null) {
this.msaLibHeader.getSpecification().setStringValue(this.jTextFieldSpecification.getText());
- this.msaLibHeader.getSpecification().setVersion(this.jTextFieldSpecificationVersion.getText());
} else {
SpecificationDocument.Specification mSpecification = SpecificationDocument.Specification.Factory
.newInstance();
mSpecification.setStringValue(this.jTextFieldSpecification.getText());
- mSpecification.setVersion(this.jTextFieldSpecificationVersion.getText());
this.msaLibHeader.setSpecification(mSpecification);
}
diff --git a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/workspace/common/Workspace.java b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/workspace/common/Workspace.java
index 1d98909832..fd27f182a6 100644
--- a/Tools/Source/ModuleEditor/src/org/tianocore/packaging/workspace/common/Workspace.java
+++ b/Tools/Source/ModuleEditor/src/org/tianocore/packaging/workspace/common/Workspace.java
@@ -16,6 +16,7 @@
package org.tianocore.packaging.workspace.common;
import java.io.File;
+import java.util.Vector;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -36,6 +37,8 @@ public class Workspace {
private String currentWorkspace = null;
private FrameworkDatabaseDocument xmlFrameworkDbDoc = null;
+
+ //private PackageDocument xmlPackage = null;
private String strWorkspaceDatabaseFile = System.getProperty("file.separator") + "Tools"
+ System.getProperty("file.separator") + "Conf"
@@ -113,8 +116,9 @@ public class Workspace {
**/
private void openFrameworkDb() {
String strFrameworkDbFilePath = this.getCurrentWorkspace() + strWorkspaceDatabaseFile;
+ File db = new File(strFrameworkDbFilePath);
try {
- xmlFrameworkDbDoc = (FrameworkDatabaseDocument) XmlObject.Factory.parse(strFrameworkDbFilePath);
+ xmlFrameworkDbDoc = (FrameworkDatabaseDocument) XmlObject.Factory.parse(db);
} catch (XmlException e) {
Log.err("Open Framework Database " + strFrameworkDbFilePath, e.getMessage());
return;
@@ -144,4 +148,22 @@ public class Workspace {
public void setXmlFrameworkDbDoc(FrameworkDatabaseDocument xmlFrameworkDbDoc) {
this.xmlFrameworkDbDoc = xmlFrameworkDbDoc;
}
+
+ /**
+ Get all package name form the FrameworkDatabase.db file
+
+ @return vPackageName A vector includes all package names
+
+ **/
+ public Vector getAllPackageName() {
+ Vector<String> vPackageName = new Vector<String>();
+ openFrameworkDb();
+
+ for (int index = 0; index < xmlFrameworkDbDoc.getFrameworkDatabase().getPackageList().sizeOfPackageArray(); index++) {
+ vPackageName.addElement(xmlFrameworkDbDoc.getFrameworkDatabase().getPackageList().getPackageArray(index)
+ .getPackageNameArray(0).getStringValue());
+ }
+
+ return vPackageName;
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-08 12:17:12 +0000