import java.util.HashMap;\r
import java.util.Iterator;\r
import java.util.ListIterator;\r
+import java.util.Set;\r
+import java.util.Stack;\r
import java.util.Vector;\r
\r
import javax.swing.JTextField;\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, errorMsg);\r
- } catch (Exception e) {\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
+ Vector<ModuleIdentification> newInstances = new Vector<ModuleIdentification>();\r
+ \r
+ addConsumedClassFromModule (key);\r
+ addProducedClassFromModule (key);\r
\r
int instanceCount = ffc.getLibraryInstancesCount(key);\r
if (instanceCount != 0) {\r
String[][] saa = new String[instanceCount][5];\r
ffc.getLibraryInstances(key, saa);\r
for (int i = 0; i < saa.length; ++i) {\r
- ModuleIdentification mi = WorkspaceProfile.getModuleId(saa[i][1] + " " + saa[i][2] + " " + saa[i][3]\r
- + " " + saa[i][4]);\r
+ String libInstanceKey = saa[i][1] + " " + saa[i][2] + " " + saa[i][3] + " " + saa[i][4];\r
+ ModuleIdentification mi = WorkspaceProfile.getModuleId(libInstanceKey);\r
if (mi != null) {\r
//\r
// ToDo: verify this instance first.\r
//\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], errorMsg);\r
- } catch (Exception e) {\r
- String exceptionMsg = e.getCause() + " " + e.getMessage();\r
- if (!errorMsg.contains(exceptionMsg)) {\r
- JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), e.getCause() + " " + e.getMessage());\r
- }\r
- }\r
+ addConsumedClassFromModule (libInstanceKey);\r
+ addProducedClassFromModule (libInstanceKey);\r
selectedInstancesTableModel.addRow(saa[i]);\r
}\r
}\r
}\r
-\r
+ \r
+ Set<LibraryClassDescriptor> sLcd = this.classConsumed.keySet();\r
+ Iterator<LibraryClassDescriptor> iter = sLcd.iterator(); \r
+ Stack<LibraryClassDescriptor> lcdStack = new Stack<LibraryClassDescriptor>();\r
+ while (iter.hasNext()) {\r
+ LibraryClassDescriptor lcd = iter.next();\r
+ if (isBoundedClass(lcd, errorMsg)) {\r
+ continue;\r
+ }\r
+ \r
+ if (!lcdStack.contains(lcd)) {\r
+ lcdStack.push(lcd);\r
+ }\r
+ }\r
+ \r
+ try {\r
+ resolveLibraryInstances(lcdStack, true, errorMsg, newInstances);\r
+ } catch (Exception e) {\r
+ String exceptionMsg = e.getCause() + " " + e.getMessage();\r
+ if (!errorMsg.contains(exceptionMsg)) {\r
+ JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), e.getCause() + " " + e.getMessage());\r
+ }\r
+ }\r
+ \r
+ String newInstancesAddedMsg = "Library instance automatically added to this module :\n";\r
+ for (int i = 0; i < newInstances.size(); ++i) {\r
+ ModuleIdentification libMi = newInstances.get(i);\r
+ newInstancesAddedMsg += libMi.getName();\r
+ newInstancesAddedMsg += " ";\r
+ }\r
+ if (newInstances.size() > 0) {\r
+ JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), newInstancesAddedMsg);\r
+ }\r
+ \r
+ showClassToResolved();\r
+ \r
if (errorMsg.size() > 0) {\r
String errors = "";\r
for (int i = 0; i < errorMsg.size(); ++i) {\r
}\r
JOptionPane.showMessageDialog(FrameworkWizardUI.getInstance(), errors);\r
}\r
- showClassToResolved();\r
}\r
\r
public void initFvInfo (String key) {\r
}\r
}\r
\r
- private void resolveLibraryInstances(String key, Vector<String> errorMsg) throws MultipleInstanceException, NoInstanceException{\r
+ private void addProducedClassFromModule (String key) {\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
- //\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
- }\r
-\r
- for (int i = 0; i < vClassConsumed.size(); ++i) {\r
- ArrayList<String> consumedBy = this.classConsumed.get(vClassConsumed.get(i));\r
- if (consumedBy == null) {\r
- consumedBy = new ArrayList<String>();\r
- }\r
- consumedBy.add(key);\r
- this.classConsumed.put(vClassConsumed.get(i), consumedBy);\r
- }\r
-\r
Vector<LibraryClassDescriptor> vClassProduced = SurfaceAreaQuery.getLibraryClasses("ALWAYS_PRODUCED", mi);\r
if (this.classProduced == null) {\r
this.classProduced = new HashMap<LibraryClassDescriptor, ArrayList<String>>();\r
this.classProduced.put(vClassProduced.get(i), producedBy);\r
\r
}\r
-\r
+ }\r
+ \r
+ private Vector<LibraryClassDescriptor> addConsumedClassFromModule (String key) {\r
+ ModuleIdentification mi = WorkspaceProfile.getModuleId(key);\r
+// PackageIdentification[] depPkgList = null;\r
+ \r
//\r
- // find potential instances in all pkgs for classes still in classConsumed.\r
+ // Get dependency pkg list into which we will search lib instances.\r
//\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
+ }\r
+\r
+ for (int i = 0; i < vClassConsumed.size(); ++i) {\r
+ ArrayList<String> consumedBy = this.classConsumed.get(vClassConsumed.get(i));\r
+ if (consumedBy == null) {\r
+ consumedBy = new ArrayList<String>();\r
+ }\r
+ consumedBy.add(key);\r
+ this.classConsumed.put(vClassConsumed.get(i), consumedBy);\r
+ }\r
+\r
+ return vClassConsumed;\r
+ }\r
+ \r
+ private void resolveLibraryInstances(Stack<LibraryClassDescriptor> lcdStack, boolean autoSelectSingleInstance, Vector<String> errorMsg, Vector<ModuleIdentification> newInstances) throws MultipleInstanceException, NoInstanceException{\r
+ \r
if (classInstanceMap == null) {\r
classInstanceMap = new HashMap<LibraryClassDescriptor, ArrayList<String>>();\r
- }\r
- Iterator<LibraryClassDescriptor> lic = this.classConsumed.keySet().iterator();\r
- while (lic.hasNext()) {\r
- LibraryClassDescriptor cls = lic.next();\r
+ } \r
+ while (!lcdStack.empty()) {\r
+ LibraryClassDescriptor cls = lcdStack.pop();\r
if (isBoundedClass(cls, errorMsg)) {\r
continue;\r
}\r
- ArrayList<String> instances = getInstancesForClass(cls, depPkgList);\r
+ ArrayList<String> instances = getInstancesForClass(cls, null);\r
if (instances.size() == 0) {\r
// throw new NoInstanceException (cls.className);\r
String exceptionMsg = new NoInstanceException (cls.className).getMessage();\r
\r
}\r
classInstanceMap.put(cls, instances);\r
-\r
+ if (instances.size() == 1 && autoSelectSingleInstance) {\r
+ String instanceInfo = instances.get(0);\r
+ ModuleIdentification libMi = WorkspaceProfile.getModuleId(instanceInfo);\r
+ try {\r
+ Object[] row = {libMi.getName(), libMi.getGuid(), libMi.getVersion(), \r
+ libMi.getPackageId().getGuid(), libMi.getPackageId().getVersion()};\r
+ if (!ffc.instanceExistsInModuleSA(moduleKey, row[1]+"", row[2]+"", row[3]+"", row[4]+"")) {\r
+ addLibInstance(libMi);\r
+ newInstances.add(libMi);\r
+ docConsole.setSaved(false);\r
+ selectedInstancesTableModel.addRow(row);\r
+ addProducedClassFromModule (instanceInfo);\r
+ Vector<LibraryClassDescriptor> vLcd = addConsumedClassFromModule(instanceInfo);\r
+ for (int i = 0; i < vLcd.size(); ++i) {\r
+ LibraryClassDescriptor lcd = vLcd.get(i);\r
+ if (!lcdStack.contains(lcd)) {\r
+ lcdStack.push(lcd);\r
+ }\r
+ }\r
+ }\r
+ }\r
+ catch (Exception e) {\r
+ if (!errorMsg.contains(e.getMessage())) {\r
+ errorMsg.add(e.getMessage());\r
+ }\r
+ }\r
+ }\r
}\r
-// showClassToResolved();\r
}\r
+// \r
\r
/**Search classProduced map to see if this class has been produced by some instance (module).\r
* @param cls\r
instancesName += " ";\r
}\r
String msg = new ImproperInstanceException(lcd.className, instancesName, lcd.supArchs, lcd.supModTypes).getMessage();\r
- errorMsg.add(msg);\r
+ if (!errorMsg.contains(msg)) {\r
+ errorMsg.add(msg);\r
+ }\r
}\r
}\r
}\r
\r
}\r
\r
- showClassToResolved();\r
- \r
}\r
\r
\r
if (classConsumed == null || classConsumed.size() == 0) {\r
return;\r
}\r
+\r
Iterator<LibraryClassDescriptor> li = classConsumed.keySet().iterator();\r
while(li.hasNext()){\r
LibraryClassDescriptor lcd = li.next();\r
- String[] s = {lcd.className, lcd.supArchs, lcd.supModTypes};\r
if (classConsumed.get(lcd) == null || classConsumed.get(lcd).size() == 0) {\r
continue;\r
}\r
\r
if (!isBoundedClass(lcd, errorMsg)){\r
+ \r
+ String[] s = { lcd.className, lcd.supArchs, lcd.supModTypes };\r
libClassTableModel.addRow(s);\r
}\r
}\r
- \r
+\r
if (errorMsg.size() > 0) {\r
String errors = "";\r
for (int i = 0; i < errorMsg.size(); ++i) {\r
return;\r
}\r
\r
- String instanceValue = libInstanceTableModel.getValueAt(row, 1) + " " +\r
+ String libInstanceKey = libInstanceTableModel.getValueAt(row, 1) + " " +\r
libInstanceTableModel.getValueAt(row, 2) + " " +\r
libInstanceTableModel.getValueAt(row, 3) + " " +\r
libInstanceTableModel.getValueAt(row, 4);\r
- ModuleIdentification libMi = WorkspaceProfile.getModuleId(instanceValue);\r
+ ModuleIdentification libMi = WorkspaceProfile.getModuleId(libInstanceKey);\r
try {\r
addLibInstance (libMi);\r
}\r
libInstanceTableModel.getValueAt(row, 4)};\r
selectedInstancesTableModel.addRow(s);\r
\r
+ Vector<LibraryClassDescriptor> vLcd = addConsumedClassFromModule (libInstanceKey);\r
+ addProducedClassFromModule (libInstanceKey);\r
+ \r
Vector<String> errorMsg = new Vector<String>();\r
+ Vector<ModuleIdentification> newInstances = new Vector<ModuleIdentification>();\r
+ Stack<LibraryClassDescriptor> lcdStack = new Stack<LibraryClassDescriptor>();\r
+ for (int i = 0; i < vLcd.size(); ++i) {\r
+ LibraryClassDescriptor lcd = vLcd.get(i);\r
+ if (!lcdStack.contains(lcd)) {\r
+ lcdStack.push(lcd);\r
+ }\r
+ }\r
try {\r
- resolveLibraryInstances(instanceValue, errorMsg);\r
+ resolveLibraryInstances(lcdStack, true, errorMsg, newInstances);\r
}\r
catch (Exception exp) {\r
JOptionPane.showMessageDialog(FpdModuleSA.this, exp.getMessage());\r
}\r
\r
+ showClassToResolved();\r
+ \r
if (errorMsg.size() > 0) {\r
String errors = "";\r
for (int i = 0; i < errorMsg.size(); ++i) {\r
}\r
JOptionPane.showMessageDialog(FpdModuleSA.this, errors);\r
}\r
- showClassToResolved();\r
}\r
});\r
}\r
selectedInstancesTableModel.getValueAt(row, 4));\r
ffc.removeLibraryInstance(moduleKey, row);\r
selectedInstancesTableModel.removeRow(row);\r
- \r
+ showClassToResolved();\r
}\r
});\r
}\r
//\r
oldFvList.removeAll(newFvList);\r
for (int j = 0; j < oldFvList.size(); ++j) {\r
- ffc.removeModuleInBuildOptionsUserExtensions(oldFvList.get(j), "IMAGES", 1, 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), "IMAGES", 1, 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
projects / mirror_edk2.git / blobdiff