Mercurial > dive4elements > river
changeset 1060:2d60a875e28c
Set the master artifact while output creation.
flys-artifacts/trunk@2532 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
|---|---|
| date | Tue, 23 Aug 2011 13:05:54 +0000 |
| parents | fdb0f4ef96f0 |
| children | b1b0a0b61845 |
| files | flys-artifacts/ChangeLog flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-artifacts/ChangeLog Tue Aug 23 11:07:21 2011 +0000 +++ b/flys-artifacts/ChangeLog Tue Aug 23 13:05:54 2011 +0000 @@ -1,3 +1,9 @@ +2011-08-23 Ingo Weinzierl <ingo@intevation.de> + + * src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java: + Declare the first artifact of an output as master artifact (artifacts + are ordered by their creation time). + 2011-08-23 Sascha L. Teichmann <sascha.teichmann@intevation.de> * src/main/java/de/intevation/flys/artifacts/MainValuesArtifact.java:
--- a/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java Tue Aug 23 11:07:21 2011 +0000 +++ b/flys-artifacts/src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java Tue Aug 23 13:05:54 2011 +0000 @@ -270,11 +270,10 @@ continue; } - // TODO Remove the following two lines of code! The master - // artifact has to be determined correctly after - // OutGenerator.init is called! Artifact artifact = getArtifact(art, context); - generator.setMasterArtifact(artifact); + if (i == 0) { + generator.setMasterArtifact(artifact); + } if (theme.getActive() == 0) { continue;