svn commit: r13032 - trunk/src_new/org/argouml/uml/PredicateNotInTrash.java

Author: tfmorris
Date: 2007-07-10 11:08:01-0700
New Revision: 13032

Modified:
   trunk/src_new/org/argouml/uml/PredicateNotInTrash.java

Log:
Style cleanups

Modified: trunk/src_new/org/argouml/uml/PredicateNotInTrash.java
Url: http://argouml.tigris.org/source/browse/argouml/trunk/src_new/org/argouml/uml/PredicateNotInTrash.java?view=diff&rev=13032&p1=trunk/src_new/org/argouml/uml/PredicateNotInTrash.java&p2=trunk/src_new/org/argouml/uml/PredicateNotInTrash.java&r1=13031&r2=13032
==============================================================================
--- trunk/src_new/org/argouml/uml/PredicateNotInTrash.java	(original)
+++ trunk/src_new/org/argouml/uml/PredicateNotInTrash.java	2007-07-10 11:08:01-0700
@@ -27,7 +27,6 @@
  */
 package org.argouml.uml;
 
-import org.argouml.kernel.Project;
 import org.argouml.kernel.ProjectManager;
 import org.tigris.gef.util.Predicate;
 
@@ -37,16 +36,11 @@
  * which are already in the trash bin.
  **/
 public class PredicateNotInTrash implements Predicate {
-    private Project p;
-
     /*
      * @see org.tigris.gef.util.Predicate#predicate(java.lang.Object)
      */
     public boolean predicate(Object obj) {
-        p = ProjectManager.getManager().getCurrentProject();
-        if (p == null) return true;
-        if (p.isInTrash(obj)) return false;
-        return true;
+        return !ProjectManager.getManager().getCurrentProject().isInTrash(obj);
     }
 }