litesoft
Diff Revisions
49
vs
804
for /trunk/Java/core/jvm1.4/src/org/litesoft/ui/support/AttributeUsage.java
|
@@ -1,6 +1,7 @@ |
1 |
1 |
|
// This Source Code is in the Public Domain per: http://litesoft.org/License.txt |
2 |
2 |
|
package org.litesoft.ui.support; |
3 |
3 |
|
|
|
4 |
+ |
import org.litesoft.core.typeutils.*; |
4 |
5 |
|
import org.litesoft.core.util.*; |
5 |
6 |
|
import org.litesoft.ui.def.nonpublic.support.*; |
6 |
7 |
|
|
|
@@ -29,7 +30,7 @@ |
29 |
30 |
|
Hintable.Hint[] pHints ) |
30 |
31 |
|
{ |
31 |
32 |
|
super( pDisabled, pLabelID ); |
32 |
|
- |
UtilsCommon.assertNotNull( "UniqueID", mUniqueID = pUniqueID ); |
|
33 |
+ |
Objects.assertNotNull( "UniqueID", mUniqueID = pUniqueID ); |
33 |
34 |
|
mAttributeReference = UtilsCommon.assertNotNullNotEmpty( "AttributeReference", pAttributeReference ); |
34 |
35 |
|
mIntendedUse = pIntendedUse; |
35 |
36 |
|
mLabelLess = pLabelLess; |
|
@@ -163,12 +164,12 @@ |
163 |
164 |
|
|
164 |
165 |
|
protected boolean innerEquals( AttributeUsage pThem ) |
165 |
166 |
|
{ |
166 |
|
- |
return UtilsCommon.areNonArraysEqual( this.mUniqueID, pThem.mUniqueID ) && // |
167 |
|
- |
UtilsCommon.areNonArraysEqual( this.mAttributeReference, pThem.mAttributeReference ) && // |
168 |
|
- |
UtilsCommon.areNonArraysEqual( this.mIntendedUse, pThem.mIntendedUse ) && // |
|
167 |
+ |
return Objects.areNonArraysEqual( this.mUniqueID, pThem.mUniqueID ) && // |
|
168 |
+ |
Objects.areNonArraysEqual( this.mAttributeReference, pThem.mAttributeReference ) && // |
|
169 |
+ |
Objects.areNonArraysEqual( this.mIntendedUse, pThem.mIntendedUse ) && // |
169 |
170 |
|
UtilsCommon.areNonArraysEqual( this.isDisabled(), pThem.isDisabled() ) && // |
170 |
171 |
|
UtilsCommon.areNonArraysEqual( this.mLabelLess, pThem.mLabelLess ) && // |
171 |
|
- |
UtilsCommon.areNonArraysEqual( this.mRequired, pThem.mRequired ) && // |
|
172 |
+ |
Objects.areNonArraysEqual( this.mRequired, pThem.mRequired ) && // |
172 |
173 |
|
UtilsCommon.areArraysEqual( this.mHints, pThem.mHints ); |
173 |
174 |
|
} |
174 |
175 |
|
|