Revision 7954536e
Added by Andreas Kohlbecker almost 7 years ago
| src/main/java/eu/etaxonomy/cdm/vaadin/util/converter/TypeDesignationSetManager.java | ||
|---|---|---|
| 83 | 83 |
|
| 84 | 84 |
private List<String> probelms = new ArrayList<>(); |
| 85 | 85 |
|
| 86 |
private boolean printCitation = false; |
|
| 87 |
|
|
| 86 | 88 |
/** |
| 87 | 89 |
* @param containgEntity |
| 88 | 90 |
* @param taxonName |
| ... | ... | |
| 500 | 502 |
} |
| 501 | 503 |
} |
| 502 | 504 |
|
| 503 |
if(td.getCitation() != null){
|
|
| 504 |
result += " " + td.getCitation().getTitleCache(); |
|
| 505 |
if(isPrintCitation() && td.getCitation() != null){
|
|
| 506 |
if(td.getCitation().getAbbrevTitle() != null){
|
|
| 507 |
result += " " + td.getCitation().getAbbrevTitle(); |
|
| 508 |
} else {
|
|
| 509 |
result += " " + td.getCitation().getTitleCache(); |
|
| 510 |
} |
|
| 505 | 511 |
if(td.getCitationMicroReference() != null){
|
| 506 | 512 |
result += " :" + td.getCitationMicroReference(); |
| 507 | 513 |
} |
| ... | ... | |
| 556 | 562 |
return finalString.trim(); |
| 557 | 563 |
} |
| 558 | 564 |
|
| 565 |
/** |
|
| 566 |
* @return the printCitation |
|
| 567 |
*/ |
|
| 568 |
public boolean isPrintCitation() {
|
|
| 569 |
return printCitation; |
|
| 570 |
} |
|
| 571 |
|
|
| 572 |
/** |
|
| 573 |
* @param printCitation the printCitation to set |
|
| 574 |
*/ |
|
| 575 |
public void setPrintCitation(boolean printCitation) {
|
|
| 576 |
this.printCitation = printCitation; |
|
| 577 |
} |
|
| 578 |
|
|
| 559 | 579 |
/** |
| 560 | 580 |
* TypeDesignations which refer to the same FieldUnit (SpecimenTypeDesignation) or TaxonName |
| 561 | 581 |
* (NameTypeDesignation) form a working set. The <code>TypeDesignationWorkingSet</code> internally |
| src/main/java/eu/etaxonomy/vaadin/mvp/AbstractCdmPopupEditor.java | ||
|---|---|---|
| 39 | 39 |
private Button advancedModeButton; |
| 40 | 40 |
|
| 41 | 41 |
/** |
| 42 |
* The supplied layout will be set to full size, to avoid problems with |
|
| 43 |
* automatic resizing of the inner content. |
|
| 44 |
* |
|
| 45 |
* |
|
| 42 | 46 |
* @param layout |
| 43 | 47 |
* @param dtoType |
| 44 | 48 |
*/ |
| 45 | 49 |
public AbstractCdmPopupEditor(Layout layout, Class<DTO> dtoType) {
|
| 46 | 50 |
super(layout, dtoType); |
| 51 |
// IMPORTANT: the layout must be set to full size otherwise the |
|
| 52 |
// popup window may have problems with automatic resizing of its |
|
| 53 |
// content. |
|
| 54 |
layout.setSizeFull(); |
|
| 47 | 55 |
if(MarginHandler.class.isAssignableFrom(getFieldLayout().getClass())){
|
| 48 | 56 |
((MarginHandler)getFieldLayout()).setMargin(new MarginInfo(false, true, true, true)); |
| 49 | 57 |
} |
| src/main/java/eu/etaxonomy/vaadin/mvp/AbstractPopupEditor.java | ||
|---|---|---|
| 90 | 90 |
setWidthUndefined(); |
| 91 | 91 |
|
| 92 | 92 |
mainLayout = new VerticalLayout(); |
| 93 |
mainLayout.setWidthUndefined(); |
|
| 93 |
// IMPORTANT: mainLayout must be set to full size otherwise the |
|
| 94 |
// popup window may have problems with automatic resizing of its |
|
| 95 |
// content. |
|
| 96 |
mainLayout.setSizeFull(); |
|
| 94 | 97 |
|
| 95 | 98 |
fieldGroup = new BeanFieldGroup<>(dtoType); |
| 96 | 99 |
fieldGroup.addCommitHandler(new SaveHandler()); |
Also available in: Unified diff
fix #6843 popup window content layouts are guaranteed to have full size