Revision a14d1bae
Added by Patrick Plitzner almost 10 years ago
- added property change listener to original data label
- fixed conversation binding when getting derivate labels
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java | ||
---|---|---|
2729 | 2729 |
public OriginalLabelDataController createOriginalLabelDataController(AbstractCdmDetailSection<DerivedUnitFacade> parentElement) { |
2730 | 2730 |
OriginalLabelDataElement originalLabelDataElement = new OriginalLabelDataElement(parentElement.getLayoutComposite(), SWT.NONE); |
2731 | 2731 |
originalLabelDataElement.initController(this, parentElement); |
2732 |
return originalLabelDataElement.getController(); |
|
2732 |
OriginalLabelDataController controller = originalLabelDataElement.getController(); |
|
2733 |
addAndAdaptElement(parentElement, controller); |
|
2734 |
return controller; |
|
2733 | 2735 |
} |
2734 | 2736 |
|
2735 | 2737 |
} |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java | ||
---|---|---|
14 | 14 |
|
15 | 15 |
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade; |
16 | 16 |
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; |
17 |
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent; |
|
17 | 18 |
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; |
18 | 19 |
import eu.etaxonomy.taxeditor.ui.mvc.interfaces.CdmCompositeController; |
19 | 20 |
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; |
... | ... | |
72 | 73 |
protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) { |
73 | 74 |
String originalLabelInfo = entity.innerDerivedUnit().getOriginalLabelInfo(); |
74 | 75 |
if(originalLabelInfo!=null){ |
75 |
originalLabelDataElement.getText().setText(originalLabelInfo); |
|
76 |
// originalLabelDataElement.getText().setText(originalLabelInfo);
|
|
76 | 77 |
} |
77 | 78 |
} |
78 | 79 |
|
... | ... | |
82 | 83 |
@Override |
83 | 84 |
public void modifyText(ModifyEvent e) { |
84 | 85 |
getEntity().innerDerivedUnit().setOriginalLabelInfo(originalLabelDataElement.getText().getText()); |
86 |
firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e)); |
|
85 | 87 |
} |
86 | 88 |
|
87 | 89 |
/* (non-Javadoc) |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataElement.java | ||
---|---|---|
41 | 41 |
tableWrapLayout.leftMargin = 0; |
42 | 42 |
tableWrapLayout.horizontalSpacing = 0; |
43 | 43 |
tableWrapLayout.bottomMargin = 0; |
44 |
tableWrapLayout.numColumns = 3;
|
|
44 |
tableWrapLayout.numColumns = 2;
|
|
45 | 45 |
setLayout(tableWrapLayout); |
46 | 46 |
} |
47 | 47 |
|
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateLabelProvider.java | ||
---|---|---|
20 | 20 |
|
21 | 21 |
import eu.etaxonomy.cdm.api.conversation.ConversationHolder; |
22 | 22 |
import eu.etaxonomy.cdm.api.service.IOccurrenceService; |
23 |
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; |
|
23 | 24 |
import eu.etaxonomy.cdm.model.common.DefinedTerm; |
24 | 25 |
import eu.etaxonomy.cdm.model.molecular.DnaSample; |
25 | 26 |
import eu.etaxonomy.cdm.model.molecular.Sequence; |
26 | 27 |
import eu.etaxonomy.cdm.model.molecular.SingleRead; |
27 |
import eu.etaxonomy.cdm.model.occurrence.Collection; |
|
28 | 28 |
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; |
29 | 29 |
import eu.etaxonomy.cdm.model.occurrence.FieldUnit; |
30 | 30 |
import eu.etaxonomy.cdm.model.occurrence.GatheringEvent; |
... | ... | |
127 | 127 |
label += mediaSpecimen.getMediaSpecimen().getTitle()!=null?mediaSpecimen.getMediaSpecimen().getTitle().getText()+", ":"[no motif]"; |
128 | 128 |
label += mediaSpecimen.getMediaSpecimen().getArtist()!=null?mediaSpecimen.getMediaSpecimen().getArtist()+", ":""; |
129 | 129 |
label += mediaSpecimen.getAccessionNumber()!=null?mediaSpecimen.getAccessionNumber()+", ":""; |
130 |
Collection collection = mediaSpecimen.getCollection(); |
|
130 |
eu.etaxonomy.cdm.model.occurrence.Collection collection = mediaSpecimen.getCollection();
|
|
131 | 131 |
if(collection!=null){ |
132 | 132 |
label += collection.getName()!=null?collection.getName()+" ":""; |
133 | 133 |
} |
... | ... | |
146 | 146 |
if(fieldUnits!=null && !fieldUnits.isEmpty()){ |
147 | 147 |
FieldUnit fieldUnit = fieldUnits.iterator().next(); |
148 | 148 |
GatheringEvent gatheringEvent = fieldUnit.getGatheringEvent(); |
149 |
// gatheringEvent = HibernateProxyHelper.deproxy(gatheringEvent, GatheringEvent.class); |
|
149 | 150 |
if(gatheringEvent!=null){ |
150 | 151 |
label += gatheringEvent.getCollector()!=null?gatheringEvent.getCollector()+", ":""; |
151 | 152 |
} |
152 | 153 |
label += fieldUnit.getFieldNumber()!=null?fieldUnit.getFieldNumber()+", ":""; |
153 | 154 |
} |
154 |
Collection collection = derivedUnit.getCollection(); |
|
155 |
eu.etaxonomy.cdm.model.occurrence.Collection collection = derivedUnit.getCollection();
|
|
155 | 156 |
if(collection!=null){ |
156 | 157 |
label += collection.getName()!=null?collection.getName()+" ":""; |
157 | 158 |
label += collection.getCode()!=null?"("+collection.getCode()+"), ":""; |
... | ... | |
161 | 162 |
} |
162 | 163 |
else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.TissueSample){ |
163 | 164 |
//TODO: implement |
164 |
// kindofTissue + SampleDesignation
|
|
165 |
label += "kindofTissue? + SampleDesignation?";
|
|
165 | 166 |
} |
166 | 167 |
} |
167 | 168 |
else if(element instanceof Sequence){ |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java | ||
---|---|---|
50 | 50 |
private final DerivateSearchComposite derivateSearchComposite; |
51 | 51 |
private IIdentifiableEntityServiceConfigurator<SpecimenOrObservationBase<DerivedUnitFacadeCacheStrategy>> configurator; |
52 | 52 |
private EnumTermComboController<SpecimenOrObservationType> enumTermComboController; |
53 |
private final DerivateSearchView derivateSearchView; |
|
53 | 54 |
|
54 | 55 |
/** |
55 | 56 |
* @param parent |
57 |
* @param derivateSearchView |
|
56 | 58 |
*/ |
57 |
public DerivateSearchCompositeController(Composite parent) { |
|
59 |
public DerivateSearchCompositeController(Composite parent, DerivateSearchView derivateSearchView) {
|
|
58 | 60 |
this.derivateSearchComposite = new DerivateSearchComposite(parent, SWT.NONE); |
61 |
this.derivateSearchView = derivateSearchView; |
|
59 | 62 |
init(); |
60 | 63 |
} |
61 | 64 |
|
... | ... | |
102 | 105 |
} |
103 | 106 |
|
104 | 107 |
private void searchDerivates(){ |
108 |
if(!derivateSearchView.getConversationHolder().isBound()){ |
|
109 |
derivateSearchView.setFocus(); //rebind the conversation |
|
110 |
} |
|
111 |
|
|
105 | 112 |
configurator.setTitleSearchString(derivateSearchComposite.getSearchField().getText()); |
106 | 113 |
SpecimenOrObservationType type = enumTermComboController.getSelection(); |
107 | 114 |
//filter by specimen type |
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchView.java | ||
---|---|---|
41 | 41 |
*/ |
42 | 42 |
@Override |
43 | 43 |
public void createPartControl(Composite parent) { |
44 |
derivateSearchCompositeController = new DerivateSearchCompositeController(parent); |
|
44 |
derivateSearchCompositeController = new DerivateSearchCompositeController(parent, this);
|
|
45 | 45 |
getSite().setSelectionProvider(derivateSearchCompositeController.getResultViewer()); |
46 | 46 |
derivateSearchCompositeController.setEnabled(CdmStore.isActive()); |
47 | 47 |
} |
Also available in: Unified diff