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

4 files changed, 20 insertions, 11 deletions

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java
index 68453587d2..dfa1922ea1 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GenGuidDialog.java
@@ -42,6 +42,11 @@ import java.awt.event.WindowEvent;
 **/

 public class GenGuidDialog extends JDialog implements ActionListener{

 

+    /**

+     * 

+     */

+    private static final long serialVersionUID = 1L;

+

     public static final String guidArrayPat = "0x[a-fA-F0-9]{1,8},( )*0x[a-fA-F0-9]{1,4},( )*0x[a-fA-F0-9]{1,4}(,( )*\\{)?(,?( )*0x[a-fA-F0-9]{1,2}){8}( )*(\\})?";

     

     public static final String guidRegistryPat = "[a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}";

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GuidEditor.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GuidEditor.java
index 9ac041add9..7b2683a830 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GuidEditor.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/GuidEditor.java
@@ -20,11 +20,9 @@ import java.awt.event.ActionListener;
 import javax.swing.AbstractCellEditor;

 import javax.swing.JButton;

 import javax.swing.JFrame;

-import javax.swing.JOptionPane;

 import javax.swing.JTable;

 import javax.swing.table.TableCellEditor;

 

-import org.tianocore.frameworkwizard.common.Tools;

 

 /**

  Editor for table cell with GUID value.

@@ -32,6 +30,10 @@ import org.tianocore.frameworkwizard.common.Tools;
  **/

 public class GuidEditor extends AbstractCellEditor implements TableCellEditor, ActionListener {

 

+    /**

+     * 

+     */

+    private static final long serialVersionUID = 1L;

     String currentGuid;

     JButton button;

     static JFrame frame;

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
index 061833b899..24fab96634 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdFileContents.java
@@ -25,7 +25,6 @@ import org.apache.xmlbeans.XmlObject;
 import org.apache.xmlbeans.XmlOptions;

 import org.apache.xmlbeans.XmlCursor;

 

-import org.tianocore.FilenameDocument;

 import org.tianocore.GuidDeclarationsDocument;

 

 import org.tianocore.LibraryClassDeclarationsDocument;

@@ -37,12 +36,10 @@ import org.tianocore.PackageHeadersDocument;
 import org.tianocore.PackageSurfaceAreaDocument;

 import org.tianocore.PcdDataTypes;

 import org.tianocore.PcdDeclarationsDocument;

-import org.tianocore.PcdItemTypes;

 import org.tianocore.PpiDeclarationsDocument;

 import org.tianocore.ProtocolDeclarationsDocument;

 import org.tianocore.SpdHeaderDocument;

 import org.tianocore.GuidDeclarationsDocument.GuidDeclarations;

-import org.tianocore.PackageHeadersDocument.PackageHeaders.IncludePkgHeader;

 

 /**

  This class processes spd file contents such as add remove xml elements.

diff --git a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
index 2a22aa91fb..019ced3879 100644
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/packaging/ui/SpdPcdDefs.java
@@ -13,17 +13,13 @@ WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
 package org.tianocore.frameworkwizard.packaging.ui;

 

 import java.awt.Dimension;

-import java.awt.Toolkit;

 import java.awt.event.ActionEvent;

-import java.awt.event.ActionListener;

 import java.awt.event.ComponentEvent;

 

-import javax.swing.ButtonGroup;

 import javax.swing.DefaultCellEditor;

 import javax.swing.JFrame;

 import javax.swing.JOptionPane;

 import javax.swing.JPanel;

-import javax.swing.JRadioButton;

 import javax.swing.JLabel;

 import javax.swing.JTextField;

 import javax.swing.JComboBox;

@@ -41,7 +37,6 @@ import javax.swing.table.TableColumn;
 import javax.swing.table.TableModel;

 

 import org.tianocore.PackageSurfaceAreaDocument;

-import org.tianocore.frameworkwizard.common.DataType;

 

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

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

@@ -59,6 +54,11 @@ import java.util.Vector;
 **/

 public class SpdPcdDefs extends IInternalFrame implements TableModelListener{

 

+    /**

+     * 

+     */

+    private static final long serialVersionUID = 1L;

+

     static JFrame frame;

     

     private JPanel jContentPane = null;  

@@ -926,7 +926,12 @@ public class SpdPcdDefs extends IInternalFrame implements TableModelListener{
 } //  @jve:decl-index=0:visual-constraint="22,11"

 

 class CheckboxTableModel extends DefaultTableModel {

-    public Class getColumnClass (int c) {

+    /**

+     * 

+     */

+    private static final long serialVersionUID = 1L;

+

+    public Class<?> getColumnClass (int c) {

         if (getValueAt(0, c) != null){

             return getValueAt(0, c).getClass();

         }