1. Fix EDKT417: System hangs to setup build preference when there is no target.txt...

2. Replace the values of ToolCode of SourceFile with the items defined in spec

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

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
index 408e75e8124a2db4e1bc8cbda903da4b23925d67..e23982a24837f64b4678563ec2eb30b9d769ff2f 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/EnumerationData.java
@@ -521,19 +521,26 @@ public class EnumerationData {
     private void initToolCode() {\r
         vToolCode.removeAllElements();\r
         vToolCode.addElement(DataType.EMPTY_SELECT_ITEM);\r
     private void initToolCode() {\r
         vToolCode.removeAllElements();\r
         vToolCode.addElement(DataType.EMPTY_SELECT_ITEM);\r

-        vToolCode.addElement("Build_CCode");\r
-        vToolCode.addElement("Build_AUTOGEN");\r
-        vToolCode.addElement("Build_DPX");\r
-        vToolCode.addElement("Build_ASM");\r
-        vToolCode.addElement("Build_Assembly");\r
-        vToolCode.addElement("Build_Gcc_Assembly");\r
-        vToolCode.addElement("Build_IPF_Assembly_Code");\r
-        vToolCode.addElement("Build_IPF_PP_Code");\r
-        vToolCode.addElement("Build_Library");\r
-        vToolCode.addElement("Build_UNI");\r
-        vToolCode.addElement("Build_Unicode_Database");\r
-        vToolCode.addElement("Build_VFR");\r
-        vToolCode.addElement("Build_DUMMY");\r
+//        vToolCode.addElement("Build_CCode");\r
+//        vToolCode.addElement("Build_AUTOGEN");\r
+//        vToolCode.addElement("Build_DPX");\r
+//        vToolCode.addElement("Build_ASM");\r
+//        vToolCode.addElement("Build_Assembly");\r
+//        vToolCode.addElement("Build_Gcc_Assembly");\r
+//        vToolCode.addElement("Build_IPF_Assembly_Code");\r
+//        vToolCode.addElement("Build_IPF_PP_Code");\r
+//        vToolCode.addElement("Build_Library");\r
+//        vToolCode.addElement("Build_UNI");\r
+//        vToolCode.addElement("Build_Unicode_Database");\r
+//        vToolCode.addElement("Build_VFR");\r
+//        vToolCode.addElement("Build_DUMMY");\r
+        vToolCode.addElement("CC");\r
+        vToolCode.addElement("DLINK");\r
+        vToolCode.addElement("SLINK");\r
+        vToolCode.addElement("PP");\r
+        vToolCode.addElement("ASM");\r
+        vToolCode.addElement("ASMLINK");\r
+        vToolCode.addElement("ASL");\r

     }\r
     \r
     private void initPackageUsage() {\r
     }\r
     \r
     private void initPackageUsage() {\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IFrame.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IFrame.java
index 51f85d677168858a95f071b8219192b6acf7963f..101dd999fba974531cb7c449675a6672fea2073d 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IFrame.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/common/ui/IFrame.java
@@ -52,7 +52,7 @@ public class IFrame extends JFrame implements ActionListener, WindowListener, Co
     // 1 - Whne editing module\r
     //\r
     private int intExitType = 0;\r
     // 1 - Whne editing module\r
     //\r
     private int intExitType = 0;\r

-    \r
+\r

     /**\r
      Main class, used for test\r
      \r
     /**\r
      Main class, used for test\r
      \r


@@ -95,11 +95,11 @@ public class IFrame extends JFrame implements ActionListener, WindowListener, Co
         Dimension d = Toolkit.getDefaultToolkit().getScreenSize();\r
         this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);\r
     }\r
         Dimension d = Toolkit.getDefaultToolkit().getScreenSize();\r
         this.setLocation((d.width - intWidth) / 2, (d.height - intHeight) / 2);\r
     }\r

-    \r
+\r

     /**\r
     /**\r

-    Start the window full of the screen\r
-    \r
-    **/\r
+     Start the window full of the screen\r
+     \r
+     **/\r

     protected void maxWindow() {\r
         Dimension d = Toolkit.getDefaultToolkit().getScreenSize();\r
         this.setLocation(0, 0);\r
     protected void maxWindow() {\r
         Dimension d = Toolkit.getDefaultToolkit().getScreenSize();\r
         this.setLocation(0, 0);\r


@@ -215,49 +215,50 @@ public class IFrame extends JFrame implements ActionListener, WindowListener, Co
             this.dispose();\r
         }\r
     }\r
             this.dispose();\r
         }\r
     }\r

-    \r
+\r

     public int showSaveDialog() {\r
     public int showSaveDialog() {\r

-        return JOptionPane.showConfirmDialog(null, "Save all changed files?", "Save", JOptionPane.YES_NO_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE);\r
+        return JOptionPane.showConfirmDialog(null, "Save all changed files?", "Save", JOptionPane.YES_NO_CANCEL_OPTION,\r
+                                             JOptionPane.WARNING_MESSAGE);\r

     }\r
     }\r

-    \r
+\r

     /**\r
     /**\r

-    Check the input data is empty or not\r
-    \r
-    @param strValue The input data which need be checked\r
-    \r
-    @retval true - The input data is empty\r
-    @retval fals - The input data is not empty\r
-    \r
-    **/\r
-   public boolean isEmpty(String strValue) {\r
-       return Tools.isEmpty(strValue);\r
-   }\r
-   \r
-   /**\r
-    Display the dialog\r
-    \r
-    **/\r
-   public void showDialog() {\r
-       this.setVisible(true);\r
-   }\r
-\r
-public void componentResized(ComponentEvent arg0) {\r
-    // TODO Auto-generated method stub\r
-    \r
-}\r
+     Check the input data is empty or not\r
+     \r
+     @param strValue The input data which need be checked\r
+     \r
+     @retval true - The input data is empty\r
+     @retval fals - The input data is not empty\r
+     \r
+     **/\r
+    public boolean isEmpty(String strValue) {\r
+        return Tools.isEmpty(strValue);\r
+    }\r

 \r
 \r

-public void componentMoved(ComponentEvent arg0) {\r
-    // TODO Auto-generated method stub\r
-    \r
-}\r
+    /**\r
+     Display the dialog\r
+     \r
+     **/\r
+    public void showDialog() {\r
+        this.setVisible(true);\r
+    }\r

 \r
 \r

-public void componentShown(ComponentEvent arg0) {\r
-    // TODO Auto-generated method stub\r
-    \r
-}\r
+    public void componentResized(ComponentEvent arg0) {\r
+        // TODO Auto-generated method stub\r

 \r
 \r

-public void componentHidden(ComponentEvent arg0) {\r
-    // TODO Auto-generated method stub\r
-    \r
-}\r
+    }\r
+\r
+    public void componentMoved(ComponentEvent arg0) {\r
+        // TODO Auto-generated method stub\r
+\r
+    }\r
+\r
+    public void componentShown(ComponentEvent arg0) {\r
+        // TODO Auto-generated method stub\r
+\r
+    }\r
+\r
+    public void componentHidden(ComponentEvent arg0) {\r
+        // TODO Auto-generated method stub\r
+\r
+    }\r

 }\r
 }\r

diff --git a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java
index b7acc7da29414752105a9097ab8d0b0a20442582..dcc4b42a36bbcf0e2456840a47253b8d1412ee6c 100644 (file)
--- a/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java
+++ b/Tools/Java/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/toolchain/Preferences.java
@@ -162,7 +162,7 @@ public class Preferences extends IFrame {
 \r
     private JTextField jTextFieldThreadCount = null;\r
     \r
 \r
     private JTextField jTextFieldThreadCount = null;\r
     \r

-    private String threadCount;\r
+    private String threadCount = "";\r

     \r
     private boolean threadEnabled = false;\r
 \r
     \r
     private boolean threadEnabled = false;\r
 \r


@@ -547,7 +547,6 @@ public class Preferences extends IFrame {
      * \r
      */\r
     private void init() {\r
      * \r
      */\r
     private void init() {\r

-\r

         for (int i = 0; i < maxTargetLines; i++) {\r
             targetLines[i] = null;\r
             targetLineNumber[i] = -1;\r
         for (int i = 0; i < maxTargetLines; i++) {\r
             targetLines[i] = null;\r
             targetLineNumber[i] = -1;\r


@@ -1119,6 +1118,9 @@ public class Preferences extends IFrame {
         File toFile = new File(bakFile);\r
         FileInputStream fromTxt = null;\r
         FileOutputStream toBak = null;\r
         File toFile = new File(bakFile);\r
         FileInputStream fromTxt = null;\r
         FileOutputStream toBak = null;\r

+        if (!fromFile.exists()) {\r
+            fromFile.createNewFile();\r
+        }\r

         try {\r
             fromTxt = new FileInputStream(fromFile);\r
             toBak = new FileOutputStream(toFile);\r
         try {\r
             fromTxt = new FileInputStream(fromFile);\r
             toBak = new FileOutputStream(toFile);\r