| |
@@ -6,91 +6,73 @@ |
| 6 |
6 |
|
|
| 7 |
7 |
|
import java.util.*; |
| 8 |
8 |
|
|
| 9 |
|
- |
public class LoggingStringSet implements LoggingCollection |
| 10 |
|
- |
{ |
| |
9 |
+ |
public class LoggingStringSet implements LoggingCollection { |
| 11 |
10 |
|
private Set mMembers = new HashSet(); |
| 12 |
11 |
|
private Logger mLogger; |
| 13 |
12 |
|
private String mLogText; |
| 14 |
13 |
|
|
| 15 |
|
- |
public LoggingStringSet( Logger pLogger, String pLogText ) |
| 16 |
|
- |
{ |
| |
14 |
+ |
public LoggingStringSet( Logger pLogger, String pLogText ) { |
| 17 |
15 |
|
mLogger = pLogger; |
| 18 |
16 |
|
mLogText = pLogText; |
| 19 |
17 |
|
} |
| 20 |
18 |
|
|
| 21 |
|
- |
public synchronized void add( String[] pNewMembers ) |
| 22 |
|
- |
{ |
| 23 |
|
- |
if ( pNewMembers != null ) |
| 24 |
|
- |
{ |
| 25 |
|
- |
for ( int i = 0; i < pNewMembers.length; i++ ) |
| 26 |
|
- |
{ |
| |
19 |
+ |
public synchronized void add( String[] pNewMembers ) { |
| |
20 |
+ |
if ( pNewMembers != null ) { |
| |
21 |
+ |
for ( int i = 0; i < pNewMembers.length; i++ ) { |
| 27 |
22 |
|
add( pNewMembers[i] ); |
| 28 |
23 |
|
} |
| 29 |
24 |
|
} |
| 30 |
25 |
|
} |
| 31 |
26 |
|
|
| 32 |
|
- |
public synchronized void add( Set pNewMembers ) |
| 33 |
|
- |
{ |
| 34 |
|
- |
if ( pNewMembers != null ) |
| 35 |
|
- |
{ |
| 36 |
|
- |
for ( Iterator it = pNewMembers.iterator(); it.hasNext(); ) |
| 37 |
|
- |
{ |
| |
27 |
+ |
public synchronized void add( Set pNewMembers ) { |
| |
28 |
+ |
if ( pNewMembers != null ) { |
| |
29 |
+ |
for ( Iterator it = pNewMembers.iterator(); it.hasNext(); ) { |
| 38 |
30 |
|
add( it.next().toString() ); |
| 39 |
31 |
|
} |
| 40 |
32 |
|
} |
| 41 |
33 |
|
} |
| 42 |
34 |
|
|
| 43 |
|
- |
public synchronized void add( String pNewMember ) |
| 44 |
|
- |
{ |
| 45 |
|
- |
if ( pNewMember != null ) |
| 46 |
|
- |
{ |
| |
35 |
+ |
public synchronized void add( String pNewMember ) { |
| |
36 |
+ |
if ( pNewMember != null ) { |
| 47 |
37 |
|
mLogger.trace.log( "(", mLogText, "):", pNewMember ); |
| 48 |
38 |
|
mMembers.add( pNewMember ); |
| 49 |
39 |
|
} |
| 50 |
40 |
|
} |
| 51 |
41 |
|
|
| 52 |
42 |
|
@Override |
| 53 |
|
- |
public synchronized void clear() |
| 54 |
|
- |
{ |
| |
43 |
+ |
public synchronized void clear() { |
| 55 |
44 |
|
mMembers.clear(); |
| 56 |
45 |
|
} |
| 57 |
46 |
|
|
| 58 |
47 |
|
@Override |
| 59 |
|
- |
public synchronized boolean isEmpty() |
| 60 |
|
- |
{ |
| |
48 |
+ |
public synchronized boolean isEmpty() { |
| 61 |
49 |
|
return mMembers.isEmpty(); |
| 62 |
50 |
|
} |
| 63 |
51 |
|
|
| 64 |
52 |
|
@Override |
| 65 |
|
- |
public synchronized Iterator iterator() |
| 66 |
|
- |
{ |
| |
53 |
+ |
public synchronized Iterator iterator() { |
| 67 |
54 |
|
return isEmpty() ? Iterators.empty() : getAndClearSet().iterator(); |
| 68 |
55 |
|
} |
| 69 |
56 |
|
|
| 70 |
|
- |
public synchronized Set getAndClearSet() |
| 71 |
|
- |
{ |
| |
57 |
+ |
public synchronized Set getAndClearSet() { |
| 72 |
58 |
|
Set rv = mMembers; |
| 73 |
59 |
|
mMembers = Collections.EMPTY_SET; |
| 74 |
60 |
|
return rv; |
| 75 |
61 |
|
} |
| 76 |
62 |
|
|
| 77 |
|
- |
public synchronized String[] getAndClearMembers() |
| 78 |
|
- |
{ |
| 79 |
|
- |
if ( mMembers.isEmpty() ) |
| 80 |
|
- |
{ |
| |
63 |
+ |
public synchronized String[] getAndClearMembers() { |
| |
64 |
+ |
if ( mMembers.isEmpty() ) { |
| 81 |
65 |
|
return null; |
| 82 |
66 |
|
} |
| 83 |
67 |
|
String[] rv = new String[mMembers.size()]; |
| 84 |
68 |
|
int i = 0; |
| 85 |
|
- |
for ( Iterator it = mMembers.iterator(); it.hasNext(); ) |
| 86 |
|
- |
{ |
| |
69 |
+ |
for ( Iterator it = mMembers.iterator(); it.hasNext(); ) { |
| 87 |
70 |
|
rv[i++] = it.next().toString(); |
| 88 |
71 |
|
} |
| 89 |
72 |
|
return rv; |
| 90 |
73 |
|
} |
| 91 |
74 |
|
|
| 92 |
|
- |
public String toString() |
| 93 |
|
- |
{ |
| |
75 |
+ |
public String toString() { |
| 94 |
76 |
|
return mLogText + ":" + mMembers; |
| 95 |
77 |
|
} |
| 96 |
78 |
|
} |
View this file contents
View the full history
Commits for