Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/ManagedFacet.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
author | gernotbelger |
---|---|
date | Fri, 19 Jan 2018 11:23:42 +0100 |
parents | 5e38e2924c07 |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ManagedFacet.java Thu Jan 18 18:34:41 2018 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/ManagedFacet.java Fri Jan 19 11:23:42 2018 +0100 @@ -152,11 +152,14 @@ ManagedFacet otherFacet = (ManagedFacet) other; return this.getVisible() == otherFacet.getVisible() && this.getActive() == otherFacet.getActive() && - CompareUtil.areSame(this.getArtifact(), otherFacet.getArtifact()) && + CompareUtil.areSame( + this.getArtifact(), otherFacet.getArtifact()) && this.getIndex() == otherFacet.getIndex() && CompareUtil.areSame(this.getName(), otherFacet.getName()) && - CompareUtil.areSame(this.getBoundToOut(), otherFacet.getBoundToOut()) && - CompareUtil.areSame(this.getDescription(), otherFacet.getDescription()); + CompareUtil.areSame( + this.getBoundToOut(), otherFacet.getBoundToOut()) && + CompareUtil.areSame( + this.getDescription(), otherFacet.getDescription()); // Missing properties are blackboard, data, position. } }