|
@@ -55,11 +55,11 @@ |
55 |
55 |
|
|
56 |
56 |
|
public static Object[] appendObjectArrays( Object[] pArray1, Object[] pArray2 ) |
57 |
57 |
|
{ |
58 |
|
- |
if ( UtilsCommon.isNullOrEmpty( pArray2 ) ) |
|
58 |
+ |
if ( isNullOrEmpty( pArray2 ) ) |
59 |
59 |
|
{ |
60 |
60 |
|
return pArray1; |
61 |
61 |
|
} |
62 |
|
- |
if ( UtilsCommon.isNullOrEmpty( pArray1 ) ) |
|
62 |
+ |
if ( isNullOrEmpty( pArray1 ) ) |
63 |
63 |
|
{ |
64 |
64 |
|
return pArray2; |
65 |
65 |
|
} |
|
@@ -78,4 +78,108 @@ |
78 |
78 |
|
{ |
79 |
79 |
|
return appendObjectArrays( pCurArray, new Object[]{pNewLast} ); |
80 |
80 |
|
} |
|
81 |
+ |
|
|
82 |
+ |
public static boolean isNotNullOrEmpty( Object[] pArrayToCheck ) |
|
83 |
+ |
{ |
|
84 |
+ |
return ((pArrayToCheck != null) && (pArrayToCheck.length != 0)); |
|
85 |
+ |
} |
|
86 |
+ |
|
|
87 |
+ |
public static boolean isNullOrEmpty( Object[] pArrayToCheck ) |
|
88 |
+ |
{ |
|
89 |
+ |
return ((pArrayToCheck == null) || (pArrayToCheck.length == 0)); |
|
90 |
+ |
} |
|
91 |
+ |
|
|
92 |
+ |
public static boolean areArraysEqual( Object[] pThis, Object[] pThat ) |
|
93 |
+ |
{ |
|
94 |
+ |
if ( pThis == pThat ) // handles if both are null |
|
95 |
+ |
{ |
|
96 |
+ |
return true; |
|
97 |
+ |
} |
|
98 |
+ |
if ( (pThis != null) && (pThat != null) && (pThis.length == pThat.length) ) |
|
99 |
+ |
{ |
|
100 |
+ |
for ( int i = pThis.length; --i >= 0; ) |
|
101 |
+ |
{ |
|
102 |
+ |
if ( !UtilsCommon.areEqual( pThis[i], pThat[i] ) ) |
|
103 |
+ |
{ |
|
104 |
+ |
return false; |
|
105 |
+ |
} |
|
106 |
+ |
} |
|
107 |
+ |
return true; |
|
108 |
+ |
} |
|
109 |
+ |
return false; |
|
110 |
+ |
} |
|
111 |
+ |
|
|
112 |
+ |
private static void assertElementsNotNull( String pErrorMessage, Object[] pArrayToAssert ) |
|
113 |
+ |
throws IllegalArgumentException |
|
114 |
+ |
{ |
|
115 |
+ |
for ( int i = pArrayToAssert.length; --i >= 0; ) |
|
116 |
+ |
{ |
|
117 |
+ |
if ( pArrayToAssert[i] == null ) |
|
118 |
+ |
{ |
|
119 |
+ |
Strings.errorNullOrEmpty( pErrorMessage, "Object[" + i + "]" ); |
|
120 |
+ |
} |
|
121 |
+ |
} |
|
122 |
+ |
} |
|
123 |
+ |
|
|
124 |
+ |
public static void assertNotNullAndElementsNotNull( String pErrorMessage, Object[] pArrayToAssert ) |
|
125 |
+ |
throws IllegalArgumentException |
|
126 |
+ |
{ |
|
127 |
+ |
if ( pArrayToAssert == null ) |
|
128 |
+ |
{ |
|
129 |
+ |
Strings.errorNullOrEmpty( pErrorMessage, "Object[]" ); |
|
130 |
+ |
} |
|
131 |
+ |
assertElementsNotNull( pErrorMessage, pArrayToAssert ); |
|
132 |
+ |
} |
|
133 |
+ |
|
|
134 |
+ |
public static void assertNotNullNotEmptyAndElementsNotNull( String pErrorMessage, Object[] pArrayToAssert ) |
|
135 |
+ |
throws IllegalArgumentException |
|
136 |
+ |
{ |
|
137 |
+ |
assertNotNullNotEmpty( pErrorMessage, pArrayToAssert ); |
|
138 |
+ |
assertElementsNotNull( pErrorMessage, pArrayToAssert ); |
|
139 |
+ |
} |
|
140 |
+ |
|
|
141 |
+ |
public static void assertNotNullNotEmpty( String pErrorMessage, Object[] pArrayToAssert ) |
|
142 |
+ |
throws IllegalArgumentException |
|
143 |
+ |
{ |
|
144 |
+ |
if ( isNullOrEmpty( pArrayToAssert ) ) |
|
145 |
+ |
{ |
|
146 |
+ |
Strings.errorNullOrEmpty( pErrorMessage, "Object[]" ); |
|
147 |
+ |
} |
|
148 |
+ |
} |
|
149 |
+ |
|
|
150 |
+ |
public static boolean isNotNull( Object pToCheck ) |
|
151 |
+ |
{ |
|
152 |
+ |
return (pToCheck != null); |
|
153 |
+ |
} |
|
154 |
+ |
|
|
155 |
+ |
public static int getNonNullEntryCount( Object[] pArrayToCheck ) |
|
156 |
+ |
{ |
|
157 |
+ |
int rv = 0; |
|
158 |
+ |
if ( pArrayToCheck != null ) |
|
159 |
+ |
{ |
|
160 |
+ |
for ( int i = pArrayToCheck.length; --i >= 0; ) |
|
161 |
+ |
{ |
|
162 |
+ |
if ( pArrayToCheck[i] != null ) |
|
163 |
+ |
{ |
|
164 |
+ |
rv++; |
|
165 |
+ |
} |
|
166 |
+ |
} |
|
167 |
+ |
} |
|
168 |
+ |
return rv; |
|
169 |
+ |
} |
|
170 |
+ |
|
|
171 |
+ |
public static boolean hasEntries( Object[] pArrayToCheck ) |
|
172 |
+ |
{ |
|
173 |
+ |
if ( pArrayToCheck != null ) |
|
174 |
+ |
{ |
|
175 |
+ |
for ( int i = pArrayToCheck.length; --i >= 0; ) |
|
176 |
+ |
{ |
|
177 |
+ |
if ( pArrayToCheck[i] != null ) |
|
178 |
+ |
{ |
|
179 |
+ |
return true; |
|
180 |
+ |
} |
|
181 |
+ |
} |
|
182 |
+ |
} |
|
183 |
+ |
return false; |
|
184 |
+ |
} |
81 |
185 |
|
} |