svn commit: r549152 - /felix/trunk/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java

[rickhall]

Author: rickhall
Date: Wed Jun 20 09:51:39 2007
New Revision: 549152

URL: http://svn.apache.org/viewvc?view=rev&rev=549152
Log:
Modified class to check for null in constructor and delegate toString()
to source map.

Modified:
    
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java

Modified: 
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
URL: 
http://svn.apache.org/viewvc/felix/trunk/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java?view=diff&rev=549152&r1=549151&r2=549152
==============================================================================
--- 
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
 (original)
+++ 
felix/trunk/framework/src/main/java/org/apache/felix/framework/util/MapToDictionary.java
 Wed Jun 20 09:51:39 2007
@@ -34,42 +34,30 @@
 
     public MapToDictionary(Map map)
     {
+        if (map == null)
+        {
+            throw new IllegalArgumentException("Source map cannot be null.");
+        }
         m_map = map;
     }
 
     public Enumeration elements()
     {
-        if (m_map == null)
-        {
-            return null;
-        }
         return new IteratorToEnumeration(m_map.values().iterator());
     }
 
     public Object get(Object key)
     {
-        if (m_map == null)
-        {
-            return null;
-        }
         return m_map.get(key);
     }
 
     public boolean isEmpty()
     {
-        if (m_map == null)
-        {
-            return true;
-        }
         return m_map.isEmpty();
     }
 
     public Enumeration keys()
     {
-        if (m_map == null)
-        {
-            return null;
-        }
         return new IteratorToEnumeration(m_map.keySet().iterator());
     }
 
@@ -85,10 +73,11 @@
 
     public int size()
     {
-        if (m_map == null)
-        {
-            return 0;
-        }
         return m_map.size();
+    }
+
+    public String toString()
+    {
+        return m_map.toString();
     }
 }