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
This commit is contained in:
hche10x 2006-07-21 07:56:14 +00:00
parent 75dd1f9efc
commit f9d0ab9266
10 changed files with 22 additions and 17 deletions

View File

@ -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/IDefaultTableModel.java</Filename>
<Filename>src/org/tianocore/frameworkwizard/common/IFileFilter.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/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/SaveFile.java</Filename>
<Filename>src/org/tianocore/frameworkwizard/common/Sort.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/Tools.java</Filename>
<Filename>src/org/tianocore/frameworkwizard/common/XmlConfig.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/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/OpeningFileType.java</Filename>
<Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java</Filename> <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleList.java</Filename>
<Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleType.java</Filename> <Filename>src/org/tianocore/frameworkwizard/common/Identifications/OpeningModuleType.java</Filename>

View File

@ -38,10 +38,10 @@ import org.tianocore.frameworkwizard.common.DataValidation;
import org.tianocore.frameworkwizard.common.FileOperation; import org.tianocore.frameworkwizard.common.FileOperation;
import org.tianocore.frameworkwizard.common.IFileFilter; import org.tianocore.frameworkwizard.common.IFileFilter;
import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.OpenFile;
import org.tianocore.frameworkwizard.common.SaveFile; import org.tianocore.frameworkwizard.common.SaveFile;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.Identifications.Identification; 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.IDialog;
import org.tianocore.frameworkwizard.common.ui.IFrame; import org.tianocore.frameworkwizard.common.ui.IFrame;
import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification; import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;

View File

@ -50,10 +50,10 @@ import org.tianocore.PlatformSurfaceAreaDocument;
import org.tianocore.frameworkwizard.common.DataType; import org.tianocore.frameworkwizard.common.DataType;
import org.tianocore.frameworkwizard.common.IFileFilter; import org.tianocore.frameworkwizard.common.IFileFilter;
import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.OpenFile;
import org.tianocore.frameworkwizard.common.SaveFile; import org.tianocore.frameworkwizard.common.SaveFile;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.Identifications.Identification; 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.OpeningModuleList;
import org.tianocore.frameworkwizard.common.Identifications.OpeningModuleType; import org.tianocore.frameworkwizard.common.Identifications.OpeningModuleType;
import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageList; import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageList;

View File

@ -58,7 +58,7 @@ public class SelectModuleBelong extends IDialog {
**/ **/
private static final long serialVersionUID = 4171355136991448972L; 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; private JComboBox jComboBoxExistingPackage = null;
@ -251,8 +251,8 @@ public class SelectModuleBelong extends IDialog {
private JRadioButton getJRadioButtonYes() { private JRadioButton getJRadioButtonYes() {
if (jRadioButtonYes == null) { if (jRadioButtonYes == null) {
jRadioButtonYes = new JRadioButton(); jRadioButtonYes = new JRadioButton();
jRadioButtonYes.setBounds(new java.awt.Rectangle(140,35,100,20)); jRadioButtonYes.setBounds(new java.awt.Rectangle(140, 35, 100, 20));
jRadioButtonYes.setSelected(true); jRadioButtonYes.setSelected(false);
jRadioButtonYes.setText("Yes"); jRadioButtonYes.setText("Yes");
} }
return jRadioButtonYes; return jRadioButtonYes;
@ -266,8 +266,8 @@ public class SelectModuleBelong extends IDialog {
private JRadioButton getJRadioButtonNo() { private JRadioButton getJRadioButtonNo() {
if (jRadioButtonNo == null) { if (jRadioButtonNo == null) {
jRadioButtonNo = new JRadioButton(); jRadioButtonNo = new JRadioButton();
jRadioButtonNo.setBounds(new java.awt.Rectangle(300,35,110,20)); jRadioButtonNo.setBounds(new java.awt.Rectangle(300, 35, 110, 20));
jRadioButtonNo.setSelected(false); jRadioButtonNo.setSelected(true);
jRadioButtonNo.setText("No"); jRadioButtonNo.setText("No");
} }
return jRadioButtonNo; return jRadioButtonNo;
@ -341,7 +341,7 @@ public class SelectModuleBelong extends IDialog {
private JPanel getJContentPane() { private JPanel getJContentPane() {
if (jContentPane == null) { if (jContentPane == null) {
jLabelIsLibrary = new JLabel(); 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"); jLabelIsLibrary.setText("Is a Library");
jLabelVersion = new JLabel(); jLabelVersion = new JLabel();
jLabelVersion.setBounds(new java.awt.Rectangle(15, 135, 120, 20)); jLabelVersion.setBounds(new java.awt.Rectangle(15, 135, 120, 20));
@ -360,7 +360,7 @@ public class SelectModuleBelong extends IDialog {
jLabelPackage.setText("Choose Package"); jLabelPackage.setText("Choose Package");
jContentPane = new JPanel(); jContentPane = new JPanel();
jContentPane.setLayout(null); 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(getJComboBoxExistingPackage(), null);
jContentPane.add(getJButtonOk(), null); jContentPane.add(getJButtonOk(), null);
jContentPane.add(getJButtonCancel(), null); jContentPane.add(getJButtonCancel(), null);

View File

@ -12,7 +12,7 @@
WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED. 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.File;
import java.io.IOException; import java.io.IOException;
@ -27,7 +27,6 @@ import org.tianocore.FrameworkDatabaseDocument.FrameworkDatabase;
import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea; import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;
import org.tianocore.PackageSurfaceAreaDocument.PackageSurfaceArea; import org.tianocore.PackageSurfaceAreaDocument.PackageSurfaceArea;
import org.tianocore.PlatformSurfaceAreaDocument.PlatformSurfaceArea; import org.tianocore.PlatformSurfaceAreaDocument.PlatformSurfaceArea;
import org.tianocore.frameworkwizard.common.Log;
public class OpenFile { public class OpenFile {
/** /**

View File

@ -25,7 +25,7 @@ import org.tianocore.ModuleSurfaceAreaDocument;
import org.tianocore.PackageDependenciesDocument; import org.tianocore.PackageDependenciesDocument;
import org.tianocore.PackageSurfaceAreaDocument; import org.tianocore.PackageSurfaceAreaDocument;
import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea; 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.packaging.PackageIdentification;
import org.tianocore.frameworkwizard.workspace.WorkspaceTools; import org.tianocore.frameworkwizard.workspace.WorkspaceTools;

View File

@ -23,8 +23,8 @@ import org.tianocore.LibraryUsage;
import org.tianocore.LibraryClassDefinitionsDocument.LibraryClassDefinitions; import org.tianocore.LibraryClassDefinitionsDocument.LibraryClassDefinitions;
import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea; import org.tianocore.ModuleSurfaceAreaDocument.ModuleSurfaceArea;
import org.tianocore.frameworkwizard.common.DataType; 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.Identification;
import org.tianocore.frameworkwizard.common.Identifications.OpenFile;
import org.tianocore.frameworkwizard.packaging.PackageIdentification; import org.tianocore.frameworkwizard.packaging.PackageIdentification;
public class ModuleIdentification extends Identification { public class ModuleIdentification extends Identification {

View File

@ -92,6 +92,9 @@ public class SourceFilesVector {
public Vector<String> toStringVector(int index) { public Vector<String> toStringVector(int index) {
Vector<String> v = new Vector<String>(); Vector<String> v = new Vector<String>();
v.addElement(getSourceFiles(index).getFilename()); v.addElement(getSourceFiles(index).getFilename());
v.addElement(getSourceFiles(index).getTagName());
v.addElement(getSourceFiles(index).getToolCode());
v.addElement(getSourceFiles(index).getToolChainFamily());
return v; return v;
} }
} }

View File

@ -181,6 +181,9 @@ public class ModuleSourceFiles extends IInternalFrame {
jTable.setRowHeight(20); jTable.setRowHeight(20);
model.addColumn("File Name"); model.addColumn("File Name");
model.addColumn("Tag Name");
model.addColumn("Tool Code");
model.addColumn("Tool Chain Family");
jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
jTable.getSelectionModel().addListSelectionListener(this); jTable.getSelectionModel().addListSelectionListener(this);

View File

@ -34,11 +34,11 @@ import org.tianocore.SourceFilesDocument.SourceFiles;
import org.tianocore.SpdHeaderDocument.SpdHeader; import org.tianocore.SpdHeaderDocument.SpdHeader;
import org.tianocore.frameworkwizard.common.DataType; import org.tianocore.frameworkwizard.common.DataType;
import org.tianocore.frameworkwizard.common.Log; import org.tianocore.frameworkwizard.common.Log;
import org.tianocore.frameworkwizard.common.OpenFile;
import org.tianocore.frameworkwizard.common.SaveFile; import org.tianocore.frameworkwizard.common.SaveFile;
import org.tianocore.frameworkwizard.common.Sort; import org.tianocore.frameworkwizard.common.Sort;
import org.tianocore.frameworkwizard.common.Tools; import org.tianocore.frameworkwizard.common.Tools;
import org.tianocore.frameworkwizard.common.Identifications.Identification; 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.FarHeader;
import org.tianocore.frameworkwizard.far.FarIdentification; import org.tianocore.frameworkwizard.far.FarIdentification;
import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification; import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;