Mentions légales du service

Skip to content
Snippets Groups Projects
Commit dcd7463d authored by Jérôme Euzenat's avatar Jérôme Euzenat
Browse files

- systematic check for equals/hashCode (no problem)

- suppressed useless @overrides
parent 1ee89bfd
No related branches found
No related tags found
No related merge requests found
...@@ -203,7 +203,7 @@ public class BasicRelation implements Relation { ...@@ -203,7 +203,7 @@ public class BasicRelation implements Relation {
} }
/** Are the two relations equal **/ /** Are the two relations equal **/
@Override public boolean equals( Object o ) { public boolean equals( Object o ) {
if ( o == this ) return true; if ( o == this ) return true;
if ( o == null ) return false; if ( o == null ) return false;
if ( o instanceof Relation ) return equals( (Relation)o ); if ( o instanceof Relation ) return equals( (Relation)o );
...@@ -217,7 +217,7 @@ public class BasicRelation implements Relation { ...@@ -217,7 +217,7 @@ public class BasicRelation implements Relation {
return ( relation.equals( r.getRelation() ) ); return ( relation.equals( r.getRelation() ) );
} }
@Override public int hashCode() { public int hashCode() {
return 19+relation.hashCode(); return 19+relation.hashCode();
} }
......
...@@ -148,7 +148,7 @@ public abstract class BitSetDisjunctiveRelation<T extends BaseRelation> extends ...@@ -148,7 +148,7 @@ public abstract class BitSetDisjunctiveRelation<T extends BaseRelation> extends
} }
/** Are the two relations equal **/ /** Are the two relations equal **/
@Override public boolean equals ( Object o ) { public boolean equals ( Object o ) {
if ( o == this ) return true; if ( o == this ) return true;
if ( o == null ) return false; if ( o == null ) return false;
if ( o instanceof Relation ) return equals( ((Relation)o) ); if ( o instanceof Relation ) return equals( ((Relation)o) );
...@@ -156,7 +156,7 @@ public abstract class BitSetDisjunctiveRelation<T extends BaseRelation> extends ...@@ -156,7 +156,7 @@ public abstract class BitSetDisjunctiveRelation<T extends BaseRelation> extends
} }
// V5: This should be suppressed (code moved in the object method) // V5: This should be suppressed (code moved in the object method)
@Override public boolean equals ( Relation r ) { public boolean equals ( Relation r ) {
if ( r == this ) return true; if ( r == this ) return true;
if ( r == null ) return false; if ( r == null ) return false;
if ( r instanceof BitSetDisjunctiveRelation ) { if ( r instanceof BitSetDisjunctiveRelation ) {
...@@ -164,7 +164,7 @@ public abstract class BitSetDisjunctiveRelation<T extends BaseRelation> extends ...@@ -164,7 +164,7 @@ public abstract class BitSetDisjunctiveRelation<T extends BaseRelation> extends
} else return false; } else return false;
} }
@Override public int hashCode() { public int hashCode() {
return 3221+relset.hashCode(); return 3221+relset.hashCode();
} }
......
...@@ -69,7 +69,7 @@ public interface Cell extends Comparable<Cell>, Visitable { ...@@ -69,7 +69,7 @@ public interface Cell extends Comparable<Cell>, Visitable {
public void setRelation( Relation r ); public void setRelation( Relation r );
public double getStrength(); public double getStrength();
public void setStrength( double m ); public void setStrength( double m );
// V5: This is a bad choice to have introduced this here // V5: This is a bad choice to have introduced this here: must be deprecated
public boolean equals( Cell c ); public boolean equals( Cell c );
/** /**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment