X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=Tools%2FSource%2FFrameworkWizard%2Fsrc%2Forg%2Ftianocore%2Fframeworkwizard%2Fplatform%2Fui%2FFpdBuildOptions.java;h=03a4ed5f98d59e1e5fc4bd801ac2ad7e7342dba6;hp=c79d7727a71afdb40d8a8a4585c6beaa172b48e6;hb=5d7a9b83e144ba855c14d50f4fd31317d7b5e0c5;hpb=cd1fd8f9f0f879d4dcc519c9657e9976d904bdcd diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java index c79d7727a7..03a4ed5f98 100644 --- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java +++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdBuildOptions.java @@ -364,7 +364,7 @@ public class FpdBuildOptions extends IInternalFrame { if (jTabbedPane == null) { jTabbedPane = new JTabbedPane(); jTabbedPane.addTab("Flash Filesystem Options", null, getJPanelFfsTab(), null); - jTabbedPane.addTab("Tool Arguments", null, getJPanelOptionsTab(), null); + jTabbedPane.addTab("Customize Tool Chain Configurations", null, getJPanelOptionsTab(), null); jTabbedPane.addTab("User Defined ANT Tasks", null, getJPanelUserDef(), null); } return jTabbedPane; @@ -407,7 +407,7 @@ public class FpdBuildOptions extends IInternalFrame { private JPanel getJPanelTableOptionsContainer() { if (jPanelTableOptionsContainer == null) { jLabelTableOptionsTitle = new JLabel(); - jLabelTableOptionsTitle.setText(" Current Option Configuration Lines"); + jLabelTableOptionsTitle.setText(" Current Argument Lines"); jPanelTableOptionsContainer = new JPanel(); jPanelTableOptionsContainer.setLayout(new BorderLayout()); jPanelTableOptionsContainer.add(jLabelTableOptionsTitle, java.awt.BorderLayout.NORTH); @@ -1426,7 +1426,7 @@ public class FpdBuildOptions extends IInternalFrame { jLabelOptionContents = new JLabel(); jLabelOptionContents.setBounds(new java.awt.Rectangle(labelColumn, rowSix, labelWidth, oneRowHeight)); jLabelOptionContents.setLocation(new java.awt.Point(labelColumn, rowSix)); - jLabelOptionContents.setText("Option Contents"); + jLabelOptionContents.setText("Argument Strings"); jPanelOptionsContainer = new JPanel(); @@ -1758,16 +1758,16 @@ public class FpdBuildOptions extends IInternalFrame { optionsTableModel.addColumn("Supported Architectures"); optionsTableModel.addColumn("Tool Command Code"); optionsTableModel.addColumn("TagName"); - optionsTableModel.addColumn("Contents"); - - javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1); - JComboBox cb = new JComboBox(); - cb.addItem("MSFT"); - cb.addItem("GCC"); - cb.addItem("CYGWIN"); - cb.addItem("INTEL"); - cb.addItem("USER_DEFINED"); - toolFamilyCol.setCellEditor(new DefaultCellEditor(cb)); + optionsTableModel.addColumn("Arguments"); + +// javax.swing.table.TableColumn toolFamilyCol = jTableOptions.getColumnModel().getColumn(1); +// JComboBox cb = new JComboBox(); +// cb.addItem("MSFT"); +// cb.addItem("GCC"); +// cb.addItem("CYGWIN"); +// cb.addItem("INTEL"); +// cb.addItem("USER_DEFINED"); +// toolFamilyCol.setCellEditor(new DefaultCellEditor(cb)); Vector vArch = new Vector(); vArch.add("IA32"); vArch.add("X64"); @@ -1864,7 +1864,7 @@ public class FpdBuildOptions extends IInternalFrame { if (bool[5]) { s += "PPC "; } - if (s == " ") { + if (s.equals(" ")) { s += "IA32"; } return s.trim();