Mercurial > dive4elements > river
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 8854:7bbfb24e6eec | 8860:28df64078f27 |
|---|---|
| 150 return false; | 150 return false; |
| 151 } | 151 } |
| 152 ManagedFacet otherFacet = (ManagedFacet) other; | 152 ManagedFacet otherFacet = (ManagedFacet) other; |
| 153 return this.getVisible() == otherFacet.getVisible() && | 153 return this.getVisible() == otherFacet.getVisible() && |
| 154 this.getActive() == otherFacet.getActive() && | 154 this.getActive() == otherFacet.getActive() && |
| 155 CompareUtil.areSame(this.getArtifact(), otherFacet.getArtifact()) && | 155 CompareUtil.areSame( |
| 156 this.getArtifact(), otherFacet.getArtifact()) && | |
| 156 this.getIndex() == otherFacet.getIndex() && | 157 this.getIndex() == otherFacet.getIndex() && |
| 157 CompareUtil.areSame(this.getName(), otherFacet.getName()) && | 158 CompareUtil.areSame(this.getName(), otherFacet.getName()) && |
| 158 CompareUtil.areSame(this.getBoundToOut(), otherFacet.getBoundToOut()) && | 159 CompareUtil.areSame( |
| 159 CompareUtil.areSame(this.getDescription(), otherFacet.getDescription()); | 160 this.getBoundToOut(), otherFacet.getBoundToOut()) && |
| 161 CompareUtil.areSame( | |
| 162 this.getDescription(), otherFacet.getDescription()); | |
| 160 // Missing properties are blackboard, data, position. | 163 // Missing properties are blackboard, data, position. |
| 161 } | 164 } |
| 162 } | 165 } |
| 163 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 166 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |