Mercurial > dive4elements > river
comparison gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartThemePanel.java @ 7680:8fe646d9d4ee
issue1547: Add more facets to lists of facets with which areas can be created.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 10 Dec 2013 09:25:10 +0100 |
| parents | 66c362b998c8 |
| children | 4e76bfff5fa6 |
comparison
equal
deleted
inserted
replaced
| 7679:66c362b998c8 | 7680:8fe646d9d4ee |
|---|---|
| 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("longitudinal_section.w") || | 290 if (a.getFacet().equals("longitudinal_section.w") || |
| 291 a.getFacet().equals("other.wqkms.w") || | |
| 292 a.getFacet().equals("other.wqkms") || | |
| 291 a.getFacet().equals("other.wkms")) { | 293 a.getFacet().equals("other.wkms")) { |
| 292 return b.getFacet().equals("longitudinal_section.w") | 294 return b.getFacet().equals("longitudinal_section.w") |
| 295 || b.getFacet().equals("other.wqkms") | |
| 296 || b.getFacet().equals("other.wqkms.w") | |
| 293 || b.getFacet().equals("other.wkms"); | 297 || b.getFacet().equals("other.wkms"); |
| 294 } | 298 } |
| 295 else if (a.getFacet().equals("longitudinal_section.q")) { | 299 else if (a.getFacet().equals("longitudinal_section.q") || |
| 296 return b.getFacet().equals("longitudinal_section.q"); | 300 a.getFacet().equals("other.wqkms.q")) { |
| 301 return b.getFacet().equals("longitudinal_section.q") | |
| 302 || b.getFacet().equals("other.wqkms.q"); | |
| 297 } | 303 } |
| 298 return false; | 304 return false; |
| 299 } | 305 } |
| 300 | 306 |
| 301 | 307 |
| 304 * this theme. | 310 * this theme. |
| 305 */ | 311 */ |
| 306 protected boolean canArea(Theme a) { | 312 protected boolean canArea(Theme a) { |
| 307 return a.getFacet().equals("longitudinal_section.q") | 313 return a.getFacet().equals("longitudinal_section.q") |
| 308 || a.getFacet().equals("longitudinal_section.w") | 314 || a.getFacet().equals("longitudinal_section.w") |
| 315 || a.getFacet().startsWith("other.wqkms") | |
| 309 || a.getFacet().equals("other.wkms"); | 316 || a.getFacet().equals("other.wkms"); |
| 310 } | 317 } |
| 311 | 318 |
| 312 | 319 |
| 313 /** Attach menu/item to open editor for Manual Points. */ | 320 /** Attach menu/item to open editor for Manual Points. */ |