| |
@@ -113,7 +113,7 @@ |
| 113 |
113 |
|
public UiFont family( String pFamily ) |
| 114 |
114 |
|
{ |
| 115 |
115 |
|
pFamily = parseFamily( pFamily ); |
| 116 |
|
- |
return UtilsCommon.areNonArraysEqual( mFamily, pFamily ) ? this : new UiFont( pFamily, mColor, mSize, mStyle, mWeight, mDecoration ); |
| |
116 |
+ |
return Objects.areNonArraysEqual( mFamily, pFamily ) ? this : new UiFont( pFamily, mColor, mSize, mStyle, mWeight, mDecoration ); |
| 117 |
117 |
|
} |
| 118 |
118 |
|
|
| 119 |
119 |
|
private String parseFamily( String pStr ) |
| |
@@ -157,7 +157,7 @@ |
| 157 |
157 |
|
public UiFont color( String pColor ) |
| 158 |
158 |
|
{ |
| 159 |
159 |
|
pColor = parseColor( pColor ); |
| 160 |
|
- |
return UtilsCommon.areNonArraysEqual( mColor, pColor ) ? this : new UiFont( mFamily, pColor, mSize, mStyle, mWeight, mDecoration ); |
| |
160 |
+ |
return Objects.areNonArraysEqual( mColor, pColor ) ? this : new UiFont( mFamily, pColor, mSize, mStyle, mWeight, mDecoration ); |
| 161 |
161 |
|
} |
| 162 |
162 |
|
|
| 163 |
163 |
|
private String parseColor( String pStr ) |
| |
@@ -217,7 +217,7 @@ |
| 217 |
217 |
|
public UiFont size( String pSize ) |
| 218 |
218 |
|
{ |
| 219 |
219 |
|
pSize = parseSize( pSize ); |
| 220 |
|
- |
return UtilsCommon.areNonArraysEqual( mSize, pSize ) ? this : new UiFont( mFamily, mColor, pSize, mStyle, mWeight, mDecoration ); |
| |
220 |
+ |
return Objects.areNonArraysEqual( mSize, pSize ) ? this : new UiFont( mFamily, mColor, pSize, mStyle, mWeight, mDecoration ); |
| 221 |
221 |
|
} |
| 222 |
222 |
|
|
| 223 |
223 |
|
private String parseSize( String pStr ) |
| |
@@ -245,7 +245,7 @@ |
| 245 |
245 |
|
public UiFont style( String pStyle ) |
| 246 |
246 |
|
{ |
| 247 |
247 |
|
pStyle = parseStyle( pStyle ); |
| 248 |
|
- |
return UtilsCommon.areNonArraysEqual( mStyle, pStyle ) ? this : new UiFont( mFamily, mColor, mSize, pStyle, mWeight, mDecoration ); |
| |
248 |
+ |
return Objects.areNonArraysEqual( mStyle, pStyle ) ? this : new UiFont( mFamily, mColor, mSize, pStyle, mWeight, mDecoration ); |
| 249 |
249 |
|
} |
| 250 |
250 |
|
|
| 251 |
251 |
|
private String parseStyle( String pStr ) |
| |
@@ -316,7 +316,7 @@ |
| 316 |
316 |
|
public UiFont weight( String pWeight ) |
| 317 |
317 |
|
{ |
| 318 |
318 |
|
pWeight = parseWeight( pWeight ); |
| 319 |
|
- |
return UtilsCommon.areNonArraysEqual( mWeight, pWeight ) ? this : new UiFont( mFamily, mColor, mSize, mStyle, pWeight, mDecoration ); |
| |
319 |
+ |
return Objects.areNonArraysEqual( mWeight, pWeight ) ? this : new UiFont( mFamily, mColor, mSize, mStyle, pWeight, mDecoration ); |
| 320 |
320 |
|
} |
| 321 |
321 |
|
|
| 322 |
322 |
|
private String parseWeight( String pStr ) |
| |
@@ -342,7 +342,7 @@ |
| 342 |
342 |
|
public UiFont decoration( String pDecoration ) |
| 343 |
343 |
|
{ |
| 344 |
344 |
|
pDecoration = parseDecoration( pDecoration ); |
| 345 |
|
- |
return UtilsCommon.areNonArraysEqual( mDecoration, pDecoration ) ? this : new UiFont( mFamily, mColor, mSize, mStyle, mWeight, pDecoration ); |
| |
345 |
+ |
return Objects.areNonArraysEqual( mDecoration, pDecoration ) ? this : new UiFont( mFamily, mColor, mSize, mStyle, mWeight, pDecoration ); |
| 346 |
346 |
|
} |
| 347 |
347 |
|
|
| 348 |
348 |
|
private String parseDecoration( String pStr ) |
View this file contents
View the full history
Commits for