diff options
| author | abranson <andrew.branson@cern.ch> | 2011-08-04 00:42:34 +0200 |
|---|---|---|
| committer | abranson <andrew.branson@cern.ch> | 2011-08-04 00:42:34 +0200 |
| commit | 0ec8481c10cd8277d84c7c1a785483a0a739e5a0 (patch) | |
| tree | 5f6e5d9ae75193e67e6f3b3dfa488960c5cde1d5 /source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java | |
| parent | 036cbdba66f804743c4c838ed598d6972c4b3e17 (diff) | |
More code cleanup:
Refactored Entity Proxy Subscription to handle generics better
Rewrote RemoteMap to use TreeMap instead of the internal array for
order. It now sorts its keys by number if they parse, else as strings.
Removed a no-longer-in-progress outcome form class
Diffstat (limited to 'source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java')
| -rw-r--r-- | source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java index 3677220..073d662 100644 --- a/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java +++ b/source/com/c2kernel/lifecycle/instance/predefined/entitycreation/Aggregation.java @@ -5,20 +5,20 @@ import java.util.ArrayList; public class Aggregation implements java.io.Serializable {
public boolean isDescription;
- public ArrayList aggregationMemberList;
+ public ArrayList<?> aggregationMemberList;
public String name;
public Aggregation() {
super();
- aggregationMemberList = new ArrayList();
- }
-
+ aggregationMemberList = new ArrayList<Object>();
+ }
+
public Aggregation(String name, boolean isDescription) {
this();
this.name = name;
this.isDescription = isDescription;
}
-
+
public com.c2kernel.collection.Aggregation create() {
return new com.c2kernel.collection.AggregationInstance();
}
|
