singleton of Database & FirstPanel

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

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/Database.java b/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
index 8b088c9cbb2135cad003c583c4d2b2f4d29e33cd..c986d3b59bb8d853a9dfb571e6ccd689ca0702a4 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/Database.java
@@ -17,15 +17,21 @@ import java.util.*;
 import java.util.regex.*;\r
 \r
 public final class Database {\r
-       Database(String path) throws Exception {\r
+       private static final Database INSTANCE = Database.init();\r
+       \r
+       Database(String path) {\r
                DatabasePath = path;\r
-               \r
-               importDBLib("Library.csv");\r
-               importDBGuid("Guid.csv", "Guid");\r
-               importDBGuid("Ppi.csv", "Ppi");\r
-               importDBGuid("Protocol.csv", "Protocol");\r
-               importDBMacro("Macro.csv");\r
-               importListR8Only();\r
+\r
+               try {\r
+                       importDBLib("Library.csv");\r
+                       importDBGuid("Guid.csv", "Guid");\r
+                       importDBGuid("Ppi.csv", "Ppi");\r
+                       importDBGuid("Protocol.csv", "Protocol");\r
+                       importDBMacro("Macro.csv");\r
+                       importListR8Only();\r
+               } catch (Exception e) {\r
+                       System.out.println(e.getMessage());\r
+               }\r
        }\r
        \r
        public String DatabasePath;\r
@@ -165,12 +171,16 @@ public final class Database {
        //-------------------------------------has------------------------------------------//\r
        \r
        //-------------------------------------init------------------------------------------//\r
-       \r
-       public static Database init() throws Exception {\r
+\r
+       private static final Database init() {\r
                if (System.getenv("WORKSPACE") == null) {\r
                        return new Database("C:" + File.separator + "tianocore" + File.separator + "edk2" + File.separator + "Tools" + File.separator + "Conf" + File.separator + "Migration");\r
                } else {\r
                        return new Database(System.getenv("WORKSPACE") + File.separator + "Tools" + File.separator + "Conf" + File.separator + "Migration");\r
                }\r
        }\r
+       \r
+       public static final Database getInstance() {\r
+               return INSTANCE;\r
+       }\r
 }\r

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
index d0f9151ed7fe613b7ef2f1c134559d610884aa27..c78ad97bb3063604bd7554a02f42fea43f1a8b8c 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/FirstPanel.java
@@ -24,6 +24,8 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList
         */\r
        private static final long serialVersionUID = 207759413522910399L;\r
        \r
+       private static final FirstPanel INSTANCE = FirstPanel.init();\r
+       \r
        private String startpath;\r
        private ModuleInfo mi;\r
        \r
@@ -36,7 +38,7 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList
        private boolean tofile = true, toscreen = true;\r
        private PrintWriter logfile;\r
 \r
-       FirstPanel() throws Exception {\r
+       FirstPanel() {\r
         GridBagLayout gridbag = new GridBagLayout();\r
         setLayout(gridbag);\r
         \r
@@ -235,14 +237,17 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList
 \r
     //---------------------------------------------------------------------------------------//\r
     \r
-    public static FirstPanel init() throws Exception {\r
-       \r
-       //UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());\r
-       UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());\r
-       //UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");\r
-       //UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");\r
-       //UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");\r
-       //UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");\r
+    private static final FirstPanel init() {\r
+       try {\r
+               UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());\r
+               //UIManager.setLookAndFeel(UIManager.getCrossPlatformLookAndFeelClassName());\r
+               //UIManager.setLookAndFeel("javax.swing.plaf.metal.MetalLookAndFeel");\r
+               //UIManager.setLookAndFeel("com.sun.java.swing.plaf.windows.WindowsLookAndFeel");\r
+               //UIManager.setLookAndFeel("com.sun.java.swing.plaf.gtk.GTKLookAndFeel");\r
+               //UIManager.setLookAndFeel("com.sun.java.swing.plaf.motif.MotifLookAndFeel");\r
+       } catch (Exception e) {\r
+               System.out.println(e.getMessage());\r
+       }\r
        \r
                JFrame frame = new JFrame("MigrationTools");\r
                frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);\r
@@ -258,4 +263,8 @@ public final class FirstPanel extends JPanel implements ActionListener, ItemList
                \r
                return fp;\r
     }\r
+    \r
+    public static final FirstPanel getInstance() {\r
+       return INSTANCE;\r
+    }\r
 }
\ No newline at end of file

diff --git a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
index 2cef1626e7996a29a693588cf9bc65cd7d9214d6..e1e769f62dc4a810bab49cb466b5304db1aa6d7c 100644 (file)
--- a/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
+++ b/Tools/Source/MigrationTools/org/tianocore/migration/MigrationTool.java
@@ -4,6 +4,15 @@ import java.io.File;
 import java.util.Set;\r
 \r
 public class MigrationTool {\r
+       public static UI ui = null;\r
+       public static Database db = null;\r
+\r
+       public static final String MIGRATIONCOMMENT = "//%$//";\r
+\r
+       public static boolean printModuleInfo = false;\r
+       public static boolean doCritic = false;\r
+       public static boolean defaultoutput = false;\r
+\r
        private static final void manipulate(ModuleInfo mi) throws Exception {\r
 \r
                ModuleReader.ModuleScan(mi);\r
@@ -60,17 +69,8 @@ public class MigrationTool {
                Common.toDoAll(path, MigrationTool.class.getMethod("seekModule", String.class), null, null, Common.DIR);\r
        }\r
 \r
-       public static UI ui = null;\r
-       public static Database db = null;\r
-\r
-       public static final String MIGRATIONCOMMENT = "//%$//";\r
-\r
-       public static boolean printModuleInfo = false;\r
-       public static boolean doCritic = false;\r
-       public static boolean defaultoutput = false;\r
-\r
        public static void main(String[] args) throws Exception {\r
-               ui = FirstPanel.init();\r
-               db = Database.init();\r
+               ui = FirstPanel.getInstance();\r
+               db = Database.getInstance();\r
        }\r
 }\r