svn commit: r12669 - trunk/src_new/org/argouml/ui/explorer/rules

Author: tfmorris
Date: 2007-05-26 12:02:43-0700
New Revision: 12669

Modified:
   trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java
   trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java

Log:
Return an empty collection instead of null so caller doesn't have to check for null

Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java?view=diff&rev=12669&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java&r1=12668&r2=12669
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java	(original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoDiagramToEdge.java	2007-05-26 12:02:43-0700
@@ -25,6 +25,7 @@
 package org.argouml.ui.explorer.rules;
 
 import java.util.Collection;
+import java.util.Collections;
 import java.util.Set;
 
 import org.argouml.i18n.Translator;
@@ -58,6 +59,6 @@
      */
     public Set getDependencies(Object parent) {
         // TODO: What?
-	return null;
+	return Collections.EMPTY_SET;
     }
 }

Modified: trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java?view=diff&rev=12669&p1=trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java&p2=trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java&r1=12668&r2=12669
==============================================================================
--- trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java	(original)
+++ trunk/src_new/org/argouml/ui/explorer/rules/GoNamespaceToOwnedElements.java	2007-05-26 12:02:43-0700
@@ -26,6 +26,7 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Set;
@@ -54,7 +55,7 @@
     public Collection getChildren(Object parent) {
 
         if (!Model.getFacade().isANamespace(parent)) {
-            return null;
+            return Collections.EMPTY_LIST;
         }
         Collection ownedElements = Model.getFacade().getOwnedElements(parent);
         Iterator it = ownedElements.iterator();