From 3ccb9dbc00746d31f08a907d190892d68273d4bf Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 16 Oct 2012 06:57:15 +0200 Subject: Reducing Type's equals --- src/java/com/jogamp/gluegen/cgram/types/Type.java | 32 ----------------------- 1 file changed, 32 deletions(-) (limited to 'src') diff --git a/src/java/com/jogamp/gluegen/cgram/types/Type.java b/src/java/com/jogamp/gluegen/cgram/types/Type.java index caa6d96..281f35c 100644 --- a/src/java/com/jogamp/gluegen/cgram/types/Type.java +++ b/src/java/com/jogamp/gluegen/cgram/types/Type.java @@ -196,40 +196,8 @@ public abstract class Type implements Cloneable { } final Type t = (Type)arg; - if ( size != t.size ) { - return false; - } - - if ( cvAttributes != t.cvAttributes ) { - return false; - } - - if ( null == name ) { - return null == t.name; - } else { - return name.equals(t.name); - } - - /* - * Orig: - * - return ( ( name == null ? t.name == null : name.equals(t.name) ) || - ( name != null && name.equals(name) ) - ) && size == t.size && cvAttributes == t.cvAttributes; - - Cleaned-1: - - return size == t.size && cvAttributes == t.cvAttributes && - ( ( name == null ? t.name == null : name.equals(t.name) ) || - ( name != null && name.equals(name) ) - ); - - Cleaned-2: - return size == t.size && cvAttributes == t.cvAttributes && ( null == name ? null == t.name : name.equals(t.name) ) ; - - */ } /** Returns a string representation of this type. This string is not -- cgit v1.2.3