From: <aki...@us...> - 2013-05-24 20:40:02
|
Revision: 9223 http://sourceforge.net/p/gridarta/code/9223 Author: akirschbaum Date: 2013-05-24 20:39:59 +0000 (Fri, 24 May 2013) Log Message: ----------- Simplify code. Modified Paths: -------------- trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java Modified: trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java =================================================================== --- trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java 2013-05-24 20:38:21 UTC (rev 9222) +++ trunk/model/src/app/net/sf/gridarta/model/archetypetype/ArchetypeType.java 2013-05-24 20:39:59 UTC (rev 9223) @@ -231,11 +231,7 @@ * @return whether the base object matches */ public boolean matches(@NotNull final BaseObject<?, ?, ?, ?> baseObject) { - if (typeNo != baseObject.getTypeNo()) { - return false; - } - - return typeAttributes.matches(baseObject); + return typeNo == baseObject.getTypeNo() && typeAttributes.matches(baseObject); } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |