make compareTo() consistent with equals()

pull/15/head
Mahmoud Ben Hassine 10 years ago
parent bf56663a19
commit e43290f215

@ -28,7 +28,13 @@ class ActionMethodOrderBean implements Comparable<ActionMethodOrderBean> {
@Override
public int compareTo(ActionMethodOrderBean actionMethodOrderBean) {
return new Integer(order).compareTo(actionMethodOrderBean.getOrder());
if (order < actionMethodOrderBean.getOrder()) {
return -1;
} else if (order > actionMethodOrderBean.getOrder()) {
return 1;
} else {
return method.equals(actionMethodOrderBean.getMethod()) ? 0 : 1;
}
}
@Override

@ -26,7 +26,13 @@ class RulePriorityBean implements Comparable<RulePriorityBean> {
@Override
public int compareTo(RulePriorityBean ruleBean) {
return new Integer(priority).compareTo(ruleBean.getPriority());
if (priority < ruleBean.getPriority()) {
return -1;
} else if (priority > ruleBean.getPriority()) {
return 1;
} else {
return rule.equals(ruleBean.getRule()) ? 0 : 1;
}
}
@Override

Loading…
Cancel
Save