litesoft
Diff Revisions
821
vs
822
for /trunk/Java/GWT/Client/src/org/litesoft/GWT/client/widgets/nonpublic/InjectionPointSelectorController.java
|
@@ -7,7 +7,6 @@ |
7 |
7 |
|
import org.litesoft.core.typeutils.*; |
8 |
8 |
|
|
9 |
9 |
|
import static org.litesoft.core.simpletypes.nonpublic.EqualSupport.calcHashCode; |
10 |
|
- |
import static org.litesoft.core.util.UtilsCommon.*; |
11 |
10 |
|
import static org.litesoft.core.util.UtilsCommon.hashCodeEm; |
12 |
11 |
|
|
13 |
12 |
|
public class InjectionPointSelectorController<T extends Synopsisable> |
|
@@ -75,9 +74,9 @@ |
75 |
74 |
|
return false; |
76 |
75 |
|
} |
77 |
76 |
|
ViewEntry them = (ViewEntry) o; |
78 |
|
- |
return areEqual( this.getText(), them.getText() ) && // |
79 |
|
- |
areEqual( this.getUpperReference(), them.getUpperReference() ) && // |
80 |
|
- |
areEqual( this.getLowerReference(), them.getLowerReference() ); |
|
77 |
+ |
return Objects.areEqual( this.getText(), them.getText() ) && // |
|
78 |
+ |
Objects.areEqual( this.getUpperReference(), them.getUpperReference() ) && // |
|
79 |
+ |
Objects.areEqual( this.getLowerReference(), them.getLowerReference() ); |
81 |
80 |
|
} |
82 |
81 |
|
|
83 |
82 |
|
@Override |
|
@@ -126,7 +125,7 @@ |
126 |
125 |
|
return false; |
127 |
126 |
|
} |
128 |
127 |
|
ViewSet them = (ViewSet) o; |
129 |
|
- |
return areEqual( this.mEntries, them.mEntries ); |
|
128 |
+ |
return Objects.areEqual( this.mEntries, them.mEntries ); |
130 |
129 |
|
} |
131 |
130 |
|
|
132 |
131 |
|
@Override |
|
@@ -206,9 +205,9 @@ |
206 |
205 |
|
} |
207 |
206 |
|
DrillDownSet them = (DrillDownSet) o; |
208 |
207 |
|
return (this.mSomethingBetweenHomeAndPreviousSets == them.mSomethingBetweenHomeAndPreviousSets) && // |
209 |
|
- |
areEqual( this.mHomeSet, them.mHomeSet ) && // |
210 |
|
- |
areEqual( this.mPreviousSet, them.mPreviousSet ) && // |
211 |
|
- |
areEqual( this.mCurrentSet, them.mCurrentSet ); |
|
208 |
+ |
Objects.areEqual( this.mHomeSet, them.mHomeSet ) && // |
|
209 |
+ |
Objects.areEqual( this.mPreviousSet, them.mPreviousSet ) && // |
|
210 |
+ |
Objects.areEqual( this.mCurrentSet, them.mCurrentSet ); |
212 |
211 |
|
} |
213 |
212 |
|
|
214 |
213 |
|
@Override |