|
@@ -5,44 +5,46 @@ |
5 |
5 |
|
import java.util.*; |
6 |
6 |
|
|
7 |
7 |
|
import org.litesoft.changemanagement.nonpublic.*; |
|
8 |
+ |
import org.litesoft.core.typeutils.*; |
8 |
9 |
|
|
9 |
10 |
|
public final class ServerStateChangeSet implements IServerStateChangeSet, |
10 |
11 |
|
Serializable |
11 |
12 |
|
{ |
12 |
|
- |
private Serializable mSourceUniqueID; |
13 |
|
- |
private String mSourceClassname; |
14 |
|
- |
private Map<String, Serializable> mXtraData; |
15 |
|
- |
private List<ServerStateChange> mChanges; |
|
13 |
+ |
private static final long serialVersionUID = 1L; |
16 |
14 |
|
|
17 |
|
- |
public ServerStateChangeSet( Serializable pSourceUniqueID, String pSourceClassname, ServerStateChange pChange ) |
|
15 |
+ |
private /* final */ Serializable mSourceUniqueID; |
|
16 |
+ |
private /* final */ String mSourceClassname; |
|
17 |
+ |
private /* final */ Map<String, Serializable> mXtraData; |
|
18 |
+ |
private /* final */ List<ServerStateChange> mChanges; |
|
19 |
+ |
|
|
20 |
+ |
@SuppressWarnings("UnusedDeclaration") @Deprecated // for serialization |
|
21 |
+ |
protected ServerStateChangeSet() |
|
22 |
+ |
{ |
|
23 |
+ |
} |
|
24 |
+ |
|
|
25 |
+ |
private ServerStateChangeSet( Serializable pSourceUniqueID, String pSourceClassname, |
|
26 |
+ |
Map<String, Serializable> pXtraData, |
|
27 |
+ |
List<ServerStateChange> pUnmodifiableChanges ) |
18 |
28 |
|
{ |
19 |
29 |
|
mSourceUniqueID = pSourceUniqueID; |
20 |
30 |
|
mSourceClassname = pSourceClassname; |
21 |
|
- |
mXtraData = new HashMap<String, Serializable>(); |
22 |
|
- |
createChanges().add( pChange ); |
|
31 |
+ |
mXtraData = pXtraData; |
|
32 |
+ |
mChanges = pUnmodifiableChanges; |
23 |
33 |
|
} |
24 |
34 |
|
|
25 |
35 |
|
public ServerStateChangeSet( ServerStateChangeSet pSource, List<ServerStateChange> pUnmodifiableChanges ) |
26 |
36 |
|
{ |
27 |
|
- |
this.mSourceUniqueID = pSource.mSourceUniqueID; |
28 |
|
- |
this.mSourceClassname = pSource.mSourceClassname; |
29 |
|
- |
this.mXtraData = pSource.mXtraData; |
30 |
|
- |
mChanges = pUnmodifiableChanges; |
|
37 |
+ |
this( pSource.mSourceUniqueID, pSource.mSourceClassname, pSource.mXtraData, pUnmodifiableChanges ); |
31 |
38 |
|
} |
32 |
39 |
|
|
33 |
|
- |
protected ServerStateChangeSet( ServerStateChangeCollector pCollector ) |
|
40 |
+ |
public ServerStateChangeSet( Serializable pSourceUniqueID, String pSourceClassname, ServerStateChange pChange ) |
34 |
41 |
|
{ |
35 |
|
- |
this.mSourceUniqueID = pCollector.mSourceUniqueID; |
36 |
|
- |
this.mSourceClassname = pCollector.mSourceClassname; |
37 |
|
- |
this.mXtraData = new HashMap<String, Serializable>( pCollector.mXtraData ); |
38 |
|
- |
createChanges().addAll( pCollector.mChanges ); |
|
42 |
+ |
this( pSourceUniqueID, pSourceClassname, Maps.<String, Serializable>empty(), Lists.ofUnmodifiable( pChange ) ); |
39 |
43 |
|
} |
40 |
44 |
|
|
41 |
|
- |
private ArrayList<ServerStateChange> createChanges() |
|
45 |
+ |
protected ServerStateChangeSet( ServerStateChangeCollector pCollector ) |
42 |
46 |
|
{ |
43 |
|
- |
ArrayList<ServerStateChange> rv = new ArrayList<ServerStateChange>(); |
44 |
|
- |
mChanges = Collections.unmodifiableList( rv ); |
45 |
|
- |
return rv; |
|
47 |
+ |
this( pCollector.mSourceUniqueID, pCollector.mSourceClassname, Maps.copyHashMap( pCollector.mXtraData ), Lists.fromUnmodifiable( pCollector.mChanges ) ); |
46 |
48 |
|
} |
47 |
49 |
|
|
48 |
50 |
|
@Override |
|
@@ -74,11 +76,4 @@ |
74 |
76 |
|
{ |
75 |
77 |
|
return Helper.toString( mSourceUniqueID, mSourceClassname, mXtraData, mChanges ); |
76 |
78 |
|
} |
77 |
|
- |
|
78 |
|
- |
static final long serialVersionUID = -126548732321783478L; |
79 |
|
- |
|
80 |
|
- |
@Deprecated // for serialization |
81 |
|
- |
public ServerStateChangeSet() |
82 |
|
- |
{ |
83 |
|
- |
} |
84 |
79 |
|
} |