2,6 → 2,7 |
|
import java.util.List; |
import java.util.ArrayList; |
import java.util.Iterator; |
import ak.hostadmiral.util.ModelException; |
|
public class ConfigRoot |
61,14 → 62,26 |
+ ", second - " + second.versionMajor); |
|
this.dataSource = dataSource.merge(second.dataSource); |
this.initializations.addAll(second.initializations); // FIXME: replace dublicates |
|
for(Iterator i = second.initializations.iterator(); i.hasNext(); ) { |
ConfigInitialization ci = (ConfigInitialization)i.next(); |
|
this.initializations.remove(ci); |
this.initializations.add(ci); |
} |
|
return this; |
} |
|
public String toString() |
{ |
StringBuffer initStr = new StringBuffer(); |
for(Iterator i = initializations.iterator(); i.hasNext(); ) { |
ConfigInitialization ci = (ConfigInitialization)i.next(); |
initStr.append(ci); |
} |
|
return "hostadmiral config v" + versionMajor + "." + versionMinor + "\n" |
+ dataSource + "\t" + initializations; |
+ dataSource + "\n\tinitializations:\n" + initStr.toString() + "end of config"; |
} |
} |