Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/WspDatacagePanel.java @ 8860:28df64078f27
Merge with 0862ea5d66baf60e7eee496d130a35157cc9ec12
author | gernotbelger |
---|---|
date | Fri, 19 Jan 2018 11:23:42 +0100 |
parents | 5e38e2924c07 |
children | e3c2ae1887e8 |
comparison
equal
deleted
inserted
replaced
8854:7bbfb24e6eec | 8860:28df64078f27 |
---|---|
157 return new Data[] { new DefaultData( | 157 return new Data[] { new DefaultData( |
158 dataName, null, null, new DataItem[] { item }) }; | 158 dataName, null, null, new DataItem[] { item }) }; |
159 } | 159 } |
160 | 160 |
161 | 161 |
162 protected String createDataString(String artifact, Recommendation recommendation) { | 162 protected String createDataString( |
163 String artifact, | |
164 Recommendation recommendation | |
165 ) { | |
163 Facet f = null; | 166 Facet f = null; |
164 | 167 |
165 // The filter will only be available or previous calculation artifacts. | 168 // The filter will only be available or previous calculation artifacts. |
166 Filter filter = recommendation.getFilter(); | 169 Filter filter = recommendation.getFilter(); |
167 | 170 |
176 if (f != null) { | 179 if (f != null) { |
177 break; | 180 break; |
178 } | 181 } |
179 } | 182 } |
180 | 183 |
181 return "[" + artifact + ";" + f.getName() + ";" + f.getIndex() + "]"; | 184 return "[" + artifact + ";" + f.getName() + ";" |
185 + f.getIndex() + "]"; | |
182 } | 186 } |
183 else { | 187 else { |
184 return "[" + artifact + ";" + recommendation.getFactory() + ";" + 0 + "]"; | 188 return "[" + artifact + ";" |
189 + recommendation.getFactory() + ";" + 0 + "]"; | |
185 } | 190 } |
186 } | 191 } |
187 } | 192 } |
188 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : | 193 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : |