import javax.swing.table.TableModel;\r
\r
import org.tianocore.PlatformSurfaceAreaDocument;\r
+import org.tianocore.frameworkwizard.common.GlobalData;\r
import org.tianocore.frameworkwizard.common.Identifications.OpeningPlatformType;\r
import org.tianocore.frameworkwizard.common.ui.IInternalFrame;\r
+import org.tianocore.frameworkwizard.platform.ui.global.SurfaceAreaQuery;\r
import org.tianocore.frameworkwizard.platform.ui.global.WorkspaceProfile;\r
-import org.tianocore.frameworkwizard.platform.ui.id.ModuleIdentification;\r
-import org.tianocore.frameworkwizard.platform.ui.id.PackageIdentification;\r
+import org.tianocore.frameworkwizard.module.Identifications.ModuleIdentification;\r
\r
import java.awt.FlowLayout;\r
-import java.io.File;\r
import java.util.ArrayList;\r
import java.util.HashMap;\r
import java.util.Iterator;\r
import java.util.Map;\r
-import java.util.Set;\r
import java.util.Vector;\r
\r
public class FpdFrameworkModules extends IInternalFrame {\r
private JPanel getJPanelTop() {\r
if (jPanelTop == null) {\r
jLabel = new JLabel();\r
- jLabel.setText("Modules in Workspace");\r
+ jLabel.setText(" Modules in Workspace");\r
jPanelTop = new JPanel();\r
jPanelTop.setLayout(new BorderLayout());\r
jPanelTop.add(jLabel, java.awt.BorderLayout.NORTH);\r
private JPanel getJPanelBottom() {\r
if (jPanelBottom == null) {\r
jLabelModulesAdded = new JLabel();\r
- jLabelModulesAdded.setText("Modules Added");\r
+ jLabelModulesAdded.setText(" Modules Added into Platform");\r
jPanelBottom = new JPanel();\r
jPanelBottom.setLayout(new BorderLayout());\r
jPanelBottom.add(jLabelModulesAdded, java.awt.BorderLayout.NORTH);\r
String archsAdded = "";\r
String mg = mi.getGuid();\r
String mv = mi.getVersion();\r
- String pg = mi.getPackage().getGuid();\r
- String pv = mi.getPackage().getVersion();\r
- String mType = mi.getModuleType();\r
+ String pg = mi.getPackageId().getGuid();\r
+ String pv = mi.getPackageId().getVersion();\r
+ String mType = SurfaceAreaQuery.getModuleType(mi);\r
\r
ArrayList<String> al = fpdMsa.get(mg + mv + pg + pv);\r
if (al == null) {\r
\r
if (mi != null) {\r
row[modNameColForFpdModTable] = mi.getName();\r
- row[pkgNameColForFpdModTable] = mi.getPackage().getName();\r
+ row[pkgNameColForFpdModTable] = mi.getPackageId().getName();\r
row[pathColForFpdModTable] = path;\r
row[archColForFpdModTable] = arch;\r
row[pkgVerColForFpdModTable] = pv;\r
if (selectedRow < 0) {\r
return;\r
}\r
- docConsole.setSaved(false);\r
+ \r
\r
TableSorter sorter = (TableSorter) jTableFpdModules.getModel();\r
selectedRow = sorter.getModelRowIndex(selectedRow);\r
String pv = sa[ffcPkgVer];\r
String arch = sa[ffcModArch];\r
ModuleIdentification mi = WorkspaceProfile.getModuleId(mg + " " + mv + " " + pg + " " + pv + " " + arch);\r
- mv = mi.getVersion();\r
- pv = mi.getPackage().getVersion();\r
- modelFpdModules.removeRow(selectedRow);\r
+ if (mi != null) {\r
+ mv = mi.getVersion();\r
+ pv = mi.getPackageId().getVersion();\r
+ }\r
+ \r
+ try {\r
+ ffc.removeModuleSA(selectedRow); \r
+ }\r
+ catch (Exception exp) {\r
+ JOptionPane.showMessageDialog(frame, exp.getCause() + exp.getMessage());\r
+ return;\r
+ }\r
+ \r
if (arch == null) {\r
// if no arch specified in ModuleSA\r
fpdMsa.remove(mg + mv + pg + pv);\r
\r
} else {\r
ArrayList<String> al = fpdMsa.get(mg + mv + pg + pv);\r
- al.remove(arch);\r
- if (al.size() == 0) {\r
- fpdMsa.remove(mg + mv + pg + pv);\r
+ if (al != null) {\r
+ al.remove(arch);\r
+ if (al.size() == 0) {\r
+ fpdMsa.remove(mg + mv + pg + pv);\r
+ }\r
}\r
}\r
-\r
- ffc.removeModuleSA(selectedRow);\r
+ \r
+ modelFpdModules.removeRow(selectedRow);\r
+ docConsole.setSaved(false);\r
}\r
});\r
}\r
}\r
\r
private void init(PlatformSurfaceAreaDocument.PlatformSurfaceArea fpd) {\r
- try {\r
- WorkspaceProfile.initInfo("Tools" + File.separator + "Conf" + File.separator + "FrameworkDatabase.db", System.getenv("WORKSPACE"));\r
- }\r
- catch(Exception e){\r
- JOptionPane.showMessageDialog(frame, "Error occurred when getting module data.");\r
- }\r
\r
if (ffc == null) {\r
ffc = new FpdFileContents(fpd);\r
if (mi != null) {\r
row[modNameColForFpdModTable] = mi.getName();\r
row[modVerColForFpdModTable] = mi.getVersion();\r
- row[typeColForFpdModTable] = mi.getModuleType();\r
- row[pkgNameColForFpdModTable] = mi.getPackage().getName();\r
- row[pkgVerColForFpdModTable] = mi.getPackage().getVersion();\r
+ row[typeColForFpdModTable] = SurfaceAreaQuery.getModuleType(mi);\r
+ row[pkgNameColForFpdModTable] = mi.getPackageId().getName();\r
+ row[pkgVerColForFpdModTable] = mi.getPackageId().getVersion();\r
row[archColForFpdModTable] = saa[i][ffcModArch];\r
try {\r
- row[pathColForFpdModTable] = WorkspaceProfile.getMsaFile(mi).getPath().substring(\r
- System.getenv("WORKSPACE")\r
- .length() + 1);\r
+ row[pathColForFpdModTable] = mi.getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
} catch (Exception e) {\r
JOptionPane.showMessageDialog(frame, "Show FPD Modules:" + e.getMessage());\r
}\r
}\r
al.add(saa[i][ffcModArch]);\r
}\r
+ else {\r
+ row[modNameColForFpdModTable] = saa[i][ffcModGuid];\r
+ row[modVerColForFpdModTable] = saa[i][ffcModVer];\r
+ row[pkgNameColForFpdModTable] = saa[i][ffcPkgGuid];\r
+ row[pkgVerColForFpdModTable] = saa[i][ffcPkgVer];\r
+ row[archColForFpdModTable] = saa[i][ffcModArch];\r
+ }\r
row[forceDbgColForFpdModTable] = ffc.getModuleSAForceDebug(i);\r
modelFpdModules.addRow(row);\r
\r
if (miList == null) {\r
miList = new ArrayList<ModuleIdentification>();\r
}\r
- Set<PackageIdentification> spi = WorkspaceProfile.getPackageList();\r
- Iterator ispi = spi.iterator();\r
\r
- while (ispi.hasNext()) {\r
- PackageIdentification pi = (PackageIdentification) ispi.next();\r
String[] s = { "", "", "", "", "", "" };\r
-\r
- Set<ModuleIdentification> smi = WorkspaceProfile.getModules(pi);\r
- Iterator ismi = smi.iterator();\r
+ \r
+ Iterator ismi = GlobalData.vModuleList.iterator();\r
while (ismi.hasNext()) {\r
ModuleIdentification mi = (ModuleIdentification) ismi.next();\r
s[modNameColForAllModTable] = mi.getName();\r
s[modVerColForAllModTable] = mi.getVersion();\r
- s[typeColForAllModTable] = mi.getModuleType();\r
- s[pkgNameColForAllModTable] = pi.getName();\r
- s[pkgVerColForAllModTable] = pi.getVersion();\r
+ s[typeColForAllModTable] = SurfaceAreaQuery.getModuleType(mi);\r
+ s[pkgNameColForAllModTable] = mi.getPackageId().getName();\r
+ s[pkgVerColForAllModTable] = mi.getPackageId().getVersion();\r
try {\r
- s[pathColForAllModTable] = WorkspaceProfile.getMsaFile(mi).getPath()\r
- .substring(System.getenv("WORKSPACE").length() + 1);\r
+ s[pathColForAllModTable] = mi.getPath().substring(System.getenv("WORKSPACE").length() + 1);\r
} catch (Exception e) {\r
JOptionPane.showMessageDialog(frame, "Show All Modules:" + e.getMessage());\r
}\r
modelAllModules.addRow(s);\r
miList.add(mi);\r
}\r
- }\r
+ \r
\r
TableSorter sorter = (TableSorter)jTableAllModules.getModel();\r
sorter.setSortState(modNameColForAllModTable, TableSorter.ASCENDING);\r