1. Show source files' attributes when editing SourceFiles in msa

2. Set default value to "Module" when new a msa
3. Move OpenFile.java from identification to common

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1064 6f19259b-4bc3-4df7-8a09-765794883524

10 files changed, 22 insertions, 17 deletions

diff --git a/Tools/Source/FrameworkWizard/FrameworkWizard.msa b/Tools/Source/FrameworkWizard/FrameworkWizard.msa
index 596836d..e11f7bb 100644
--- a/Tools/Source/FrameworkWizard/FrameworkWizard.msa
+++ b/Tools/Source/FrameworkWizard/FrameworkWizard.msa
@@ -53,12 +53,12 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
     <Filename>src/org/tianocore/frameworkwizard/common/IDefaultTableModel.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/IFileFilter.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/Log.java</Filename>

+    <Filename>src/org/tianocore/frameworkwizard/common/OpenFile.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/SaveFile.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/Sort.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/Tools.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/XmlConfig.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/Identifications/Identification.java</Filename>

-    <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpenFile.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningFileType.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java</Filename>

     <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleType.java</Filename>

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
index 68d8c48..016bada 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/Clone.java
@@ -38,10 +38,10 @@ import org.tianocore.frameworkwizard.common.DataValidation;
 import org.tianocore.frameworkwizard.common.FileOperation;

 import org.tianocore.frameworkwizard.common.IFileFilter;

 import org.tianocore.frameworkwizard.common.Log;

+import org.tianocore.frameworkwizard.common.OpenFile;

 import org.tianocore.frameworkwizard.common.SaveFile;

 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.Identifications.Identification;

-import org.tianocore.frameworkwizard.common.Identifications.OpenFile;

 import org.tianocore.frameworkwizard.common.ui.IDialog;

 import org.tianocore.frameworkwizard.common.ui.IFrame;

 import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index 71e50f3..80df413 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
@@ -50,10 +50,10 @@ import org.tianocore.PlatformSurfaceAreaDocument;
 import org.tianocore.frameworkwizard.common.DataType;

 import org.tianocore.frameworkwizard.common.IFileFilter;

 import org.tianocore.frameworkwizard.common.Log;

+import org.tianocore.frameworkwizard.common.OpenFile;

 import org.tianocore.frameworkwizard.common.SaveFile;

 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.Identifications.Identification;

-import org.tianocore.frameworkwizard.common.Identifications.OpenFile;

 import org.tianocore.frameworkwizard.common.Identifications.OpeningModuleList;

 import org.tianocore.frameworkwizard.common.Identifications.OpeningModuleType;

 import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageList;

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
index d6be739..3d5a696 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/SelectModuleBelong.java
@@ -58,7 +58,7 @@ public class SelectModuleBelong extends IDialog {
      **/

     private static final long serialVersionUID = 4171355136991448972L;

 

-    private JPanel jContentPane = null;  //  @jve:decl-index=0:visual-constraint="10,54"

+    private JPanel jContentPane = null;

 

     private JComboBox jComboBoxExistingPackage = null;

 

@@ -99,7 +99,7 @@ public class SelectModuleBelong extends IDialog {
     private StarLabel jStarLabel4 = null;

 

     private StarLabel jStarLabel5 = null;

-    

+

     private ButtonGroup bg = new ButtonGroup();

 

     private WorkspaceTools wt = new WorkspaceTools();

@@ -251,8 +251,8 @@ public class SelectModuleBelong extends IDialog {
     private JRadioButton getJRadioButtonYes() {

         if (jRadioButtonYes == null) {

             jRadioButtonYes = new JRadioButton();

-            jRadioButtonYes.setBounds(new java.awt.Rectangle(140,35,100,20));

-            jRadioButtonYes.setSelected(true);

+            jRadioButtonYes.setBounds(new java.awt.Rectangle(140, 35, 100, 20));

+            jRadioButtonYes.setSelected(false);

             jRadioButtonYes.setText("Yes");

         }

         return jRadioButtonYes;

@@ -266,8 +266,8 @@ public class SelectModuleBelong extends IDialog {
     private JRadioButton getJRadioButtonNo() {

         if (jRadioButtonNo == null) {

             jRadioButtonNo = new JRadioButton();

-            jRadioButtonNo.setBounds(new java.awt.Rectangle(300,35,110,20));

-            jRadioButtonNo.setSelected(false);

+            jRadioButtonNo.setBounds(new java.awt.Rectangle(300, 35, 110, 20));

+            jRadioButtonNo.setSelected(true);

             jRadioButtonNo.setText("No");

         }

         return jRadioButtonNo;

@@ -341,7 +341,7 @@ public class SelectModuleBelong extends IDialog {
     private JPanel getJContentPane() {

         if (jContentPane == null) {

             jLabelIsLibrary = new JLabel();

-            jLabelIsLibrary.setBounds(new java.awt.Rectangle(15,35,120,20));

+            jLabelIsLibrary.setBounds(new java.awt.Rectangle(15, 35, 120, 20));

             jLabelIsLibrary.setText("Is a Library");

             jLabelVersion = new JLabel();

             jLabelVersion.setBounds(new java.awt.Rectangle(15, 135, 120, 20));

@@ -360,7 +360,7 @@ public class SelectModuleBelong extends IDialog {
             jLabelPackage.setText("Choose Package");

             jContentPane = new JPanel();

             jContentPane.setLayout(null);

-            jContentPane.setSize(new java.awt.Dimension(490,198));

+            jContentPane.setSize(new java.awt.Dimension(490, 198));

             jContentPane.add(getJComboBoxExistingPackage(), null);

             jContentPane.add(getJButtonOk(), null);

             jContentPane.add(getJButtonCancel(), null);

@@ -726,7 +726,7 @@ public class SelectModuleBelong extends IDialog {
     public void setPid(PackageIdentification pid) {

         this.pid = pid;

     }

-    

+

     private void upLocation(Component c, int size) {

         c.setLocation(c.getLocation().x, c.getLocation().y - size);

     }

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpenFile.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/OpenFile.java
index 9e16ca1..32eec68 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/Identifications/OpenFile.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/OpenFile.java
@@ -12,7 +12,7 @@
  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.

  

  **/

-package org.tianocore.frameworkwizard.common.Identifications;

+package org.tianocore.frameworkwizard.common;

 

 import java.io.File;

 import java.io.IOException;

@@ -27,7 +27,6 @@ import org.tianocore.FrameworkDatabaseDocument.FrameworkDatabase;
 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;

 import org.tianocore.PackageSurfaceAreaDocument.PackageSurfaceArea;

 import org.tianocore.PlatformSurfaceAreaDocument.PlatformSurfaceArea;

-import org.tianocore.frameworkwizard.common.Log;

 

 public class OpenFile {

     /**

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQuery.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQuery.java
index f2a5263..a3ebfed 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQuery.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/far/PackageQuery.java
@@ -25,7 +25,7 @@ import org.tianocore.ModuleSurfaceAreaDocument;
 import org.tianocore.PackageDependenciesDocument;

 import org.tianocore.PackageSurfaceAreaDocument;

 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;

-import org.tianocore.frameworkwizard.common.Identifications.OpenFile;

+import org.tianocore.frameworkwizard.common.OpenFile;

 import org.tianocore.frameworkwizard.packaging.PackageIdentification;

 import org.tianocore.frameworkwizard.workspace.WorkspaceTools;

 

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/ModuleIdentification.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/ModuleIdentification.java
index 8671204..02189d9 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/ModuleIdentification.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/ModuleIdentification.java
@@ -23,8 +23,8 @@ import org.tianocore.LibraryUsage;
 import org.tianocore.LibraryClassDefinitionsDocument.LibraryClassDefinitions;

 import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;

 import org.tianocore.frameworkwizard.common.DataType;

+import org.tianocore.frameworkwizard.common.OpenFile;

 import org.tianocore.frameworkwizard.common.Identifications.Identification;

-import org.tianocore.frameworkwizard.common.Identifications.OpenFile;

 import org.tianocore.frameworkwizard.packaging.PackageIdentification;

 

 public class ModuleIdentification extends Identification {

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesVector.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesVector.java
index c08ae21..0e5cdc9 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesVector.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/Identifications/SourceFiles/SourceFilesVector.java
@@ -92,6 +92,9 @@ public class SourceFilesVector {
     public Vector<String> toStringVector(int index) {

         Vector<String> v = new Vector<String>();

         v.addElement(getSourceFiles(index).getFilename());

+        v.addElement(getSourceFiles(index).getTagName());

+        v.addElement(getSourceFiles(index).getToolCode());

+        v.addElement(getSourceFiles(index).getToolChainFamily());

         return v;

     }

 }

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
index eab29be..eaeb13e 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/module/ui/ModuleSourceFiles.java
@@ -181,6 +181,9 @@ public class ModuleSourceFiles extends IInternalFrame {
             jTable.setRowHeight(20);

 

             model.addColumn("File Name");

+            model.addColumn("Tag Name");

+            model.addColumn("Tool Code");

+            model.addColumn("Tool Chain Family");

 

             jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

             jTable.getSelectionModel().addListSelectionListener(this);

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
index 16cfaad..43ae277 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/workspace/WorkspaceTools.java
@@ -34,11 +34,11 @@ import org.tianocore.SourceFilesDocument.SourceFiles;
 import org.tianocore.SpdHeaderDocument.SpdHeader;

 import org.tianocore.frameworkwizard.common.DataType;

 import org.tianocore.frameworkwizard.common.Log;

+import org.tianocore.frameworkwizard.common.OpenFile;

 import org.tianocore.frameworkwizard.common.SaveFile;

 import org.tianocore.frameworkwizard.common.Sort;

 import org.tianocore.frameworkwizard.common.Tools;

 import org.tianocore.frameworkwizard.common.Identifications.Identification;

-import org.tianocore.frameworkwizard.common.Identifications.OpenFile;

 import org.tianocore.frameworkwizard.far.FarHeader;

 import org.tianocore.frameworkwizard.far.FarIdentification;

 import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;