import java.awt.Dimension;\r
import java.awt.Toolkit;\r
\r
-import javax.swing.JFrame;\r
import javax.swing.JOptionPane;\r
import javax.swing.JPanel;\r
import javax.swing.JDialog;\r
import javax.swing.table.TableColumn;\r
import javax.swing.table.TableModel;\r
\r
+import org.tianocore.frameworkwizard.FrameworkWizardUI;\r
import org.tianocore.frameworkwizard.common.DataValidation;\r
import org.tianocore.frameworkwizard.common.GlobalData;\r
import org.tianocore.frameworkwizard.common.IDefaultTableModel;\r
* \r
*/\r
private static final long serialVersionUID = 1L;\r
- static JFrame frame;\r
private JPanel jContentPane = null;\r
private JTabbedPane jTabbedPane = null;\r
private JPanel jPanelPcd = null;\r
private DefaultTableModel optionsTableModel = null;\r
private FpdFileContents ffc = null;\r
private String moduleKey = null;\r
+ private ModuleIdentification moduleId = null;\r
private int moduleSaNum = -1;\r
private HashMap<LibraryClassDescriptor, ArrayList<String>> classInstanceMap = null;\r
//\r
* This is the default constructor\r
*/\r
public FpdModuleSA() {\r
- super();\r
+ super(FrameworkWizardUI.getInstance());\r
initialize();\r
}\r
public FpdModuleSA(FpdFileContents ffc) {\r
classConsumed = null;\r
jTabbedPane.setSelectedIndex(0);\r
initPcdBuildDefinition(i);\r
- ModuleIdentification mi = WorkspaceProfile.getModuleId(moduleKey);\r
+ moduleId = WorkspaceProfile.getModuleId(moduleKey);\r
+ if (moduleId == null) {\r
+ return;\r
+ }\r
int tabIndex = jTabbedPane.indexOfTab("Libraries");\r
- if (mi.isLibrary()) {\r
+ if (moduleId.isLibrary()) {\r
jTabbedPane.setEnabledAt(tabIndex, false);\r
}\r
else {\r
}\r
\r
public void initLibraries(String key) {\r
+ libClassTableModel.setRowCount(0);\r
+ libInstanceTableModel.setRowCount(0);\r
+ selectedInstancesTableModel.setRowCount(0);\r
+ Vector<String> errorMsg = new Vector<String>();\r
try {\r
//\r
// display library classes that need to be resolved. also potential instances for them.\r
//\r
- resolveLibraryInstances(moduleKey);\r
+ resolveLibraryInstances(moduleKey, errorMsg);\r
} catch (Exception e) {\r
- JOptionPane.showMessageDialog(frame, e.getCause() + " " + e.getMessage());\r
+ String exceptionMsg = e.getCause() + " " + e.getMessage();\r
+ errorMsg.add(exceptionMsg);\r
+ JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), exceptionMsg);\r
}\r
//\r
// display lib instances already selected for key\r
//\r
- selectedInstancesTableModel.setRowCount(0);\r
+ \r
int instanceCount = ffc.getLibraryInstancesCount(key);\r
if (instanceCount != 0) {\r
String[][] saa = new String[instanceCount][5];\r
// re-evaluate lib instance usage when adding a already-selected lib instance.\r
//\r
try {\r
- resolveLibraryInstances(saa[i][1] + " " + saa[i][2] + " " + saa[i][3] + " " + saa[i][4]);\r
+ resolveLibraryInstances(saa[i][1] + " " + saa[i][2] + " " + saa[i][3] + " " + saa[i][4], errorMsg);\r
} catch (Exception e) {\r
- JOptionPane.showMessageDialog(frame, e.getCause() + " " + e.getMessage());\r
+ String exceptionMsg = e.getCause() + " " + e.getMessage();\r
+ if (!errorMsg.contains(exceptionMsg)) {\r
+ JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), e.getCause() + " " + e.getMessage());\r
+ }\r
}\r
selectedInstancesTableModel.addRow(saa[i]);\r
}\r
}\r
}\r
\r
+ if (errorMsg.size() > 0) {\r
+ String errors = "";\r
+ for (int i = 0; i < errorMsg.size(); ++i) {\r
+ errors += " " + errorMsg.get(i) + "\n";\r
+ }\r
+ JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), errors);\r
+ }\r
showClassToResolved();\r
}\r
\r
}\r
}\r
\r
- private void resolveLibraryInstances(String key) throws MultipleInstanceException, NoInstanceException{\r
+ private void resolveLibraryInstances(String key, Vector<String> errorMsg) throws MultipleInstanceException, NoInstanceException{\r
ModuleIdentification mi = WorkspaceProfile.getModuleId(key);\r
PackageIdentification[] depPkgList = null;\r
\r
//\r
// Get dependency pkg list into which we will search lib instances.\r
//\r
- depPkgList = SurfaceAreaQuery.getDependencePkg(null, mi);\r
+ //depPkgList = SurfaceAreaQuery.getDependencePkg(null, mi);\r
//\r
// Get the lib class consumed, produced by this module itself.\r
//\r
Vector<LibraryClassDescriptor> vClassConsumed = SurfaceAreaQuery.getLibraryClasses("ALWAYS_CONSUMED", mi);\r
+ for (int i = 0; i < vClassConsumed.size(); ++i) {\r
+ vClassConsumed.get(i).supModTypes = WorkspaceProfile.getModuleType(moduleId);\r
+ }\r
filterClassConsumedByArch(vClassConsumed);\r
if (this.classConsumed == null) {\r
this.classConsumed = new HashMap<LibraryClassDescriptor, ArrayList<String>>();\r
Iterator<LibraryClassDescriptor> lic = this.classConsumed.keySet().iterator();\r
while (lic.hasNext()) {\r
LibraryClassDescriptor cls = lic.next();\r
- if (isBoundedClass(cls)) {\r
+ if (isBoundedClass(cls, errorMsg)) {\r
continue;\r
}\r
ArrayList<String> instances = getInstancesForClass(cls, depPkgList);\r
if (instances.size() == 0) {\r
- throw new NoInstanceException (cls.className);\r
+// throw new NoInstanceException (cls.className);\r
+ String exceptionMsg = new NoInstanceException (cls.className).getMessage();\r
+ if (!errorMsg.contains(exceptionMsg)) {\r
+ errorMsg.add(exceptionMsg); \r
+ }\r
+ \r
}\r
classInstanceMap.put(cls, instances);\r
\r
* @param cls\r
* @return\r
*/\r
- private boolean isBoundedClass (LibraryClassDescriptor cls) {\r
- if (this.classProduced.containsKey(cls)) {\r
- return true;\r
- }\r
+ private boolean isBoundedClass (LibraryClassDescriptor cls, Vector<String> errorMsg) {\r
+// if (this.classProduced.containsKey(cls)) {\r
+// return true;\r
+// }\r
Iterator<LibraryClassDescriptor> lcdi = this.classProduced.keySet().iterator();\r
while (lcdi.hasNext()) {\r
LibraryClassDescriptor lcd = lcdi.next();\r
- if (cls.isSubSetByArchs(lcd) && cls.isSubSetByModTypes(lcd)) {\r
- return true;\r
+ if (cls.className.equals(lcd.className)) {\r
+ if (cls.isSubSetByArchs(lcd) && cls.isSubSetByModTypes(lcd)) {\r
+ return true;\r
+ }\r
+ else {\r
+ ArrayList<String> producedBy = this.classProduced.get(lcd);\r
+ String instancesName = "";\r
+ for (int i = 0; i < producedBy.size(); ++i) {\r
+ ModuleIdentification mi = WorkspaceProfile.getModuleId(producedBy.get(i));\r
+ instancesName += mi.getName();\r
+ instancesName += " ";\r
+ }\r
+ String msg = new ImproperInstanceException(lcd.className, instancesName, lcd.supArchs, lcd.supModTypes).getMessage();\r
+ errorMsg.add(msg);\r
+ }\r
}\r
}\r
\r
isPotential = true;\r
}\r
\r
- if (hasBeenProduced(lcd)) {\r
+ if (isPotential && hasBeenProduced(lcd)) {\r
isPotential = false;\r
break;\r
}\r
Iterator<LibraryClassDescriptor> lcdi = this.classProduced.keySet().iterator();\r
while (lcdi.hasNext()) {\r
LibraryClassDescriptor lcd = lcdi.next();\r
- if (cls.hasInterSectionWith(lcd)) {\r
+ if (cls.isSubSetByArchs(lcd) && cls.isSubSetByModTypes(lcd)) {\r
return true;\r
}\r
}\r
Iterator<LibraryClassDescriptor> lcdi = this.classConsumed.keySet().iterator();\r
while (lcdi.hasNext()) {\r
LibraryClassDescriptor lcd = lcdi.next();\r
- if (lcd.className.equals(className)) {\r
+ if ((lcd.className != null) && lcd.className.equals(className)) {\r
return this.classConsumed.get(lcd);\r
}\r
}\r
}\r
\r
private void showClassToResolved(){\r
+ Vector<String> errorMsg = new Vector<String>();\r
libClassTableModel.setRowCount(0);\r
+ libInstanceTableModel.setRowCount(0);\r
if (classConsumed == null || classConsumed.size() == 0) {\r
return;\r
}\r
continue;\r
}\r
\r
- if (!isBoundedClass(lcd)){\r
+ if (!isBoundedClass(lcd, errorMsg)){\r
libClassTableModel.addRow(s);\r
}\r
}\r
- libInstanceTableModel.setRowCount(0);\r
+ \r
+ if (errorMsg.size() > 0) {\r
+ String errors = "";\r
+ for (int i = 0; i < errorMsg.size(); ++i) {\r
+ errors += " " + errorMsg.get(i) + "\n";\r
+ }\r
+ JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), errors);\r
+ }\r
}\r
\r
+ private String getModuleArch () {\r
+ String arch = "";\r
+ String[] moduleInfo = moduleKey.split(" ");\r
+ for (int i = 4; i < moduleInfo.length; ++i) {\r
+ arch += moduleInfo[i];\r
+ arch += " ";\r
+ }\r
+ return arch.trim();\r
+ }\r
private void addLibInstance (ModuleIdentification libMi) throws Exception{\r
\r
//\r
// Add pcd information of selected instance to current moduleSA\r
//\r
- ffc.addFrameworkModulesPcdBuildDefs(libMi, null, ffc.getModuleSA(moduleKey));\r
+ ffc.addFrameworkModulesPcdBuildDefs(libMi, getModuleArch(), ffc.getModuleSA(moduleKey));\r
\r
ffc.genLibraryInstance(libMi, moduleKey);\r
}\r
jTextFieldMaxDatumSize.setText(model.getValueAt(selectedRow, 4)+"");\r
jTextFieldPcdDefault.setEnabled(true);\r
jTextFieldPcdDefault.setText(model.getValueAt(selectedRow, 6)+"");\r
- if (model.getValueAt(selectedRow, 5).equals("VOID*")) {\r
+ if ((model.getValueAt(selectedRow, 5) != null) && model.getValueAt(selectedRow, 5).equals("VOID*")) {\r
if (pcdInfo[1].equals("FEATURE_FLAG")) {\r
jTextFieldMaxDatumSize.setVisible(false);\r
}\r
jTextFieldMaxDatumSize.setText(ffc.setMaxSizeForPointer(model.getValueAt(selectedRow, 6)+"")+"");\r
}\r
catch(Exception except){\r
- JOptionPane.showMessageDialog(frame, "Unacceptable PCD Value: " + except.getMessage());\r
+ JOptionPane.showMessageDialog(FpdModuleSA.this, "Unacceptable PCD Value: " + except.getMessage());\r
}\r
}\r
else{\r
addLibInstance (libMi);\r
}\r
catch (Exception exception) {\r
- JOptionPane.showMessageDialog(frame, "Adding Instance" + libMi.getName() + ": "+ exception.getMessage());\r
+ JOptionPane.showMessageDialog(FpdModuleSA.this, "Adding Instance " + libMi.getName() + " : \n"+ exception.getMessage());\r
return;\r
}\r
docConsole.setSaved(false);\r
libInstanceTableModel.getValueAt(row, 2), libInstanceTableModel.getValueAt(row, 3),\r
libInstanceTableModel.getValueAt(row, 4)};\r
selectedInstancesTableModel.addRow(s);\r
+ \r
+ Vector<String> errorMsg = new Vector<String>();\r
try {\r
- resolveLibraryInstances(instanceValue);\r
+ resolveLibraryInstances(instanceValue, errorMsg);\r
}\r
catch (Exception exp) {\r
- JOptionPane.showMessageDialog(frame, exp.getMessage());\r
+ JOptionPane.showMessageDialog(FpdModuleSA.this, exp.getMessage());\r
+ }\r
+ \r
+ if (errorMsg.size() > 0) {\r
+ String errors = "";\r
+ for (int i = 0; i < errorMsg.size(); ++i) {\r
+ errors += " " + errorMsg.get(i) + "\n";\r
+ }\r
+ JOptionPane.showMessageDialog(FpdModuleSA.this, errors);\r
}\r
showClassToResolved();\r
}\r
//\r
oldFvList.removeAll(newFvList);\r
for (int j = 0; j < oldFvList.size(); ++j) {\r
- ffc.removeModuleInBuildOptionsUserExtensions(oldFvList.get(j), moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]); \r
+ ffc.removeModuleInBuildOptionsUserExtensions(oldFvList.get(j), "IMAGES", 1, moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]); \r
}\r
//\r
// add module to Fvs that were not in oldFvList.\r
oldFvList = getVectorFromString (originalFvBinding);\r
newFvList.removeAll(oldFvList);\r
for (int i = 0; i < newFvList.size(); ++i) {\r
- ffc.addModuleIntoBuildOptionsUserExtensions(newFvList.get(i), moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]);\r
+ ffc.addModuleIntoBuildOptionsUserExtensions(newFvList.get(i), "IMAGES", 1, moduleInfo[0], moduleInfo[1], moduleInfo[2], moduleInfo[3], moduleInfo[4]);\r
}\r
docConsole.setSaved(false);\r
}\r
}\r
if (newFileGuid.length() > 0) {\r
if (!DataValidation.isGuid(newFileGuid)) {\r
- JOptionPane.showMessageDialog(frame, "FFS File Guid is NOT GUID Type.");\r
+ JOptionPane.showMessageDialog(FpdModuleSA.this, "FFS File Guid is NOT GUID Type.");\r
return;\r
}\r
}\r
vArch.add("EBC");\r
vArch.add("ARM");\r
vArch.add("PPC");\r
- jTableModuleSaOptions.getColumnModel().getColumn(4).setCellEditor(new ListEditor(vArch));\r
+ jTableModuleSaOptions.getColumnModel().getColumn(4).setCellEditor(new ListEditor(vArch, FrameworkWizardUI.getInstance()));\r
\r
- jTableModuleSaOptions.getColumnModel().getColumn(5).setCellEditor(new LongTextEditor());\r
+ jTableModuleSaOptions.getColumnModel().getColumn(5).setCellEditor(new LongTextEditor(FrameworkWizardUI.getInstance()));\r
\r
jTableModuleSaOptions.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);\r
jTableModuleSaOptions.setAutoResizeMode(javax.swing.JTable.AUTO_RESIZE_OFF);\r
if (jComboBoxItemType == null) {\r
jComboBoxItemType = new JComboBox();\r
jComboBoxItemType.setPreferredSize(new java.awt.Dimension(200,20));\r
-// jComboBoxItemType.addItemListener(new java.awt.event.ItemListener() {\r
-// public void itemStateChanged(java.awt.event.ItemEvent e) {\r
-// \r
-// int row = jTablePcd.getSelectedRow();\r
-// if (row < 0 || model.getValueAt(row, 2).equals(jComboBoxItemType.getSelectedItem())) {\r
-// return;\r
-// }\r
-// if (!jComboBoxItemType.getSelectedItem().equals("DYNAMIC")) {\r
-// \r
-// if (jComboBoxItemType.getSelectedItem().equals("FIXED_AT_BUILD")) {\r
-// jTextFieldPcdDefault.setText("");\r
-// jTextFieldPcdDefault.setEnabled(true);\r
-// }\r
-// }\r
-// else{\r
-// \r
-// }\r
-// }\r
-// });\r
+ jComboBoxItemType.addItemListener(new java.awt.event.ItemListener() {\r
+ public void itemStateChanged(java.awt.event.ItemEvent e) {\r
+ \r
+ int row = jTablePcd.getSelectedRow();\r
+ if (row < 0) {\r
+ return;\r
+ }\r
+ \r
+ if (jComboBoxItemType.getSelectedItem() != null && jComboBoxItemType.getSelectedItem().equals("FIXED_AT_BUILD")) {\r
+ jTextFieldPcdDefault.setEnabled(true);\r
+ }\r
+ else {\r
+ jTextFieldPcdDefault.setEnabled(false);\r
+ }\r
+ } \r
+ });\r
}\r
return jComboBoxItemType;\r
}\r
al.set(i, mKey + " " + itemType);\r
}\r
try{\r
- ffc.addDynamicPcdBuildData(cName, jTablePcd.getValueAt(jTablePcd.getSelectedRow(), 3), tsGuid, "DYNAMIC", jTablePcd.getValueAt(jTablePcd.getSelectedRow(), 5)+"", jTextFieldPcdDefault.isVisible() ? jTextFieldPcdDefault.getText() : jComboBoxFeatureFlagValue.getSelectedItem()+"");\r
+ ffc.addDynamicPcdBuildData(cName, model.getValueAt(jTablePcd.getSelectedRow(), 3), tsGuid, "DYNAMIC", model.getValueAt(jTablePcd.getSelectedRow(), 5)+"", jTextFieldPcdDefault.isVisible() ? jTextFieldPcdDefault.getText() : jComboBoxFeatureFlagValue.getSelectedItem()+"");\r
}\r
catch(Exception e){\r
- JOptionPane.showMessageDialog(frame, "PCD value format: " + e.getMessage());\r
+ JOptionPane.showMessageDialog(FpdModuleSA.this, "PCD value format: " + e.getMessage());\r
}\r
}\r
\r
String cName = model.getValueAt(row, 0)+"";\r
String tsGuid = model.getValueAt(row, 1)+"";\r
String oldItemType = model.getValueAt(row, 2)+"";\r
+ String dataType = model.getValueAt(row, 5)+"";\r
String newItemType = jComboBoxItemType.getSelectedItem()+"";\r
+ String newValue = jTextFieldPcdDefault.isVisible()? jTextFieldPcdDefault.getText():jComboBoxFeatureFlagValue.getSelectedItem()+""; \r
+ if (newValue.length() == 0){\r
\r
- model.setValueAt(jTextFieldPcdDefault.isVisible()? jTextFieldPcdDefault.getText():jComboBoxFeatureFlagValue.getSelectedItem(), row, 6);\r
+ if (dataType.equals("UINT8") || dataType.equals("UINT16") || dataType.equals("UINT32") || dataType.equals("UINT64")) {\r
+ newValue = "0";\r
+ }\r
+ if (dataType.equals("BOOLEAN")){\r
+ newValue = "FALSE";\r
+ }\r
+ if (dataType.equals("VOID*")) {\r
+ newValue = "L\"\"";\r
+ }\r
+ }\r
\r
String[] pcdInfo = {"", "", ""};\r
Vector<String> validPcdTypes = new Vector<String>();\r
getPcdInfo (moduleKey, cName, tsGuid, pcdInfo, validPcdTypes);\r
if (pcdInfo[1].equals("FIXED_AT_BUILD") && model.getValueAt(row, 5).equals("VOID*")) {\r
try {\r
- jTextFieldMaxDatumSize.setText(ffc.setMaxSizeForPointer(model.getValueAt(row, 6)+"")+"");\r
+ jTextFieldMaxDatumSize.setText(ffc.setMaxSizeForPointer(newValue)+"");\r
}\r
catch (Exception exp) {\r
- JOptionPane.showMessageDialog(frame, "PCD Value MalFormed: " + exp.getMessage());\r
+ JOptionPane.showMessageDialog(FpdModuleSA.this, "PCD Value MalFormed: " + exp.getMessage());\r
return;\r
}\r
}\r
- model.setValueAt(jTextFieldMaxDatumSize.getText(), row, 4);\r
+ String newMaxDatumSize = jTextFieldMaxDatumSize.getText();\r
\r
- if (newItemType != oldItemType) {\r
+ if (!newItemType.equals(oldItemType)) {\r
Vector<ModuleIdentification> moduleInfo = new Vector<ModuleIdentification>();\r
try {\r
boolean changable = itemTypeCouldBeChanged (cName, tsGuid, newItemType, moduleInfo);\r
if (!changable) {\r
- JOptionPane.showMessageDialog(frame, "Can NOT Change Pcd Type in: " + moduleInfo.get(0).getName() + " contained in package " + moduleInfo.get(0).getPackageId().getName());\r
+ JOptionPane.showMessageDialog(FpdModuleSA.this, "Can NOT Change Pcd Type in: " + moduleInfo.get(0).getName() + " contained in package " + moduleInfo.get(0).getPackageId().getName());\r
return;\r
}\r
}\r
catch (Exception exp) {\r
- JOptionPane.showMessageDialog(frame, "Can NOT Change Pcd Type in: " + moduleInfo.get(0).getName() + " contained in package " + moduleInfo.get(0).getPackageId().getName() + " " + exp.getMessage());\r
+ JOptionPane.showMessageDialog(FpdModuleSA.this, "Can NOT Change Pcd Type in: " + moduleInfo.get(0).getName() + " contained in package " + moduleInfo.get(0).getPackageId().getName() + " " + exp.getMessage());\r
return;\r
}\r
\r
model.setValueAt(newItemType, row, 2);\r
}\r
\r
- ffc.updatePcdData(moduleKey, cName, tsGuid, model.getValueAt(row, 2)+"", model.getValueAt(row, 4)+"", model.getValueAt(row, 6)+"");\r
+ ffc.updatePcdData(moduleKey, cName, tsGuid, model.getValueAt(row, 2)+"", newMaxDatumSize, newValue);\r
docConsole.setSaved(false);\r
+ model.setValueAt(newValue, row, 6);\r
+ model.setValueAt(newMaxDatumSize, row, 4);\r
+ \r
}\r
});\r
}\r
\r
}\r
\r
+class ImproperInstanceException extends Exception {\r
+\r
+ /**\r
+ * \r
+ */\r
+ private static final long serialVersionUID = -5279700566993277033L;\r
+ private String className = null;\r
+ private String libInstance = null;\r
+ private String instanceSupArch = null;\r
+ private String instanceSupModType = null;\r
+ \r
+ ImproperInstanceException (String libClass, String instance1, String arch, String type) {\r
+ super();\r
+ className = libClass;\r
+ libInstance = instance1;\r
+ instanceSupArch = arch;\r
+ instanceSupModType = type;\r
+ }\r
+\r
+ /* (non-Javadoc)\r
+ * @see java.lang.Throwable#getMessage()\r
+ */\r
+ @Override\r
+ public String getMessage() {\r
+ // TODO Auto-generated method stub\r
+ return " Library Class " + className + " Produced by Library Instance: " \r
+ + libInstance + "\nOnly Supports " + instanceSupArch + " and Module Type " + instanceSupModType + ".\n This instance should be removed.\n";\r
+ }\r
+ \r
+}\r
+\r
class NoInstanceException extends Exception {\r
\r
/**\r
projects / mirror_edk2.git / blobdiff