Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Make simple equals symmetrical as well #40

Merged
merged 1 commit into from
Nov 22, 2015
Merged

Make simple equals symmetrical as well #40

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions basic/src/main/java/org/jvnet/jaxb2_commons/plugin/simpleequals/SimpleEqualsPlugin.java
View file
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@

import com.sun.codemodel.JBlock;
import com.sun.codemodel.JCodeModel;
import com.sun.codemodel.JConditional;
import com.sun.codemodel.JDefinedClass;
import com.sun.codemodel.JExpr;
import com.sun.codemodel.JExpression;
@@ -58,9 +57,12 @@ protected void generate(ClassOutline classOutline, JDefinedClass theClass) {
codeModel.BOOLEAN, "equals");
final JVar object = objectEquals.param(Object.class, "object");
final JBlock body = objectEquals.body();
final JConditional ifNotInstanceof = body._if(JOp.not(object
._instanceof(theClass)));
ifNotInstanceof._then()._return(JExpr.FALSE);

JExpression objectIsNull = object.eq(JExpr._null());
JExpression notTheSameType = JExpr._this().invoke("getClass").ne(object.invoke("getClass"));
body._if(JOp.cor(objectIsNull, notTheSameType))
._then()._return(JExpr.FALSE);

body._if(JExpr._this().eq(object))._then()._return(JExpr.TRUE);
final Boolean superClassNotIgnored = StrategyClassUtils
.superClassNotIgnored(classOutline, getIgnoring());