Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/collections/AttributeWriter.java @ 704:eab5e5089d77
Merged revisions 2127-2133,2136-2137,2140,2143-2144,2146,2150-2151,2153-2154 via svnmerge from
svn+ssh://teichmann@thoe/home/projects/Geospatial/bsh-generischer-viewer/Material/SVN/flys-artifacts/branches/facets-slt
........
r2127 | ingo | 2011-06-16 09:50:56 +0200 (Do, 16 Jun 2011) | 1 line
Added a compute() method to WINFOArtifact which acts as a dispatcher for different computations. It triggers a calculation based on ComputeCallbacks that are generated by the current states.
........
r2128 | ingo | 2011-06-16 10:25:06 +0200 (Do, 16 Jun 2011) | 1 line
Moved Waterlevel state into the correct package.
........
r2129 | ingo | 2011-06-16 10:43:58 +0200 (Do, 16 Jun 2011) | 1 line
Added two more compute() methods to ComputeCallback to distinguish between different phases of the artifact.
........
r2130 | ingo | 2011-06-16 10:57:05 +0200 (Do, 16 Jun 2011) | 1 line
Use enums to dispatch computeFeed() and computeAdvance().
........
r2131 | ingo | 2011-06-16 11:04:59 +0200 (Do, 16 Jun 2011) | 1 line
Store facets for each state.
........
r2132 | ingo | 2011-06-16 12:05:44 +0200 (Do, 16 Jun 2011) | 1 line
Generated facets for each output aspect.
........
r2133 | ingo | 2011-06-16 15:24:00 +0200 (Do, 16 Jun 2011) | 1 line
Write computed facets into artifacts describe document.
........
r2136 | ingo | 2011-06-16 16:10:49 +0200 (Do, 16 Jun 2011) | 1 line
Add index and description of facets to collections describe document.
........
r2137 | ingo | 2011-06-16 16:31:41 +0200 (Do, 16 Jun 2011) | 1 line
OutGenerators doOut() takes a facet object now instead of just its name.
........
r2140 | ingo | 2011-06-17 11:19:43 +0200 (Fr, 17 Jun 2011) | 1 line
OutGenerators use now facets to fetch necessary data.
........
r2143 | teichmann | 2011-06-17 12:40:54 +0200 (Fr, 17 Jun 2011) | 1 line
Removed ComputeCallback because this was thought too complicated. Fixed issue with facets not be re-generated if same state is entered again.
........
r2144 | teichmann | 2011-06-17 13:08:31 +0200 (Fr, 17 Jun 2011) | 1 line
make getGauges() more robust
........
r2146 | teichmann | 2011-06-17 13:23:57 +0200 (Fr, 17 Jun 2011) | 1 line
mico opt: inter cmps are faster than str cmps.
........
r2150 | teichmann | 2011-06-17 15:10:20 +0200 (Fr, 17 Jun 2011) | 1 line
call computeAdvance() if we want to advance.
........
r2151 | teichmann | 2011-06-17 15:45:50 +0200 (Fr, 17 Jun 2011) | 1 line
Base WST/CSV exports on facets. TODO: generate the facets.
........
r2153 | teichmann | 2011-06-17 16:03:29 +0200 (Fr, 17 Jun 2011) | 1 line
Add facet to access raw computed data.
........
r2154 | teichmann | 2011-06-17 16:37:09 +0200 (Fr, 17 Jun 2011) | 1 line
Generate data facets for the computed states.
........
flys-artifacts/trunk@2156 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
---|---|
date | Fri, 17 Jun 2011 16:17:03 +0000 |
parents | 68c6c75a6f7c |
children | 853dceead0f4 |
comparison
equal
deleted
inserted
replaced
685:d45c3ddaed1b | 704:eab5e5089d77 |
---|---|
114 ElementCreator cr, | 114 ElementCreator cr, |
115 Element output, | 115 Element output, |
116 ManagedFacet a, | 116 ManagedFacet a, |
117 List<Facet> list) | 117 List<Facet> list) |
118 { | 118 { |
119 String name = a.getName(); | 119 String name = a.getName() + a.getIndex(); |
120 | 120 |
121 if (list == null) { | 121 if (list == null) { |
122 logger.debug("No old facets found."); | 122 logger.debug("No old facets found."); |
123 return false; | 123 return false; |
124 } | 124 } |
125 | 125 |
126 for (Facet facet: list) { | 126 for (Facet facet: list) { |
127 if (name.equals(facet.getName())) { | 127 if (name.equals(facet.getName() + facet.getIndex())) { |
128 writeFacet(doc, cr, output, (ManagedFacet) facet); | 128 writeFacet(doc, cr, output, (ManagedFacet) facet); |
129 return true; | 129 return true; |
130 } | 130 } |
131 } | 131 } |
132 | 132 |
143 Element theme = cr.create("theme"); | 143 Element theme = cr.create("theme"); |
144 cr.addAttr(theme, "artifact", f.getArtifact(), true); | 144 cr.addAttr(theme, "artifact", f.getArtifact(), true); |
145 cr.addAttr(theme, "facet", f.getName(), true); | 145 cr.addAttr(theme, "facet", f.getName(), true); |
146 cr.addAttr(theme, "pos", Integer.toString(f.getPosition()), true); | 146 cr.addAttr(theme, "pos", Integer.toString(f.getPosition()), true); |
147 cr.addAttr(theme, "active", Integer.toString(f.getActive()), true); | 147 cr.addAttr(theme, "active", Integer.toString(f.getActive()), true); |
148 cr.addAttr(theme, "index", Integer.toString(f.getIndex()), true); | |
149 cr.addAttr(theme, "description", f.getDescription(), true); | |
148 | 150 |
149 output.appendChild(theme); | 151 output.appendChild(theme); |
150 } | 152 } |
151 } | 153 } |
152 | 154 |