java variable should have its first char in low case.

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

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 ad207ff3bad91d6a3e66f09525d64a086734f136..8ea5cc9a25d353abd49e85172f5142ed74eb55a8 100644 (file)
--- a/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
+++ b/Tools/Source/FrameworkWizard/src/org/tianocore/frameworkwizard/platform/ui/FpdFrameworkModules.java
@@ -80,53 +80,63 @@ public class FpdFrameworkModules extends IInternalFrame {
 \r
     private ArrayList<ModuleIdentification> miList = null;\r
 \r
 \r
     private ArrayList<ModuleIdentification> miList = null;\r
 \r

-    private final int ModNameColForAllModTable = 0;\r
+    private final int modNameColForAllModTable = 0;\r

     \r
     \r

-    private final int PkgNameColForAllModTable = 1;\r
+    private final int pkgNameColForAllModTable = 1;\r

     \r
     \r

-    private final int PathColForAllModTable = 2;\r
+    private final int pathColForAllModTable = 2;\r

     \r
     \r

-    private final int PkgVerColForAllModTable = 3;\r
+    private final int pkgVerColForAllModTable = 3;\r

     \r
     \r

-    private final int ModVerColForAllModTable = 4;\r
+    private final int modVerColForAllModTable = 4;\r

     \r
     \r

-    private final int ModNameColForFpdModTable = 0;\r
+    private final int modNameColForFpdModTable = 0;\r

     \r
     \r

-    private final int PkgNameColForFpdModTable = 1;\r
+    private final int pkgNameColForFpdModTable = 1;\r

     \r
     \r

-    private final int PathColForFpdModTable = 2;\r
+    private final int pathColForFpdModTable = 2;\r

     \r
     \r

-    private final int ArchColForFpdModTable = 3;\r
+    private final int archColForFpdModTable = 3;\r

     \r
     \r

-    private final int PkgVerColForFpdModTable = 4;\r
+    private final int pkgVerColForFpdModTable = 4;\r

 \r
 \r

-    private final int ModVerColForFpdModTable = 5;\r
+    private final int modVerColForFpdModTable = 5;\r
+    \r
+    private final int ffcModGuid = 0;\r
+    \r
+    private final int ffcModVer = 1;\r
+    \r
+    private final int ffcPkgGuid = 2;\r
+    \r
+    private final int ffcPkgVer = 3;\r
+    \r
+    private final int ffcModArch = 4;\r

 \r
 \r

-    private final int ModNameMinWidth = 168;\r
+    private final int modNameMinWidth = 168;\r

     \r
     \r

-    private final int ModNamePrefWidth = 200;\r
+    private final int modNamePrefWidth = 200;\r

 \r
 \r

-    private final int PkgNameMinWidth = 100;\r
+    private final int pkgNameMinWidth = 100;\r

     \r
     \r

-    private final int PkgNamePrefWidth = 110;\r
+    private final int pkgNamePrefWidth = 110;\r

     \r
     \r

-    private final int PkgNameMaxWidth = 150;\r
+    private final int pkgNameMaxWidth = 150;\r

     \r
     \r

-    private final int VerMinWidth = 50;\r
+    private final int verMinWidth = 50;\r

     \r
     \r

-    private final int VerMaxWidth = 80;\r
+    private final int verMaxWidth = 80;\r

     \r
     \r

-    private final int VerPrefWidth = 60;\r
+    private final int verPrefWidth = 60;\r

     \r
     \r

-    private final int PathPrefWidth = 320;\r
+    private final int pathPrefWidth = 320;\r

     \r
     \r

-    private final int PathMinWidth = 280;\r
+    private final int pathMinWidth = 280;\r

     \r
     \r

-    private final int ArchPrefWidth = 80;\r
+    private final int archPrefWidth = 80;\r

     \r
     \r

-    private final int ArchMinWidth = 60;\r
+    private final int archMinWidth = 60;\r

     \r
     \r

-    private final int ArchMaxWidth = 100;\r
+    private final int archMaxWidth = 100;\r

     \r
     /**\r
      * This method initializes jSplitPane      \r
     \r
     /**\r
      * This method initializes jSplitPane      \r


@@ -213,24 +223,24 @@ public class FpdFrameworkModules extends IInternalFrame {
             modelAllModules.addColumn("<html>Module<br>Version</html>");\r
             \r
             javax.swing.table.TableColumn column = null;\r
             modelAllModules.addColumn("<html>Module<br>Version</html>");\r
             \r
             javax.swing.table.TableColumn column = null;\r

-            column = jTableAllModules.getColumnModel().getColumn(ModNameColForAllModTable);\r
-            column.setPreferredWidth(ModNamePrefWidth);\r
-            column.setMinWidth(ModNameMinWidth);\r
-            column = jTableAllModules.getColumnModel().getColumn(ModVerColForAllModTable);\r
-            column.setPreferredWidth(VerPrefWidth);\r
-            column.setMaxWidth(VerMaxWidth);\r
-            column.setMinWidth(VerMinWidth);\r
-            column = jTableAllModules.getColumnModel().getColumn(PkgNameColForAllModTable);\r
-            column.setPreferredWidth(PkgNamePrefWidth);\r
-            column.setMinWidth(PkgNameMinWidth);\r
-            column.setMaxWidth(PkgNameMaxWidth);\r
-            column = jTableAllModules.getColumnModel().getColumn(PkgVerColForAllModTable);\r
-            column.setPreferredWidth(VerPrefWidth);\r
-            column.setMaxWidth(VerMaxWidth);\r
-            column.setMinWidth(VerMinWidth);\r
-            column = jTableAllModules.getColumnModel().getColumn(PathColForAllModTable);\r
-            column.setPreferredWidth(PathPrefWidth);\r
-            column.setMinWidth(PathMinWidth);\r
+            column = jTableAllModules.getColumnModel().getColumn(modNameColForAllModTable);\r
+            column.setPreferredWidth(modNamePrefWidth);\r
+            column.setMinWidth(modNameMinWidth);\r
+            column = jTableAllModules.getColumnModel().getColumn(modVerColForAllModTable);\r
+            column.setPreferredWidth(verPrefWidth);\r
+            column.setMaxWidth(verMaxWidth);\r
+            column.setMinWidth(verMinWidth);\r
+            column = jTableAllModules.getColumnModel().getColumn(pkgNameColForAllModTable);\r
+            column.setPreferredWidth(pkgNamePrefWidth);\r
+            column.setMinWidth(pkgNameMinWidth);\r
+            column.setMaxWidth(pkgNameMaxWidth);\r
+            column = jTableAllModules.getColumnModel().getColumn(pkgVerColForAllModTable);\r
+            column.setPreferredWidth(verPrefWidth);\r
+            column.setMaxWidth(verMaxWidth);\r
+            column.setMinWidth(verMinWidth);\r
+            column = jTableAllModules.getColumnModel().getColumn(pathColForAllModTable);\r
+            column.setPreferredWidth(pathPrefWidth);\r
+            column.setMinWidth(pathMinWidth);\r

 \r
             jTableAllModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
                        jTableAllModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
 \r
             jTableAllModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
                        jTableAllModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r


@@ -273,7 +283,7 @@ public class FpdFrameworkModules extends IInternalFrame {
 \r
                     TableSorter sorter = (TableSorter) jTableAllModules.getModel();\r
                     selectedRow = sorter.modelIndex(selectedRow);\r
 \r
                     TableSorter sorter = (TableSorter) jTableAllModules.getModel();\r
                     selectedRow = sorter.modelIndex(selectedRow);\r

-                    String path = modelAllModules.getValueAt(selectedRow, PathColForAllModTable) + "";\r
+                    String path = modelAllModules.getValueAt(selectedRow, pathColForAllModTable) + "";\r

                     ModuleIdentification mi = miList.get(selectedRow);\r
                     Vector<String> vArchs = null;\r
                     try {\r
                     ModuleIdentification mi = miList.get(selectedRow);\r
                     Vector<String> vArchs = null;\r
                     try {\r


@@ -318,12 +328,12 @@ public class FpdFrameworkModules extends IInternalFrame {
                         String[] row = { "", "", "", "", "", "" };\r
 \r
                         if (mi != null) {\r
                         String[] row = { "", "", "", "", "", "" };\r
 \r
                         if (mi != null) {\r

-                            row[ModNameColForFpdModTable] = mi.getName();\r
-                            row[PkgNameColForFpdModTable] = mi.getPackage().getName();\r
-                            row[PathColForFpdModTable] = path;\r
-                            row[ArchColForFpdModTable] = arch;\r
-                            row[PkgVerColForFpdModTable] = pv;\r
-                            row[ModVerColForFpdModTable] = mv;\r
+                            row[modNameColForFpdModTable] = mi.getName();\r
+                            row[pkgNameColForFpdModTable] = mi.getPackage().getName();\r
+                            row[pathColForFpdModTable] = path;\r
+                            row[archColForFpdModTable] = arch;\r
+                            row[pkgVerColForFpdModTable] = pv;\r
+                            row[modVerColForFpdModTable] = mv;\r

 \r
                         }\r
                         modelFpdModules.addRow(row);\r
 \r
                         }\r
                         modelFpdModules.addRow(row);\r


@@ -333,7 +343,7 @@ public class FpdFrameworkModules extends IInternalFrame {
                             //ToDo : specify archs need to add.\r
                             ffc.addFrameworkModulesPcdBuildDefs(mi, arch, null);\r
                         } catch (Exception exception) {\r
                             //ToDo : specify archs need to add.\r
                             ffc.addFrameworkModulesPcdBuildDefs(mi, arch, null);\r
                         } catch (Exception exception) {\r

-                            JOptionPane.showMessageDialog(frame, "Adding " + row[ModNameColForFpdModTable] + " with SupArch " + arch\r
+                            JOptionPane.showMessageDialog(frame, "Adding " + row[modNameColForFpdModTable] + " with SupArch " + arch\r

                                                                  + ": " + exception.getMessage());\r
                             errorOccurred = true;\r
                         }\r
                                                                  + ": " + exception.getMessage());\r
                             errorOccurred = true;\r
                         }\r


@@ -404,28 +414,28 @@ public class FpdFrameworkModules extends IInternalFrame {
             modelFpdModules.addColumn("<html>Module<br>Version</html>");\r
             \r
             javax.swing.table.TableColumn column = null;\r
             modelFpdModules.addColumn("<html>Module<br>Version</html>");\r
             \r
             javax.swing.table.TableColumn column = null;\r

-            column = jTableFpdModules.getColumnModel().getColumn(ModNameColForFpdModTable);\r
-            column.setPreferredWidth(ModNamePrefWidth);\r
-            column.setMinWidth(ModNameMinWidth);\r
-            column = jTableFpdModules.getColumnModel().getColumn(ModVerColForFpdModTable);\r
-            column.setPreferredWidth(VerPrefWidth);\r
-            column.setMaxWidth(VerMaxWidth);\r
-            column.setMinWidth(VerMinWidth);\r
-            column = jTableFpdModules.getColumnModel().getColumn(PkgNameColForFpdModTable);\r
-            column.setPreferredWidth(PkgNamePrefWidth);\r
-            column.setMinWidth(PkgNameMinWidth);\r
-            column.setMaxWidth(PkgNameMaxWidth);\r
-            column = jTableFpdModules.getColumnModel().getColumn(PkgVerColForFpdModTable);\r
-            column.setPreferredWidth(VerPrefWidth);\r
-            column.setMaxWidth(VerMaxWidth);\r
-            column.setMinWidth(VerMinWidth);\r
-            column = jTableFpdModules.getColumnModel().getColumn(ArchColForFpdModTable);\r
-            column.setPreferredWidth(ArchPrefWidth);\r
-            column.setMaxWidth(ArchMaxWidth);\r
-            column.setMinWidth(ArchMinWidth);\r
-            column = jTableFpdModules.getColumnModel().getColumn(PathColForFpdModTable);\r
-            column.setPreferredWidth(PathPrefWidth);\r
-            column.setMinWidth(PathMinWidth);\r
+            column = jTableFpdModules.getColumnModel().getColumn(modNameColForFpdModTable);\r
+            column.setPreferredWidth(modNamePrefWidth);\r
+            column.setMinWidth(modNameMinWidth);\r
+            column = jTableFpdModules.getColumnModel().getColumn(modVerColForFpdModTable);\r
+            column.setPreferredWidth(verPrefWidth);\r
+            column.setMaxWidth(verMaxWidth);\r
+            column.setMinWidth(verMinWidth);\r
+            column = jTableFpdModules.getColumnModel().getColumn(pkgNameColForFpdModTable);\r
+            column.setPreferredWidth(pkgNamePrefWidth);\r
+            column.setMinWidth(pkgNameMinWidth);\r
+            column.setMaxWidth(pkgNameMaxWidth);\r
+            column = jTableFpdModules.getColumnModel().getColumn(pkgVerColForFpdModTable);\r
+            column.setPreferredWidth(verPrefWidth);\r
+            column.setMaxWidth(verMaxWidth);\r
+            column.setMinWidth(verMinWidth);\r
+            column = jTableFpdModules.getColumnModel().getColumn(archColForFpdModTable);\r
+            column.setPreferredWidth(archPrefWidth);\r
+            column.setMaxWidth(archMaxWidth);\r
+            column.setMinWidth(archMinWidth);\r
+            column = jTableFpdModules.getColumnModel().getColumn(pathColForFpdModTable);\r
+            column.setPreferredWidth(pathPrefWidth);\r
+            column.setMinWidth(pathMinWidth);\r

 \r
             jTableFpdModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
                        jTableFpdModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
 \r
             jTableFpdModules.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
                        jTableFpdModules.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r


@@ -468,11 +478,11 @@ public class FpdFrameworkModules extends IInternalFrame {
 \r
                     String[] sa = new String[5];\r
                     ffc.getFrameworkModuleInfo(selectedRow, sa);\r
 \r
                     String[] sa = new String[5];\r
                     ffc.getFrameworkModuleInfo(selectedRow, sa);\r

-                    String mg = sa[0];\r
-                    String mv = sa[1];\r
-                    String pg = sa[2];\r
-                    String pv = sa[3];\r
-                    String arch = sa[4];\r
+                    String mg = sa[ffcModGuid];\r
+                    String mv = sa[ffcModVer];\r
+                    String pg = sa[ffcPkgGuid];\r
+                    String pv = sa[ffcPkgVer];\r
+                    String arch = sa[ffcModArch];\r

                     settingDlg.setKey(mg + " " + mv + " " + pg + " " + pv + " " + arch, selectedRow, docConsole);\r
                     settingDlg.setVisible(true);\r
                 }\r
                     settingDlg.setKey(mg + " " + mv + " " + pg + " " + pv + " " + arch, selectedRow, docConsole);\r
                     settingDlg.setVisible(true);\r
                 }\r


@@ -503,14 +513,12 @@ public class FpdFrameworkModules extends IInternalFrame {
 \r
                     String[] sa = new String[5];\r
                     ffc.getFrameworkModuleInfo(selectedRow, sa);\r
 \r
                     String[] sa = new String[5];\r
                     ffc.getFrameworkModuleInfo(selectedRow, sa);\r

-                    String mg = sa[0];\r
-                    String mv = sa[1];\r
-                    String pg = sa[2];\r
-                    String pv = sa[3];\r
-                    String arch = sa[4];\r
-                    ModuleIdentification mi = GlobalData.getModuleId(sa[0] + " " + sa[1] + " "\r
-                                                                     + sa[2] + " " + sa[3] + " "\r
-                                                                     + sa[4]);\r
+                    String mg = sa[ffcModGuid];\r
+                    String mv = sa[ffcModVer];\r
+                    String pg = sa[ffcPkgGuid];\r
+                    String pv = sa[ffcPkgVer];\r
+                    String arch = sa[ffcModArch];\r
+                    ModuleIdentification mi = GlobalData.getModuleId(mg + " " + mv + " " + pg + " " + pv + " " + arch);\r

                     mv = mi.getVersion();\r
                     pv = mi.getPackage().getVersion();\r
                     modelFpdModules.removeRow(selectedRow);\r
                     mv = mi.getVersion();\r
                     pv = mi.getPackage().getVersion();\r
                     modelFpdModules.removeRow(selectedRow);\r


@@ -581,17 +589,17 @@ public class FpdFrameworkModules extends IInternalFrame {
             String[][] saa = new String[ffc.getFrameworkModulesCount()][5];\r
             ffc.getFrameworkModulesInfo(saa);\r
             for (int i = 0; i < saa.length; ++i) {\r
             String[][] saa = new String[ffc.getFrameworkModulesCount()][5];\r
             ffc.getFrameworkModulesInfo(saa);\r
             for (int i = 0; i < saa.length; ++i) {\r

-                ModuleIdentification mi = GlobalData.getModuleId(saa[i][0] + " " + saa[i][1] + " "\r
-                                                                 + saa[i][2] + " " + saa[i][3]);\r
+                ModuleIdentification mi = GlobalData.getModuleId(saa[i][ffcModGuid] + " " + saa[i][ffcModVer] + " "\r
+                                                                 + saa[i][ffcPkgGuid] + " " + saa[i][ffcPkgVer]);\r

                 String[] row = { "", "", "", "", "", "" };\r
                 if (mi != null) {\r
                 String[] row = { "", "", "", "", "", "" };\r
                 if (mi != null) {\r

-                    row[ModNameColForFpdModTable] = mi.getName();\r
-                    row[ModVerColForFpdModTable] = mi.getVersion();\r
-                    row[PkgNameColForFpdModTable] = mi.getPackage().getName();\r
-                    row[PkgVerColForFpdModTable] = mi.getPackage().getVersion();\r
-                    row[ArchColForFpdModTable] = saa[i][4];\r
+                    row[modNameColForFpdModTable] = mi.getName();\r
+                    row[modVerColForFpdModTable] = mi.getVersion();\r
+                    row[pkgNameColForFpdModTable] = mi.getPackage().getName();\r
+                    row[pkgVerColForFpdModTable] = mi.getPackage().getVersion();\r
+                    row[archColForFpdModTable] = saa[i][4];\r

                     try {\r
                     try {\r

-                        row[PathColForFpdModTable] = GlobalData.getMsaFile(mi).getPath().substring(\r
+                        row[pathColForFpdModTable] = GlobalData.getMsaFile(mi).getPath().substring(\r

                                                                                       System.getenv("WORKSPACE")\r
                                                                                             .length() + 1);\r
                     } catch (Exception e) {\r
                                                                                       System.getenv("WORKSPACE")\r
                                                                                             .length() + 1);\r
                     } catch (Exception e) {\r


@@ -599,13 +607,13 @@ public class FpdFrameworkModules extends IInternalFrame {
                     }\r
                 }\r
                 modelFpdModules.addRow(row);\r
                     }\r
                 }\r
                 modelFpdModules.addRow(row);\r

-                ArrayList<String> al = fpdMsa.get(saa[i][0] + saa[i][1]\r
-                                                  + saa[i][2] +  saa[i][3]);\r
+                ArrayList<String> al = fpdMsa.get(saa[i][ffcModGuid] + saa[i][ffcModVer]\r
+                                                  + saa[i][ffcPkgGuid] + saa[i][ffcPkgVer]);\r

                 if (al == null) {\r
                     al = new ArrayList<String>();\r
                 if (al == null) {\r
                     al = new ArrayList<String>();\r

-                    fpdMsa.put(saa[i][0] + saa[i][1] + saa[i][2] + saa[i][3], al);\r
+                    fpdMsa.put(saa[i][ffcModGuid] + saa[i][ffcModVer] + saa[i][ffcPkgGuid] + saa[i][ffcPkgVer], al);\r

                 }\r
                 }\r

-                al.add(saa[i][4]);\r
+                al.add(saa[i][ffcModArch]);\r

 \r
             }\r
         }\r
 \r
             }\r
         }\r


@@ -630,12 +638,12 @@ public class FpdFrameworkModules extends IInternalFrame {
             Iterator ismi = smi.iterator();\r
             while (ismi.hasNext()) {\r
                 ModuleIdentification mi = (ModuleIdentification) ismi.next();\r
             Iterator ismi = smi.iterator();\r
             while (ismi.hasNext()) {\r
                 ModuleIdentification mi = (ModuleIdentification) ismi.next();\r

-                s[ModNameColForAllModTable] = mi.getName();\r
-                s[ModVerColForAllModTable] = mi.getVersion();\r
-                s[PkgNameColForAllModTable] = pi.getName();\r
-                s[PkgVerColForAllModTable] = pi.getVersion();\r
+                s[modNameColForAllModTable] = mi.getName();\r
+                s[modVerColForAllModTable] = mi.getVersion();\r
+                s[pkgNameColForAllModTable] = pi.getName();\r
+                s[pkgVerColForAllModTable] = pi.getVersion();\r

                 try {\r
                 try {\r

-                    s[PathColForAllModTable] = GlobalData.getMsaFile(mi).getPath()\r
+                    s[pathColForAllModTable] = GlobalData.getMsaFile(mi).getPath()\r

                                             .substring(System.getenv("WORKSPACE").length() + 1);\r
                 } catch (Exception e) {\r
                     JOptionPane.showMessageDialog(frame, "Show All Modules:" + e.getMessage());\r
                                             .substring(System.getenv("WORKSPACE").length() + 1);\r
                 } catch (Exception e) {\r
                     JOptionPane.showMessageDialog(frame, "Show All Modules:" + e.getMessage());\r