Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartThemePanel.java @ 7712:27578853bf24
(issue1622) Allow areas with w_differences
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Thu, 19 Dec 2013 18:35:03 +0100 |
| parents | 4e76bfff5fa6 |
| children | 9705e747e3ee |
comparison
equal
deleted
inserted
replaced
| 7711:a35da155865f | 7712:27578853bf24 |
|---|---|
| 285 */ | 285 */ |
| 286 protected boolean areAreaCompatible(Theme a, Theme b) { | 286 protected boolean areAreaCompatible(Theme a, Theme b) { |
| 287 if (a.equals(b)) { | 287 if (a.equals(b)) { |
| 288 return false; | 288 return false; |
| 289 } | 289 } |
| 290 if (a.getFacet().equals("w_differences") && | |
| 291 b.getFacet().equals("w_differences")) { | |
| 292 return true; | |
| 293 } | |
| 290 if (a.getFacet().equals("longitudinal_section.w") || | 294 if (a.getFacet().equals("longitudinal_section.w") || |
| 291 a.getFacet().equals("other.wqkms.w") || | 295 a.getFacet().equals("other.wqkms.w") || |
| 292 a.getFacet().equals("other.wqkms") || | 296 a.getFacet().equals("other.wqkms") || |
| 293 a.getFacet().equals("discharge_longitudinal_section.w") || | 297 a.getFacet().equals("discharge_longitudinal_section.w") || |
| 294 a.getFacet().equals("other.wkms")) { | 298 a.getFacet().equals("other.wkms")) { |
| 317 return a.getFacet().equals("longitudinal_section.q") | 321 return a.getFacet().equals("longitudinal_section.q") |
| 318 || a.getFacet().equals("longitudinal_section.w") | 322 || a.getFacet().equals("longitudinal_section.w") |
| 319 || a.getFacet().equals("discharge_longitudinal_section.w") | 323 || a.getFacet().equals("discharge_longitudinal_section.w") |
| 320 || a.getFacet().equals("discharge_longitudinal_section.q") | 324 || a.getFacet().equals("discharge_longitudinal_section.q") |
| 321 || a.getFacet().startsWith("other.wqkms") | 325 || a.getFacet().startsWith("other.wqkms") |
| 322 || a.getFacet().equals("other.wkms"); | 326 || a.getFacet().equals("other.wkms") |
| 327 || a.getFacet().equals("w_differences"); | |
| 323 } | 328 } |
| 324 | 329 |
| 325 | 330 |
| 326 /** Attach menu/item to open editor for Manual Points. */ | 331 /** Attach menu/item to open editor for Manual Points. */ |
| 327 protected void attachManualPointsMenu(Menu menu) { | 332 protected void attachManualPointsMenu(Menu menu) { |