From 31095724f167213b99fab10c58507fd869975eda Mon Sep 17 00:00:00 2001 From: jlin16 Date: Tue, 10 Oct 2006 09:26:34 +0000 Subject: Fix not able to save after change build target. git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@1705 6f19259b-4bc3-4df7-8a09-765794883524 --- .../frameworkwizard/platform/ui/FpdFlash.java | 147 ++++++++++++++++----- .../frameworkwizard/platform/ui/FpdModuleSA.java | 5 +- .../platform/ui/FpdPlatformDefs.java | 2 + 3 files changed, 123 insertions(+), 31 deletions(-) (limited to 'Tools/Java/Source') diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java index 5eefacbdc3..75824a4967 100644 --- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java +++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFlash.java @@ -169,6 +169,12 @@ public class FpdFlash extends IInternalFrame { private JPanel jPanelBgFvName = null; private JPanel jPanelBgFvImage = null; private JPanel jPanelW = null; + private JPanel jPanelFvImageParaN = null; + private JPanel jPanelFvImageParaS = null; + private JPanel jPanelFvImageParaC = null; + private JPanel jPanelFvImageOptsN = null; + private JPanel jPanelFvImageOptsS = null; + private JPanel jPanelFvImageOptsC = null; public FpdFlash() { super(); @@ -554,6 +560,8 @@ public class FpdFlash extends IInternalFrame { */ private JPanel getJPanelFvImageC() { if (jPanelFvImageC == null) { + GridLayout gridLayout = new GridLayout(); + gridLayout.setRows(2); jLabelFvParaName = new JLabel(); jLabelFvParaName.setPreferredSize(new Dimension(38, 20)); jLabelFvParaName.setText("Name"); @@ -563,15 +571,12 @@ public class FpdFlash extends IInternalFrame { jLabelFvParaType = new JLabel(); jLabelFvParaType.setText("Type"); jLabelFvParaType.setPreferredSize(new java.awt.Dimension(70,20)); - FlowLayout flowLayout3 = new FlowLayout(); - flowLayout3.setAlignment(java.awt.FlowLayout.LEFT); - flowLayout3.setHgap(5); jPanelFvImageC = new JPanel(); - jPanelFvImageC.setLayout(flowLayout3); + jPanelFvImageC.setLayout(gridLayout); jPanelFvImageC.add(getJPanelFvImagePara(), null); - jPanelFvImageC.add(getJPanelFvImageOpts(), null); + } return jPanelFvImageC; } @@ -791,8 +796,6 @@ public class FpdFlash extends IInternalFrame { if (jPanelFvImageOpts == null) { //ToDo add ButtonGroup for RadioButtons - FlowLayout flowLayout5 = new FlowLayout(); - flowLayout5.setAlignment(java.awt.FlowLayout.LEFT); jLabelOptions = new JLabel(); jLabelOptions.setText("Attribute"); jLabelFvImageOptValue = new JLabel(); @@ -804,23 +807,16 @@ public class FpdFlash extends IInternalFrame { jLabelFvImageOptName.setText("Name"); jLabelFvImageOptName.setPreferredSize(new Dimension(38, 20)); jPanelFvImageOpts = new JPanel(); - jPanelFvImageOpts.setLayout(flowLayout5); + jPanelFvImageOpts.setLayout(new BorderLayout()); jPanelFvImageOpts.setPreferredSize(new java.awt.Dimension(450,130)); jPanelFvImageOpts.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.LOWERED)); - jPanelFvImageOpts.add(jLabelOptions, null); - jPanelFvImageOpts.add(jLabelFvImageOptName, null); - jPanelFvImageOpts.add(getJTextFieldFvImageOptName(), null); - jPanelFvImageOpts.add(jLabelFvImageOptValue, null); - jPanelFvImageOpts.add(getJTextFieldFvImageOptValue(), null); - jPanelFvImageOpts.add(getJScrollPane(), null); - jPanelFvImageOpts.add(getJPanelFvImageOptsButtonGroup(), null); - - - - + jPanelFvImageOpts.add(getJPanelFvImageOptsN(), java.awt.BorderLayout.NORTH); + jPanelFvImageOpts.add(getJPanelFvImageOptsS(), java.awt.BorderLayout.SOUTH); + jPanelFvImageOpts.add(getJPanelFvImageOptsC(), java.awt.BorderLayout.CENTER); + } return jPanelFvImageOpts; } @@ -990,22 +986,20 @@ public class FpdFlash extends IInternalFrame { */ private JPanel getJPanelFvImagePara() { if (jPanelFvImagePara == null) { - FlowLayout flowLayout6 = new FlowLayout(); - flowLayout6.setAlignment(java.awt.FlowLayout.LEFT); StarLabel starLabel = new StarLabel(); starLabel.setVisible(false); jPanelFvImagePara = new JPanel(); - jPanelFvImagePara.setLayout(flowLayout6); + jPanelFvImagePara.setLayout(new BorderLayout()); jPanelFvImagePara.setPreferredSize(new java.awt.Dimension(450,140)); jPanelFvImagePara.setBorder(javax.swing.BorderFactory.createEtchedBorder(javax.swing.border.EtchedBorder.RAISED)); - jPanelFvImagePara.add(new StarLabel(), null); - jPanelFvImagePara.add(jLabelFvImageNames, null); - jPanelFvImagePara.add(jLabelFvParaName, null); - jPanelFvImagePara.add(getJTextFieldFvParaName(), null); - jPanelFvImagePara.add(getJScrollPaneFvImageNames(), null); - jPanelFvImagePara.add(getJPanelBgFvName(), null); - jPanelFvImagePara.add(jLabelFvParaType, null); - jPanelFvImagePara.add(getJComboBoxFvParaType(), null); + + jPanelFvImagePara.add(getJPanelFvImageParaN(), java.awt.BorderLayout.NORTH); + jPanelFvImagePara.add(getJPanelFvImageParaS(), java.awt.BorderLayout.SOUTH); + jPanelFvImagePara.add(getJPanelFvImageParaC(), java.awt.BorderLayout.CENTER); + +// +// +// } return jPanelFvImagePara; } @@ -2072,6 +2066,99 @@ public class FpdFlash extends IInternalFrame { return jPanelW; } + /** + * This method initializes jPanelFvImageParaN + * + * @return javax.swing.JPanel + */ + private JPanel getJPanelFvImageParaN() { + if (jPanelFvImageParaN == null) { + FlowLayout flowLayout3 = new FlowLayout(); + flowLayout3.setAlignment(java.awt.FlowLayout.CENTER); + jPanelFvImageParaN = new JPanel(); + jPanelFvImageParaN.setLayout(flowLayout3); + jPanelFvImageParaN.add(new StarLabel(), null); + jPanelFvImageParaN.add(jLabelFvImageNames, null); + jPanelFvImageParaN.add(jLabelFvParaName, null); + jPanelFvImageParaN.add(getJTextFieldFvParaName(), null); + } + return jPanelFvImageParaN; + } + + /** + * This method initializes jPanelFvImageParaS + * + * @return javax.swing.JPanel + */ + private JPanel getJPanelFvImageParaS() { + if (jPanelFvImageParaS == null) { + FlowLayout flowLayout6 = new FlowLayout(); + flowLayout6.setAlignment(java.awt.FlowLayout.CENTER); + jPanelFvImageParaS = new JPanel(); + jPanelFvImageParaS.setLayout(flowLayout6); + jPanelFvImageParaS.add(jLabelFvParaType, null); + jPanelFvImageParaS.add(getJComboBoxFvParaType(), null); + } + return jPanelFvImageParaS; + } + + /** + * This method initializes jPanelFvImageParaC + * + * @return javax.swing.JPanel + */ + private JPanel getJPanelFvImageParaC() { + if (jPanelFvImageParaC == null) { + jPanelFvImageParaC = new JPanel(); + jPanelFvImageParaC.add(getJScrollPaneFvImageNames(), null); + jPanelFvImageParaC.add(getJPanelBgFvName(), null); + } + return jPanelFvImageParaC; + } + + /** + * This method initializes jPanelFvImageOptsN + * + * @return javax.swing.JPanel + */ + private JPanel getJPanelFvImageOptsN() { + if (jPanelFvImageOptsN == null) { + jPanelFvImageOptsN = new JPanel(); + jPanelFvImageOptsN.add(jLabelOptions, null); + jPanelFvImageOptsN.add(jLabelFvImageOptName, null); + jPanelFvImageOptsN.add(getJTextFieldFvImageOptName(), null); + jPanelFvImageOptsN.add(jLabelFvImageOptValue, null); + jPanelFvImageOptsN.add(getJTextFieldFvImageOptValue(), null); + } + return jPanelFvImageOptsN; + } + + /** + * This method initializes jPanelFvImageOptsS + * + * @return javax.swing.JPanel + */ + private JPanel getJPanelFvImageOptsS() { + if (jPanelFvImageOptsS == null) { + jPanelFvImageOptsS = new JPanel(); + } + return jPanelFvImageOptsS; + } + + /** + * This method initializes jPanelFvImageOptsC + * + * @return javax.swing.JPanel + */ + private JPanel getJPanelFvImageOptsC() { + if (jPanelFvImageOptsC == null) { + jPanelFvImageOptsC = new JPanel(); + jPanelFvImageOptsC.add(getJScrollPane(), null); + jPanelFvImageOptsC.add(getJPanelFvImageOptsButtonGroup(), null); + } + return jPanelFvImageOptsC; + } + /** * @param args */ diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java index fcb78f3648..0b190ae2db 100644 --- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java +++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdModuleSA.java @@ -185,6 +185,9 @@ public class FpdModuleSA extends JDialog implements ActionListener { for (int i = 0; i < saa.length; ++i) { ModuleIdentification mi = WorkspaceProfile.getModuleId(saa[i][1] + " " + saa[i][2] + " " + saa[i][3] + " " + saa[i][4]); if (mi != null) { + // + // ToDo: verify this instance first. + // saa[i][0] = mi.getName(); saa[i][2] = mi.getVersion(); saa[i][4] = mi.getPackageId().getVersion(); @@ -267,7 +270,7 @@ public class FpdModuleSA extends JDialog implements ActionListener { } // - // find potential instances in all dependency pkgs for classes still in classConsumed. + // find potential instances in all pkgs for classes still in classConsumed. // if (classInstanceMap == null){ classInstanceMap = new HashMap>(); diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java index 454df225e1..b76d8b3822 100644 --- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java +++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdPlatformDefs.java @@ -704,6 +704,8 @@ public class FpdPlatformDefs extends IInternalFrame { for (int i = 0; i < jTableBuildTargets.getRowCount(); ++i) { v.add(buildTargetTableModel.getValueAt(i, 0)); } + docConsole.setSaved(false); + ffc.setPlatformDefsBuildTargets(v); } } }); -- cgit v1.2.3