Revision cbf13384
Added by Katja Luther over 4 years ago
| eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/DistributionAggregationWizardPage.java | ||
|---|---|---|
| 352 | 352 |
comboSourceModeChildParent.setText(Messages.DistributionAggregationConfiguration_AggregationMode); |
| 353 | 353 |
|
| 354 | 354 |
for (AggregationSourceMode mode :AggregationSourceMode.values()){
|
| 355 |
comboSourceModeChildParent.add(mode.toString());
|
|
| 356 |
comboSourceModeChildParent.setData(mode.toString(), mode);
|
|
| 355 |
comboSourceModeChildParent.add(mode.getMessage());
|
|
| 356 |
comboSourceModeChildParent.setData(mode.getMessage(), mode);
|
|
| 357 | 357 |
|
| 358 | 358 |
} |
| 359 | 359 |
|
| ... | ... | |
| 368 | 368 |
comboSourceModeSubAreaSuperArea.setText(Messages.DistributionAggregationConfiguration_AggregationMode); |
| 369 | 369 |
|
| 370 | 370 |
for (AggregationSourceMode mode :AggregationSourceMode.values()){
|
| 371 |
comboSourceModeSubAreaSuperArea.add(mode.toString());
|
|
| 372 |
comboSourceModeSubAreaSuperArea.setData(mode.toString(), mode);
|
|
| 371 |
comboSourceModeSubAreaSuperArea.add(mode.getMessage());
|
|
| 372 |
comboSourceModeSubAreaSuperArea.setData(mode.getMessage(), mode);
|
|
| 373 | 373 |
} |
| 374 | 374 |
|
| 375 | 375 |
comboSourceModeSubAreaSuperArea.addSelectionListener(this); |
| ... | ... | |
| 500 | 500 |
comboHigherRank.add("");
|
| 501 | 501 |
if (name != null){
|
| 502 | 502 |
for (Rank rank: CdmStore.getTermManager().getPreferredTerms(Rank.class)){
|
| 503 |
if (useClassification() || (name != null && name.getRank().isHigher(rank))){
|
|
| 503 |
if (useClassification() || (name != null && name.getRank().isHigher(rank) || name.getRank().equals(rank))){
|
|
| 504 | 504 |
rankList.add(rank); |
| 505 | 505 |
} |
| 506 | 506 |
} |
| ... | ... | |
| 531 | 531 |
} |
| 532 | 532 |
comboLowerRank.add("");
|
| 533 | 533 |
for (Rank rank: CdmStore.getTermManager().getPreferredTerms(Rank.class)){
|
| 534 |
if (subTreeNode == null && (comboHigherRank.getText() == null || (comboHigherRank.getData(comboHigherRank.getText()) != null && ((Rank)comboHigherRank.getData(comboHigherRank.getText())).isHigher(rank)))){
|
|
| 534 |
if (subTreeNode == null && (comboHigherRank.getText() == null || (comboHigherRank.getData(comboHigherRank.getText()) != null && (((Rank)comboHigherRank.getData(comboHigherRank.getText())).isHigher(rank) || ((Rank)comboHigherRank.getData(comboHigherRank.getText())).equals(rank))))){
|
|
| 535 | 535 |
rankList.add(rank); |
| 536 |
}else if (name == null || name.getRank().isHigher(rank)) {
|
|
| 537 |
if(StringUtils.isBlank(comboHigherRank.getText()) || comboHigherRank.getData(comboHigherRank.getText()) != null && ((Rank)comboHigherRank.getData(comboHigherRank.getText())).isHigher(rank)){
|
|
| 536 |
}else if (name == null || (name.getRank().isHigher(rank) || name.getRank().equals(rank))) {
|
|
| 537 |
if(StringUtils.isBlank(comboHigherRank.getText()) || comboHigherRank.getData(comboHigherRank.getText()) != null && (((Rank)comboHigherRank.getData(comboHigherRank.getText())).isHigher(rank) || ((Rank)comboHigherRank.getData(comboHigherRank.getText())).equals(rank))){
|
|
| 538 | 538 |
// the rank is lower than higher rank and lower than the rank of the subtree name |
| 539 | 539 |
rankList.add(rank); |
| 540 | 540 |
} |
Also available in: Unified diff
ref #8677: rank combo contains rank of selected taxon