add ForceDebug column to FramworkModules table.

comment out reference to unchecked in code in FrameworkWizardUI.java.

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

3 files changed, 38 insertions, 7 deletions

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
index d7fcc5e..d97c61a 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/FrameworkWizardUI.java
@@ -54,7 +54,7 @@ import org.tianocore.frameworkwizard.common.Identifications.Identification;
 import org.tianocore.frameworkwizard.common.Identifications.OpeningModuleType;

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

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

-import org.tianocore.frameworkwizard.common.find.FindPPIsResult;

+//import org.tianocore.frameworkwizard.common.find.FindPPIsResult;

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

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

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

@@ -1878,7 +1878,7 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
         }

 

         if (arg0.getSource() == this.jMenuItemEditFindPpi) {

-            this.findPpi();

+//            this.findPpi();

         }

 

         if (arg0.getSource() == this.jMenuItemProjectChangeWorkspace) {

@@ -3099,10 +3099,10 @@ public class FrameworkWizardUI extends IFrame implements MouseListener, TreeSele
      To find all defined PPIs in workspace

      

      **/

-    private void findPpi() {

-        //FindPPIsResult fpr = FindPPIsResult.getInstance();

-        //fpr.setVisible(true);

-    }

+//    private void findPpi() {

+//        FindPPIsResult fpr = FindPPIsResult.getInstance();

+//        fpr.setVisible(true);

+//    }

 

     /**

      Switch current workspace to others

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
index a11a635..6d9f84d 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFileContents.java
@@ -797,6 +797,19 @@ public class FpdFileContents {
         msa.getModuleSaBuildOptions().setFfsFormatKey(ffsKey);

     }

     

+    public void setModuleSAForceDebug(int i, boolean dbgEnable) {

+        ModuleSADocument.ModuleSA moduleSa = getModuleSA(i);

+        moduleSa.setForceDebug(dbgEnable);

+    }

+    

+    public boolean getModuleSAForceDebug (int i) {

+        ModuleSADocument.ModuleSA moduleSa = getModuleSA(i);

+        if (moduleSa.getForceDebug() == true) {

+            return true;

+        }

+        return false;

+    }

+    

     public void getModuleSAOptions(String moduleKey, String[][] saa) {

         ModuleSADocument.ModuleSA msa = getModuleSA(moduleKey);

         if (msa == null || msa.getModuleSaBuildOptions() == null || msa.getModuleSaBuildOptions().getOptions() == null

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
index 767fd52..6ba80c4 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
@@ -25,7 +25,9 @@ import javax.swing.JScrollPane;
 import javax.swing.JTable;

 import javax.swing.JButton;

 import javax.swing.ListSelectionModel;

+import javax.swing.event.TableModelEvent;

 import javax.swing.table.DefaultTableModel;

+import javax.swing.table.TableModel;

 

 import org.tianocore.PlatformSurfaceAreaDocument;

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

@@ -528,11 +530,27 @@ public class FpdFrameworkModules extends IInternalFrame {
 

             jTableFpdModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);

             jTableFpdModules.setAutoResizeMode(JTable.AUTO_RESIZE_OFF);

-

+            

+            jTableFpdModules.getModel().addTableModelListener(this);

         }

         return jTableFpdModules;

     }

 

+    public void tableChanged(TableModelEvent arg0) {

+        if (arg0.getType() == TableModelEvent.UPDATE){

+            int row = arg0.getFirstRow();

+            int column = arg0.getColumn();

+            TableModel m = (TableModel)arg0.getSource();

+            

+            if (column != forceDbgColForFpdModTable) {

+                return;

+            }

+            String s = m.getValueAt(row, column)+"";

+            boolean dbgEnable = new Boolean(s);

+            ffc.setModuleSAForceDebug(row, dbgEnable);

+            docConsole.setSaved(false);

+        }

+    }

     /**

      * This method initializes jButtonSettings

      *