Remove all recommended lib instances logic in SpdLibClassDecls.java as recommmended...

Adjust the width of table columns to ease view.

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
index 97c30c2ad2a41da236115962e70ab9bf358ccc35..8aaad5db45e1a43e1b7807f24bc4d862daf722de 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdGuidDecls.java
@@ -34,6 +34,7 @@ import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableModelEvent;\r
 import javax.swing.event.TableModelListener;\r
 import javax.swing.table.DefaultTableModel;\r
+import javax.swing.table.TableColumn;\r
 import javax.swing.table.TableModel;\r
 \r
 import org.tianocore.PackageSurfaceAreaDocument;\r
@@ -134,6 +135,15 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
     protected String[][] saa = null;\r
 \r
     protected StarLabel starLabel = null;\r
+    \r
+    private final int guidNameMinWidth = 200;\r
+    private final int guidCNameMinWidth = 200;\r
+    private final int guidValueMinWidth = 300;\r
+    private final int helpTextMinWidth = 300;\r
+    private final int supArchMinWidth = 200;\r
+    private final int supModMinWidth = 200;\r
+    private final int guidTypeMinWidth = 200;\r
+    \r
 \r
     /**\r
       This method initializes this\r
@@ -192,6 +202,22 @@ public class SpdGuidDecls extends IInternalFrame implements TableModelListener{
            model.addColumn("Supported Architectures");\r
            model.addColumn("Supported Module Types");\r
            model.addColumn("GuidTypes");\r
+           \r
+           TableColumn column = jTable.getColumnModel().getColumn(0);\r
+           column.setMinWidth(this.guidNameMinWidth);\r
+           column = jTable.getColumnModel().getColumn(1);\r
+           column.setMinWidth(this.guidCNameMinWidth);\r
+           column = jTable.getColumnModel().getColumn(2);\r
+           column.setMinWidth(this.guidValueMinWidth);\r
+           column = jTable.getColumnModel().getColumn(3);\r
+           column.setMinWidth(this.helpTextMinWidth);\r
+           column = jTable.getColumnModel().getColumn(4);\r
+           column.setMinWidth(this.supArchMinWidth);\r
+           column = jTable.getColumnModel().getColumn(5);\r
+           column.setMinWidth(this.supModMinWidth);\r
+           column = jTable.getColumnModel().getColumn(6);\r
+           column.setMinWidth(this.guidTypeMinWidth);\r
+           \r
            jTable.getColumnModel().getColumn(2).setCellEditor(new GuidEditor());\r
            jTable.getColumnModel().getColumn(3).setCellEditor(new LongTextEditor());\r
 \r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
index e322732cc4deeb1d2bda951b378e1dd31069f592..a69a95887155123a1bec0dce611cd55082091e7b 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdLibClassDecls.java
@@ -17,8 +17,8 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ComponentEvent;\r
 import java.io.File;\r
 import java.util.HashMap;\r
-import java.util.Iterator;\r
-import java.util.Set;\r
+//import java.util.Iterator;\r
+//import java.util.Set;\r
 import java.util.Vector;\r
 \r
 import javax.swing.AbstractAction;\r
@@ -41,11 +41,12 @@ import javax.swing.event.ListSelectionListener;
 import javax.swing.event.TableModelEvent;\r
 import javax.swing.event.TableModelListener;\r
 import javax.swing.table.DefaultTableModel;\r
+import javax.swing.table.TableColumn;\r
 import javax.swing.table.TableModel;\r
 import org.tianocore.PackageSurfaceAreaDocument;\r
 import org.tianocore.frameworkwizard.common.DataType;\r
 import org.tianocore.frameworkwizard.common.DataValidation;\r
-import org.tianocore.frameworkwizard.common.GlobalData;\r
+//import org.tianocore.frameworkwizard.common.GlobalData;\r
 import org.tianocore.frameworkwizard.common.Tools;\r
 import org.tianocore.frameworkwizard.common.Identifications.OpeningPackageType;\r
 import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
@@ -53,8 +54,8 @@ import org.tianocore.frameworkwizard.common.ui.StarLabel;
 import org.tianocore.frameworkwizard.common.ui.iCheckBoxList.ICheckBoxList;\r
 import org.tianocore.frameworkwizard.platform.ui.ListEditor;\r
 import org.tianocore.frameworkwizard.platform.ui.LongTextEditor;\r
-import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
-import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
+//import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
+//import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
 \r
 \r
 /**\r
@@ -116,14 +117,6 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
 \r
     private JScrollPane jHelpTextScrollPane = null;\r
 \r
-    private JLabel jLabel3RecInstName = null;\r
-\r
-    private JTextField jTextField1RecInstName = null;\r
-\r
-    private JLabel jLabel4RecInstVer = null;\r
-\r
-    private JTextField jTextField2RecInstVer = null;\r
-\r
     private JLabel jLabel5SupArchList = null;\r
 \r
     private JLabel jLabel6SupModList = null;\r
@@ -136,15 +129,19 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
 \r
     private ICheckBoxList iCheckBoxListArch = null;\r
 \r
-    private JComboBox jComboBox = null;\r
-\r
     private int cnClassName = 0;\r
     private int cnHdrFile = 1;\r
     private int cnHelpText = 2;\r
-    private int cnRecInstName = 3;\r
-    private int cnRecInstVer = 4;\r
+//    private int cnRecInstName = 3;\r
+//    private int cnRecInstVer = 4;\r
     private int cnSupArch = 5;\r
     private int cnSupMod = 6;\r
+    \r
+    private final int classNameMinWidth = 200;\r
+    private final int hdrFileMinWidth = 300;\r
+    private final int helpTextMinWidth = 300;\r
+    private final int supArchMinWidth = 200;\r
+    private final int supModMinWidth = 200;\r
 \r
     private final int shortLabel = 90;\r
     private final int longLabel = 220;\r
@@ -253,6 +250,9 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
            \r
            jTable.getColumnModel().getColumn(cnHelpText).setCellEditor(new LongTextEditor());\r
            \r
+           jTable.removeColumn(jTable.getColumnModel().getColumn(3));\r
+           jTable.removeColumn(jTable.getColumnModel().getColumn(3));\r
+           \r
            Vector<String> vArch = new Vector<String>();\r
            vArch.add("IA32");\r
            vArch.add("X64");\r
@@ -260,7 +260,7 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
            vArch.add("EBC");\r
            vArch.add("ARM");\r
            vArch.add("PPC");\r
-           jTable.getColumnModel().getColumn(cnSupArch).setCellEditor(new ListEditor(vArch));\r
+           jTable.getColumnModel().getColumn(cnSupArch - 2).setCellEditor(new ListEditor(vArch));\r
            \r
            Vector<String> vModule = new Vector<String>();\r
            vModule.add("BASE");\r
@@ -276,8 +276,19 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
            vModule.add("UEFI_APPLICATION");\r
            vModule.add("USER_DEFINED");\r
 \r
-           jTable.getColumnModel().getColumn(cnSupMod).setCellEditor(new ListEditor(vModule));\r
-          \r
+           jTable.getColumnModel().getColumn(cnSupMod - 2).setCellEditor(new ListEditor(vModule));\r
+           \r
+           TableColumn column = jTable.getColumnModel().getColumn(this.cnClassName);\r
+           column.setMinWidth(this.classNameMinWidth);\r
+           column = jTable.getColumnModel().getColumn(this.cnHdrFile);\r
+           column.setMinWidth(this.hdrFileMinWidth);\r
+           column = jTable.getColumnModel().getColumn(this.cnHelpText);\r
+           column.setMinWidth(this.helpTextMinWidth);\r
+           column = jTable.getColumnModel().getColumn(this.cnSupArch - 2);\r
+           column.setMinWidth(this.supArchMinWidth);\r
+           column = jTable.getColumnModel().getColumn(this.cnSupMod - 2);\r
+           column.setMinWidth(this.supModMinWidth);\r
+           \r
            jTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
            jTable.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                public void valueChanged(ListSelectionEvent e) {\r
@@ -312,13 +323,13 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             String hdr = m.getValueAt(row, cnHdrFile) + "";\r
             String hlp = m.getValueAt(row, cnHelpText) + "";\r
             String name = null;\r
-            if (m.getValueAt(row, cnRecInstName) != null) {\r
-                name = m.getValueAt(row, cnRecInstName).toString();\r
-            } \r
-            String ver = null;\r
-            if (m.getValueAt(row, cnRecInstVer) != null){\r
-                ver = m.getValueAt(row, cnRecInstVer).toString();\r
-            }\r
+//            if (m.getValueAt(row, cnRecInstName) != null) {\r
+//                name = m.getValueAt(row, cnRecInstName).toString();\r
+//            } \r
+//            String ver = null;\r
+//            if (m.getValueAt(row, cnRecInstVer) != null){\r
+//                ver = m.getValueAt(row, cnRecInstVer).toString();\r
+//            }\r
             String arch = null;\r
             if (m.getValueAt(row, cnSupArch) != null) {\r
                arch = m.getValueAt(row, cnSupArch).toString();\r
@@ -327,20 +338,20 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             if (m.getValueAt(row, cnSupMod) != null) {\r
                 module = m.getValueAt(row, cnSupMod).toString();\r
             }\r
-            String[] rowData = {lib, hdr, hlp, name, ver};\r
+            String[] rowData = {lib, hdr, hlp, name};\r
             if (!dataValidation(rowData)) {\r
                 return;\r
             }\r
             \r
             String guid = null;\r
-            if (name != null && name.length() > 0) {\r
-                getLibInstances(lib);\r
-                guid = nameToGuid(name);\r
-                if (guid == null){\r
-                  JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");\r
-                  return;\r
-                }\r
-            }\r
+//            if (name != null && name.length() > 0) {\r
+//                getLibInstances(lib);\r
+//                guid = nameToGuid(name);\r
+//                if (guid == null){\r
+//                  JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");\r
+//                  return;\r
+//                }\r
+//            }\r
             \r
             String[] sa = new String[7];\r
             sfc.getSpdLibClassDeclaration(sa, row);\r
@@ -348,28 +359,26 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             if (cellData == null) {\r
                 cellData = "";\r
             }\r
-            if (column == cnRecInstName) {\r
-                if (guid == null) {\r
-                    if (sa[cnRecInstName] == null) {\r
-                        return;\r
-                    }\r
-                }\r
-                else {\r
-                    if (guid.equals(sa[cnRecInstName])) {\r
-                        return;\r
-                    }\r
-                }\r
+//            if (column == cnRecInstName) {\r
+//                if (guid == null) {\r
+//                    if (sa[cnRecInstName] == null) {\r
+//                        return;\r
+//                    }\r
+//                }\r
+//                else {\r
+//                    if (guid.equals(sa[cnRecInstName])) {\r
+//                        return;\r
+//                    }\r
+//                }\r
+//            }\r
+            if (cellData.equals(sa[column])) {\r
+                return;\r
             }\r
-            else {\r
-                if (cellData.equals(sa[column])) {\r
-                    return;\r
-                }\r
-                if (cellData.toString().length() == 0 && sa[column] == null) {\r
-                    return;\r
-                }\r
+            if (cellData.toString().length() == 0 && sa[column] == null) {\r
+                return;\r
             }\r
             docConsole.setSaved(false);\r
-            sfc.updateSpdLibClass(row, lib, hdr, hlp, guid, ver, arch, module);\r
+            sfc.updateSpdLibClass(row, lib, hdr, hlp, guid, null, arch, module);\r
         }\r
     }\r
 \r
@@ -472,10 +481,10 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         sfc.getSpdLibClassDeclarations(saa);\r
         int i = 0;\r
         while (i < saa.length) {\r
-            if (saa[i][3] != null && saa[i][3].length() > 0) {\r
-                getLibInstances(saa[i][0]);\r
-                saa[i][3] = guidToName(saa[i][3]);\r
-            }\r
+//            if (saa[i][3] != null && saa[i][3].length() > 0) {\r
+//                getLibInstances(saa[i][0]);\r
+//                saa[i][3] = guidToName(saa[i][3]);\r
+//            }\r
             \r
             model.addRow(saa[i]);\r
             i++;\r
@@ -571,8 +580,8 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             row[cnClassName] = jTextFieldAddClass.getText();\r
             row[cnHdrFile] = jTextFieldHdr.getText().replace('\\', '/');\r
             row[cnHelpText] = jTextAreaHelp.getText();\r
-            row[cnRecInstName] = jComboBox.getSelectedItem()+"";\r
-            row[cnRecInstVer] = jTextField2RecInstVer.getText();\r
+//            row[cnRecInstName] = jComboBox.getSelectedItem()+"";\r
+//            row[cnRecInstVer] = jTextField2RecInstVer.getText();\r
             row[cnSupArch] = vectorToString(iCheckBoxListArch.getAllCheckedItemsString());\r
             if (row[cnSupArch].length() == 0) {\r
                 row[cnSupArch] = null;\r
@@ -587,19 +596,19 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             //\r
             //convert to GUID before storing recommended lib instance.\r
             //\r
-            getLibInstances(row[cnClassName]);\r
-            String recommendGuid = nameToGuid(row[cnRecInstName]);\r
-            if (row[cnRecInstName].equals("null")) {\r
-                row[cnRecInstName] = null;\r
-            }\r
-            else{\r
-                if (recommendGuid == null) {\r
-                  JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");\r
-                  return;\r
-                }\r
-            }\r
-\r
-            sfc.genSpdLibClassDeclarations(row[cnClassName], recommendGuid, row[cnHdrFile], row[cnHelpText], row[cnSupArch], null, null, row[cnRecInstVer], null, row[cnSupMod]);\r
+//            getLibInstances(row[cnClassName]);\r
+//            String recommendGuid = nameToGuid(row[cnRecInstName]);\r
+//            if (row[cnRecInstName].equals("null")) {\r
+//                row[cnRecInstName] = null;\r
+//            }\r
+//            else{\r
+//                if (recommendGuid == null) {\r
+//                  JOptionPane.showMessageDialog(frame, "Recommended Instance does not exist.");\r
+//                  return;\r
+//                }\r
+//            }\r
+\r
+            sfc.genSpdLibClassDeclarations(row[cnClassName], null, row[cnHdrFile], row[cnHelpText], row[cnSupArch], null, null, null, null, row[cnSupMod]);\r
             model.addRow(row);\r
             jTable.changeSelection(model.getRowCount()-1, 0, false, false);\r
             docConsole.setSaved(false);\r
@@ -642,17 +651,17 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
             JOptionPane.showMessageDialog(frame, "Help Text must be entered!");\r
             return false;\r
         }\r
-        if (row[cnRecInstVer] != null && row[cnRecInstVer].length() > 0) {\r
-            if (row[cnRecInstName] == null || row[cnRecInstName].length() == 0) {\r
-                JOptionPane.showMessageDialog(frame, "Recommended Instance Version must associate with the Instance Name.");\r
-                return false;\r
-            }\r
-            \r
-            if (!DataValidation.isVersionDataType(row[cnRecInstVer])) {\r
-                JOptionPane.showMessageDialog(frame, "Recommended Instance Version does not match Version datatype.");\r
-                return false;\r
-            }\r
-        }\r
+//        if (row[cnRecInstVer] != null && row[cnRecInstVer].length() > 0) {\r
+//            if (row[cnRecInstName] == null || row[cnRecInstName].length() == 0) {\r
+//                JOptionPane.showMessageDialog(frame, "Recommended Instance Version must associate with the Instance Name.");\r
+//                return false;\r
+//            }\r
+//            \r
+//            if (!DataValidation.isVersionDataType(row[cnRecInstVer])) {\r
+//                JOptionPane.showMessageDialog(frame, "Recommended Instance Version does not match Version datatype.");\r
+//                return false;\r
+//            }\r
+//        }\r
         return true;\r
     }\r
     /**\r
@@ -846,53 +855,53 @@ public class SpdLibClassDecls extends IInternalFrame implements TableModelListen
         return iCheckBoxListArch;\r
     }\r
 \r
-    private void getLibInstances(String libClass){\r
-        libNameGuidMap.clear();\r
-        try {\r
-                Iterator ismi = GlobalData.vModuleList.iterator();\r
-                while (ismi.hasNext()) {\r
-                    ModuleIdentification mi = (ModuleIdentification) ismi.next();\r
-                    \r
-                    Vector<String> classProduced = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED", mi);\r
-                    for (int i = 0; i < classProduced.size(); ++i) {\r
-                        if (classProduced.get(i).equals(libClass)) {\r
-                            libNameGuidMap.put(mi.getName(), mi.getGuid());\r
-                        }\r
-                    }\r
-                }\r
-           \r
-        }\r
-        catch(Exception e){\r
-            JOptionPane.showMessageDialog(frame, "Search Instances Failed.");\r
-        }\r
-        \r
-    }\r
-\r
-    private String nameToGuid(String name) {\r
-        String s = null;\r
-        if (!libNameGuidMap.containsKey(name)) {\r
-            return s;\r
-        }\r
-        \r
-        s = libNameGuidMap.get(name);\r
-        return s;\r
-    }\r
+//    private void getLibInstances(String libClass){\r
+//        libNameGuidMap.clear();\r
+//        try {\r
+//                Iterator ismi = GlobalData.vModuleList.iterator();\r
+//                while (ismi.hasNext()) {\r
+//                    ModuleIdentification mi = (ModuleIdentification) ismi.next();\r
+//                    \r
+//                    Vector<String> classProduced = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED", mi);\r
+//                    for (int i = 0; i < classProduced.size(); ++i) {\r
+//                        if (classProduced.get(i).equals(libClass)) {\r
+//                            libNameGuidMap.put(mi.getName(), mi.getGuid());\r
+//                        }\r
+//                    }\r
+//                }\r
+//           \r
+//        }\r
+//        catch(Exception e){\r
+//            JOptionPane.showMessageDialog(frame, "Search Instances Failed.");\r
+//        }\r
+//        \r
+//    }\r
+\r
+//    private String nameToGuid(String name) {\r
+//        String s = null;\r
+//        if (!libNameGuidMap.containsKey(name)) {\r
+//            return s;\r
+//        }\r
+//        \r
+//        s = libNameGuidMap.get(name);\r
+//        return s;\r
+//    }\r
     \r
-    private String guidToName(String guid){\r
-        String s = "";\r
-        if (!libNameGuidMap.containsValue(guid)) {\r
-            return s;\r
-        }\r
-        Set<String> key = libNameGuidMap.keySet();\r
-        Iterator<String> is = key.iterator();\r
-        while(is.hasNext()) {\r
-            s = is.next();\r
-            if (libNameGuidMap.get(s).equals(guid)) {\r
-                break;\r
-            }\r
-        }\r
-        return s;\r
-    }\r
+//    private String guidToName(String guid){\r
+//        String s = "";\r
+//        if (!libNameGuidMap.containsValue(guid)) {\r
+//            return s;\r
+//        }\r
+//        Set<String> key = libNameGuidMap.keySet();\r
+//        Iterator<String> is = key.iterator();\r
+//        while(is.hasNext()) {\r
+//            s = is.next();\r
+//            if (libNameGuidMap.get(s).equals(guid)) {\r
+//                break;\r
+//            }\r
+//        }\r
+//        return s;\r
+//    }\r
 \r
 }\r
 \r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
index 902cd26fcdc0475d35f188ef8cd563ff6fdf27f5..dade7ca3dc82fce567c301f8db1b7cf3852b58d5 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
@@ -152,6 +152,16 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
     private JLabel jLabelSupMod = null;\r
 \r
     private JLabel jLabelSupArch = null;\r
+    \r
+    private final int pcdCNameMinWidth = 200;\r
+    private final int pcdTokenMinWidth = 100;\r
+    private final int pcdTokenSpaceMinWidth = 200;\r
+    private final int datumTypeMinWidth = 80;\r
+    private final int defaultValueMinWidth = 100;\r
+    private final int helpTextMinWidth = 200;\r
+    private final int usageMinWidth = 60;\r
+    private final int supArchMinWidth = 200;\r
+    private final int supModMinWidth = 200;\r
 \r
     /**\r
      This method initializes this\r
@@ -678,6 +688,33 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
             model.addColumn("SupportedArch");\r
             model.addColumn("SupportedModule");\r
             \r
+            TableColumn column = jTable.getColumnModel().getColumn(0);\r
+            column.setMinWidth(this.pcdCNameMinWidth);\r
+            column = jTable.getColumnModel().getColumn(1);\r
+            column.setMinWidth(this.pcdTokenMinWidth);\r
+            column = jTable.getColumnModel().getColumn(2);\r
+            column.setMinWidth(this.pcdTokenSpaceMinWidth);\r
+            column = jTable.getColumnModel().getColumn(3);\r
+            column.setMinWidth(this.datumTypeMinWidth);\r
+            column = jTable.getColumnModel().getColumn(4);\r
+            column.setMinWidth(this.defaultValueMinWidth);\r
+            column = jTable.getColumnModel().getColumn(5);\r
+            column.setMinWidth(this.helpTextMinWidth);\r
+            column = jTable.getColumnModel().getColumn(6);\r
+            column.setMinWidth(this.usageMinWidth);\r
+            column = jTable.getColumnModel().getColumn(7);\r
+            column.setMinWidth(this.usageMinWidth);\r
+            column = jTable.getColumnModel().getColumn(8);\r
+            column.setMinWidth(this.usageMinWidth);\r
+            column = jTable.getColumnModel().getColumn(9);\r
+            column.setMinWidth(this.usageMinWidth);\r
+            column = jTable.getColumnModel().getColumn(10);\r
+            column.setMinWidth(this.usageMinWidth);\r
+            column = jTable.getColumnModel().getColumn(11);\r
+            column.setMinWidth(this.supArchMinWidth);\r
+            column = jTable.getColumnModel().getColumn(12);\r
+            column.setMinWidth(this.supModMinWidth);\r
+            \r
             //ToDo: add a valid usage editor\r
             \r
             JComboBox jComboBoxDataType = new JComboBox();\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
index 05459069003af48b8b984327eb1e24b268569b03..bbd24f2f79537c42e5e815ec07cd0f171a39e4c1 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdDynamicPcdBuildDefinitions.java
@@ -154,6 +154,9 @@ public class FpdDynamicPcdBuildDefinitions extends IInternalFrame {
             modelPcd.addColumn("DatumType");\r
             jTableDynPcd = new JTable(modelPcd);\r
             jTableDynPcd.setRowHeight(20);\r
+            \r
+            jTableDynPcd.getColumnModel().getColumn(0).setMinWidth(250);\r
+            \r
             jTableDynPcd.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTableDynPcd.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
                 public void valueChanged(ListSelectionEvent e) {\r

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 0b190ae2dbaa378bb9e7f46382085ee15ccb0c8b..4d23bec664352e10a53205b2cf7a0de167733bdc 100644 (file)
--- 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
@@ -554,6 +554,8 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             model.addColumn("MaxDatumSize");\r
             model.addColumn("DataType");\r
             model.addColumn("DefaultValue");\r
+            \r
+            jTablePcd.getColumnModel().getColumn(0).setMinWidth(250);\r
                         \r
             jTablePcd.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             jTablePcd.getSelectionModel().addListSelectionListener(new ListSelectionListener(){\r
@@ -802,6 +804,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             selectedInstancesTableModel.addColumn("PackageVersion");\r
             jTableSelectedInstances = new JTable(selectedInstancesTableModel);\r
             jTableSelectedInstances.setRowHeight(20);\r
+            \r
+            jTableSelectedInstances.getColumnModel().getColumn(0).setMinWidth(250);\r
+            \r
             jTableSelectedInstances.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);\r
             jTableSelectedInstances.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             \r
@@ -907,6 +912,9 @@ public class FpdModuleSA extends JDialog implements ActionListener {
             libInstanceTableModel.addColumn("PackageVersion");\r
             jTableLibInstances = new JTable(libInstanceTableModel);\r
             jTableLibInstances.setRowHeight(20);\r
+            \r
+            jTableLibInstances.getColumnModel().getColumn(0).setMinWidth(250);\r
+            \r
             jTableLibInstances.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_SUBSEQUENT_COLUMNS);\r
             jTableLibInstances.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
             \r