Using EntityInfo messages AND EntityList messages to compute entity

names.

Author: zepinto

src/pt/lsts/imc/lsf/LsfIndex.java

@@ -46,6 +46,7 @@
 import java.util.Date;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
+import java.util.Map.Entry;
 import java.util.TimeZone;
 import java.util.Vector;
 
@@ -872,6 +873,33 @@ protected void loadEntities() {
 				defs.getResolver().setEntityName(src, einfo.getInteger("id"),
 						einfo.getString("label"));
 		}
+		
+		type = defs.getMessageId("EntityList");
+		for (int i = getFirstMessageOfType(type); i != -1; i = getNextMessageOfType(
+				type, i)) {
+			IMCMessage einfo = getMessage(i);
+
+			int src = einfo.getInteger("src");
+
+			if (!(systemEntityIds.containsKey(src))) {
+				systemEntityIds.put(src, new LinkedHashMap<String, Integer>());
+				systemEntityNames
+						.put(src, new LinkedHashMap<Integer, String>());
+			}
+			
+			LinkedHashMap<String, String> entities = einfo.getTupleList("list");
+			
+			for (Entry<String, String> entry : entities.entrySet()) {
+				systemEntityIds.get(src).put(entry.getKey(),
+						Integer.parseInt(entry.getValue()));
+				systemEntityNames.get(src).put(Integer.parseInt(entry.getValue()),
+						entry.getKey());
+			}
+			
+			if (defs != IMCDefinition.getInstance())
+				defs.getResolver().setEntityName(src, einfo.getInteger("id"),
+						einfo.getString("label"));
+		}
 	}
 
 	protected LinkedHashMap<Integer, LinkedHashMap<Integer, String>> systemEntityNames = null;