\r
import java.awt.*;\r
import java.awt.event.*;\r
+import java.util.Map;\r
\r
import javax.swing.*;\r
import javax.swing.tree.DefaultMutableTreeNode;\r
public JTree initializeTree() {\r
Token[] tokenArray = null;\r
Token token = null;\r
- DefaultMutableTreeNode root = new DefaultMutableTreeNode(dbManager.getLogFileName());\r
+ DefaultMutableTreeNode root = new DefaultMutableTreeNode("PCDTreeRoot");\r
DefaultMutableTreeNode rootByPCD = new DefaultMutableTreeNode("By PCD");\r
DefaultMutableTreeNode rootByModule = new DefaultMutableTreeNode("By Module");\r
DefaultMutableTreeNode tokenNode = null;\r
int index = 0; \r
int usageIndex = 0;\r
int moduleIndex = 0;\r
+ Object[] objectArray = null;\r
java.util.List<UsageInstance> usageArray = null;\r
UsageInstance usageInstance = null;\r
\r
ActionMessage.debug(this, token.cName);\r
tokenNode = new DefaultMutableTreeNode(token.cName);\r
tokenNode.add(new DefaultMutableTreeNode(String.format("TOKEN NUMBER: 0x%08x", token.tokenNumber)));\r
- tokenNode.add(new DefaultMutableTreeNode(String.format("ASSIGNED TOKEN NUMBER: 0x%08x", token.assignedtokenNumber)));\r
tokenNode.add(new DefaultMutableTreeNode("TOKEN SPACE NAME: " + token.tokenSpaceName.toString()));\r
- tokenNode.add(new DefaultMutableTreeNode("ASSIGNED TOKEN SPACE NAME: " + token.assignedtokenSpaceName.toString()));\r
tokenNode.add(new DefaultMutableTreeNode("PCD TYPE: " + Token.getStringOfpcdType(token.pcdType)));\r
tokenNode.add(new DefaultMutableTreeNode("DATUM TYPE: " +Token.getStringOfdatumType(token.datumType)));\r
tokenNode.add(new DefaultMutableTreeNode("DATUM: " + token.datum.toString()));\r
tokenNode.add(new DefaultMutableTreeNode("HIIENABLE: " +(token.hiiEnabled?"true":"false")));\r
tokenNode.add(new DefaultMutableTreeNode("VARIABLE NAME: " + token.variableName));\r
- tokenNode.add(new DefaultMutableTreeNode("VARIABLE GUID: " + token.variableGuid.toString()));\r
+ //tokenNode.add(new DefaultMutableTreeNode("VARIABLE GUID: " + token.variableGuid.toString()));\r
tokenNode.add(new DefaultMutableTreeNode("SKUENABLE: " +(token.skuEnabled?"true":"false")));\r
- tokenNode.add(new DefaultMutableTreeNode("SKUDATA ARRAY ENABLE: " +(token.skuDataArrayEnabled?"true":"false")));\r
tokenNode.add(new DefaultMutableTreeNode(String.format("SKUID: %d", token.skuId)));\r
tokenNode.add(new DefaultMutableTreeNode(String.format("MAX SKU COUNT: %d", token.maxSkuCount)));\r
tokenNode.add(new DefaultMutableTreeNode("VPDENABLE: " +(token.vpdEnabled?"true":"false")));\r
usageNode = new DefaultMutableTreeNode("PRODUCER");\r
tokenNode.add(usageNode);\r
\r
- //\r
- // Prepare producer's leaf node\r
- //\r
-\r
- for (usageIndex = 0; usageIndex < token.producers.size(); usageIndex ++) {\r
- usageNode.add(new DefaultMutableTreeNode(token.producers.get(usageIndex).moduleName));\r
- }\r
\r
//\r
// Prepare consumer's leaf node\r
//\r
usageNode = new DefaultMutableTreeNode("CONSUMER");\r
tokenNode.add(usageNode);\r
-\r
+ objectArray = token.consumers.entrySet().toArray();\r
for (usageIndex = 0; usageIndex < token.consumers.size(); usageIndex ++) {\r
- usageNode.add(new DefaultMutableTreeNode(token.consumers.get(usageIndex).moduleName));\r
+ usageInstance = (UsageInstance) ((Map.Entry)objectArray[usageIndex]).getValue();\r
+ usageNode.add(new DefaultMutableTreeNode(usageInstance.getPrimaryKey()));\r
}\r
\r
rootByPCD.add(tokenNode);\r
}\r
for (moduleIndex = 0; moduleIndex < moduleNames.size(); moduleIndex ++) {\r
moduleNode = new DefaultMutableTreeNode(moduleNames.get(moduleIndex));\r
- usageArray = dbManager.getUsageInstanceArrayByModuleName(moduleNames.get(moduleIndex));\r
+ usageArray = dbManager.getUsageInstanceArrayByKeyString(moduleNames.get(moduleIndex));\r
for (usageIndex = 0; usageIndex < usageArray.size(); usageIndex ++) {\r
usageInstance = usageArray.get(usageIndex);\r
usageNode = new DefaultMutableTreeNode(usageInstance.parentToken.cName);\r
usageNode.add(new DefaultMutableTreeNode("MODULE PCD TYPE: " + Token.getStringOfpcdType(usageInstance.modulePcdType)));\r
- usageNode.add(new DefaultMutableTreeNode("HELP TEXT: " + usageInstance.helpTextInMSA));\r
- usageNode.add(new DefaultMutableTreeNode("IS INHERIT: " +(usageInstance.isInherit?"true":"false")));\r
- usageNode.add(new DefaultMutableTreeNode("USAGE: " + Token.getStringOfUsage(usageInstance.usage)));\r
moduleNode.add(usageNode);\r
}\r
rootByModule.add(moduleNode);\r