svn commit: r13714 - trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java

Author: penyaskito
Date: 2007-11-04 00:05:25-0700
New Revision: 13714

Modified:
   trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java

Log:
Improved debug info. See issue #4893.

Modified: trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java?view=diff&rev=13714&p1=trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java&p2=trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java&r1=13713&r2=13714
==============================================================================
--- trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java	(original)
+++ trunk/src/model-euml/src/org/argouml/model/euml/ModelEventPumpEUMLImpl.java	2007-11-04 00:05:25-0700
@@ -35,6 +35,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashMap;
+import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -476,18 +477,37 @@
         for (Iterator it = registerForElements.entrySet().iterator(); 
                 it.hasNext(); ) {
             Map.Entry entry = (Map.Entry) it.next();
+
             String item = entry.getKey().toString();
             List modelElementNode = newDebugNode(item);
             info.add(modelElementNode);
             List listenerList = (List) entry.getValue();
+            
+            Map<String, List<String>> map = new HashMap<String, List<String>>();
+            
             for (Iterator listIt = listenerList.iterator(); 
                     listIt.hasNext();) {
                 Listener listener = (Listener)listIt.next();
-                List listenerNode =
-                    newDebugNode(
-                            listener.getListener().getClass().getName());
-                modelElementNode.add(listenerNode);
+
+                if (listener.getProperties() != null){
+                    for (String eventName : listener.getProperties()){
+                        if (!map.containsKey(eventName)){
+                            map.put(eventName, new LinkedList<String>());
+                        }
+                        map.get(eventName).add(listener.getListener().getClass().getName());
+                    }
+                }
+                else {
+                    if (!map.containsKey("")){
+                        map.put("", new LinkedList<String>());
+                    }
+                    map.get("").add(listener.getListener().getClass().getName());
+                }                
             }
+            for (Map.Entry o : map.entrySet()) {
+                modelElementNode.add((String)o.getKey());    
+                modelElementNode.add((List<String>)o.getValue());
+            }                        
         }
         return info;
     }