| |
@@ -41,8 +41,7 @@ |
| 41 |
41 |
|
abstract public ServerStateChangeSet createListFrom( ServerStateChangeSet pAllChanges_Immutable ); |
| 42 |
42 |
|
} |
| 43 |
43 |
|
|
| 44 |
|
- |
private Map<ServerStateChangedListener, InterestHelper> mListenersToHelpers = |
| 45 |
|
- |
new HashMap<ServerStateChangedListener, InterestHelper>(); |
| |
44 |
+ |
private Map<ServerStateChangedListener, InterestHelper> mListenersToHelpers = new HashMap<ServerStateChangedListener, InterestHelper>(); |
| 46 |
45 |
|
private InterestHelper[] mHelpers = null; |
| 47 |
46 |
|
|
| 48 |
47 |
|
public synchronized void clearAllListeners() |
| |
@@ -108,8 +107,7 @@ |
| 108 |
107 |
|
/** |
| 109 |
108 |
|
* @param pName - normally just Object Class Name (getClass().getName()) |
| 110 |
109 |
|
*/ |
| 111 |
|
- |
public void addLocalListener( ServerStateChangedListener pListener, String pName, |
| 112 |
|
- |
Serializable... pUniqueKeys ) |
| |
110 |
+ |
public void addLocalListener( ServerStateChangedListener pListener, String pName, Serializable... pUniqueKeys ) |
| 113 |
111 |
|
{ |
| 114 |
112 |
|
if ( Utils.areNotNull( pListener, pName, pUniqueKeys ) ) |
| 115 |
113 |
|
{ |
| |
@@ -145,8 +143,7 @@ |
| 145 |
143 |
|
} |
| 146 |
144 |
|
} |
| 147 |
145 |
|
|
| 148 |
|
- |
private Set<ServerStateChangedListener> mRemoteListeners = |
| 149 |
|
- |
new CopyOnWriteArraySet<ServerStateChangedListener>(); |
| |
146 |
+ |
private Set<ServerStateChangedListener> mRemoteListeners = new CopyOnWriteArraySet<ServerStateChangedListener>(); |
| 150 |
147 |
|
|
| 151 |
148 |
|
/** |
| 152 |
149 |
|
* @param pChange Not Null or Empty & is Immutable! |
| |
@@ -239,8 +236,7 @@ |
| 239 |
236 |
|
|
| 240 |
237 |
|
private static class FilteringInterestHelper extends InterestHelper |
| 241 |
238 |
|
{ |
| 242 |
|
- |
public FilteringInterestHelper( ServerStateChangedListener pListener, InterestHelper pHelper, |
| 243 |
|
- |
String[] pNames ) |
| |
239 |
+ |
public FilteringInterestHelper( ServerStateChangedListener pListener, InterestHelper pHelper, String[] pNames ) |
| 244 |
240 |
|
{ |
| 245 |
241 |
|
super( pListener ); |
| 246 |
242 |
|
for ( String zName : pNames ) |
| |
@@ -252,8 +248,7 @@ |
| 252 |
248 |
|
} |
| 253 |
249 |
|
if ( pHelper != null ) |
| 254 |
250 |
|
{ |
| 255 |
|
- |
Collection<KeyInterestHelper> oldHelpers = |
| 256 |
|
- |
((FilteringInterestHelper) pHelper).mNamesToKeyInterestHelpers.values(); |
| |
251 |
+ |
Collection<KeyInterestHelper> oldHelpers = ((FilteringInterestHelper) pHelper).mNamesToKeyInterestHelpers.values(); |
| 257 |
252 |
|
for ( KeyInterestHelper helper : oldHelpers ) |
| 258 |
253 |
|
{ |
| 259 |
254 |
|
String key = helper.getClassName(); |
| |
@@ -265,16 +260,14 @@ |
| 265 |
260 |
|
} |
| 266 |
261 |
|
} |
| 267 |
262 |
|
|
| 268 |
|
- |
public FilteringInterestHelper( ServerStateChangedListener pListener, InterestHelper pHelper, |
| 269 |
|
- |
String pName, Serializable[] pUniqueKeys ) |
| |
263 |
+ |
public FilteringInterestHelper( ServerStateChangedListener pListener, InterestHelper pHelper, String pName, Serializable[] pUniqueKeys ) |
| 270 |
264 |
|
{ |
| 271 |
265 |
|
super( pListener ); |
| 272 |
266 |
|
FilteringKeyInterestHelper newHelper = new FilteringKeyInterestHelper( pName, pUniqueKeys ); |
| 273 |
267 |
|
mNamesToKeyInterestHelpers.put( pName, newHelper ); |
| 274 |
268 |
|
if ( pHelper != null ) |
| 275 |
269 |
|
{ |
| 276 |
|
- |
Collection<KeyInterestHelper> oldHelpers = |
| 277 |
|
- |
((FilteringInterestHelper) pHelper).mNamesToKeyInterestHelpers.values(); |
| |
270 |
+ |
Collection<KeyInterestHelper> oldHelpers = ((FilteringInterestHelper) pHelper).mNamesToKeyInterestHelpers.values(); |
| 278 |
271 |
|
for ( KeyInterestHelper helper : oldHelpers ) |
| 279 |
272 |
|
{ |
| 280 |
273 |
|
String key = helper.getClassName(); |
| |
@@ -290,15 +283,13 @@ |
| 290 |
283 |
|
} |
| 291 |
284 |
|
} |
| 292 |
285 |
|
|
| 293 |
|
- |
private Map<String, KeyInterestHelper> mNamesToKeyInterestHelpers = |
| 294 |
|
- |
new HashMap<String, KeyInterestHelper>(); |
| |
286 |
+ |
private Map<String, KeyInterestHelper> mNamesToKeyInterestHelpers = new HashMap<String, KeyInterestHelper>(); |
| 295 |
287 |
|
|
| 296 |
288 |
|
@Override |
| 297 |
289 |
|
public String toString() |
| 298 |
290 |
|
{ |
| 299 |
291 |
|
StringBuilder sb = new StringBuilder( "Only: " ); |
| 300 |
|
- |
String[] keys = mNamesToKeyInterestHelpers.keySet().toArray( |
| 301 |
|
- |
new String[mNamesToKeyInterestHelpers.size()] ); |
| |
292 |
+ |
String[] keys = mNamesToKeyInterestHelpers.keySet().toArray( new String[mNamesToKeyInterestHelpers.size()] ); |
| 302 |
293 |
|
Arrays.sort( keys ); |
| 303 |
294 |
|
sb.append( mNamesToKeyInterestHelpers.get( keys[0] ) ); |
| 304 |
295 |
|
for ( int i = 1; i < keys.length; i++ ) |
| |
@@ -310,8 +301,7 @@ |
| 310 |
301 |
|
|
| 311 |
302 |
|
private boolean isInterestedIn( ServerStateChange pChange ) |
| 312 |
303 |
|
{ |
| 313 |
|
- |
return (pChange != null) && |
| 314 |
|
- |
isInterestedIn( pChange.getChangedObjectTypeName(), pChange.getChangedObjectUniqueKey() ); |
| |
304 |
+ |
return (pChange != null) && isInterestedIn( pChange.getChangedObjectTypeName(), pChange.getChangedObjectUniqueKey() ); |
| 315 |
305 |
|
} |
| 316 |
306 |
|
|
| 317 |
307 |
|
private boolean isInterestedIn( String pName, Serializable pUniqueKey ) |
| |
@@ -365,8 +355,7 @@ |
| 365 |
355 |
|
} |
| 366 |
356 |
|
z1stNotOfInterest = zAllChanges_Immutable.size(); |
| 367 |
357 |
|
} |
| 368 |
|
- |
List<ServerStateChange> rv = |
| 369 |
|
- |
new ArrayList<ServerStateChange>( zAllChanges_Immutable.size() - z1stOfInterest ); |
| |
358 |
+ |
List<ServerStateChange> rv = new ArrayList<ServerStateChange>( zAllChanges_Immutable.size() - z1stOfInterest ); |
| 370 |
359 |
|
|
| 371 |
360 |
|
do |
| 372 |
361 |
|
{ |
| |
@@ -387,7 +376,7 @@ |
| 387 |
376 |
|
|
| 388 |
377 |
|
private int get1stNotOfInterest( List<ServerStateChange> pList, int pFrom ) |
| 389 |
378 |
|
{ |
| 390 |
|
- |
for ( ; pFrom < pList.size(); pFrom++ ) |
| |
379 |
+ |
for (; pFrom < pList.size(); pFrom++ ) |
| 391 |
380 |
|
{ |
| 392 |
381 |
|
if ( !isInterestedIn( pList.get( pFrom ) ) ) |
| 393 |
382 |
|
{ |
| |
@@ -532,8 +521,7 @@ |
| 532 |
521 |
|
notifyListener( pListener, pAllChanges ); |
| 533 |
522 |
|
} |
| 534 |
523 |
|
|
| 535 |
|
- |
protected final void notifyListener( ServerStateChangedListener pListener, |
| 536 |
|
- |
ServerStateChangeSet pAllChanges ) |
| |
524 |
+ |
protected final void notifyListener( ServerStateChangedListener pListener, ServerStateChangeSet pAllChanges ) |
| 537 |
525 |
|
{ |
| 538 |
526 |
|
try |
| 539 |
527 |
|
{ |
| |
@@ -593,8 +581,7 @@ |
| 593 |
581 |
|
return this; |
| 594 |
582 |
|
} |
| 595 |
583 |
|
|
| 596 |
|
- |
@SuppressWarnings({"InfiniteLoopStatement"}) |
| 597 |
|
- |
@Override |
| |
584 |
+ |
@SuppressWarnings({"InfiniteLoopStatement"}) @Override |
| 598 |
585 |
|
public void run() |
| 599 |
586 |
|
{ |
| 600 |
587 |
|
while ( true ) |
View this file contents
View the full history
Commits for