<classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
<classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-commons-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-ext-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-print-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-remote-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.6-SNAPSHOT-sources.jar"/>
- <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.3.6-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar"/>
+ <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar"/>
<classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
<classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
public static final String SINGLE_READ_DERIVATE = "single_read_derivate";
public static final String SINGLE_READ_DERIVATE_MULTILINK = "single_read_derivate_multilink";
+ public static final String HAS_CHARACTER_DATA = "_has_character_data";
+
/***************************************************************************
"single_read_derivate-16x16-32.png");
registerImage(registry, SINGLE_READ_DERIVATE_MULTILINK,
"single_read_derivate_multilink-16x16-32.png");
+
+ //hasCharacterData icons
+ registerImage(registry, FIELD_UNIT+HAS_CHARACTER_DATA,
+ "field_unit_has_character_data-16x16-32.png");
+ registerImage(registry, SPECIMEN_DERIVATE+HAS_CHARACTER_DATA,
+ "specimen_derivate_has_character_data-16x16-32.png");
+ registerImage(registry, ARTWORK_DERIVATE+HAS_CHARACTER_DATA,
+ "artwork_derivate_has_character_data-16x16-32.png");
+ registerImage(registry, SPECIMEN_SCAN_DERIVATE+HAS_CHARACTER_DATA,
+ "specimen_scan_derivate_has_character_data-16x16-32.png");
+ registerImage(registry, LIVING_PLANT_PHOTO_DERIVATE+HAS_CHARACTER_DATA,
+ "living_plant_photo_derivate_has_character_data-16x16-32.png");
+ registerImage(registry, DETAIL_IMAGE_DERIVATE+HAS_CHARACTER_DATA,
+ "detail_image_derivate_has_character_data-16x16-32.png");
+ registerImage(registry, TISSUE_SAMPLE_DERIVATE+HAS_CHARACTER_DATA,
+ "tissue_sample_derivate_has_character_data-16x16-32.png");
+ registerImage(registry, AMPLIFICATION_DERIVATE+HAS_CHARACTER_DATA,
+ "amplification_derivate_has_character_data-16x16-32.png");
+ registerImage(registry, SINGLE_READ_DERIVATE+HAS_CHARACTER_DATA,
+ "single_read_derivate_has_character_data-16x16-32.png");
+ registerImage(registry, SINGLE_READ_DERIVATE_MULTILINK+HAS_CHARACTER_DATA,
+ "single_read_derivate_multilink_has_character_data-16x16-32.png");
+ registerImage(registry, DNA_SAMPLE_DERIVATE+HAS_CHARACTER_DATA,
+ "dna_derivate_derivate_has_character_data-16x16-32.png");
+ registerImage(registry, SEQUENCE_DERIVATE+HAS_CHARACTER_DATA,
+ "sequence_derivate_has_character_data-16x16-32.png");
+
+
}
private void registerImage(ImageRegistry registry, String key,
public OriginalLabelDataController createOriginalLabelDataController(AbstractCdmDetailSection<DerivedUnitFacade> parentElement) {
OriginalLabelDataElement originalLabelDataElement = new OriginalLabelDataElement(parentElement.getLayoutComposite(), SWT.NONE);
originalLabelDataElement.initController(this, parentElement);
- return originalLabelDataElement.getController();
+ OriginalLabelDataController controller = originalLabelDataElement.getController();
+ addAndAdaptElement(parentElement, controller);
+ return controller;
}
}
*/
package eu.etaxonomy.taxeditor.ui.mvc;
+import org.eclipse.swt.events.ModifyEvent;
+import org.eclipse.swt.events.ModifyListener;
+
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.mvc.interfaces.CdmCompositeController;
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
* @date 17.06.2014
*
*/
-public class OriginalLabelDataController extends AbstractCdmDetailElement<DerivedUnitFacade> implements CdmCompositeController{
+public class OriginalLabelDataController extends AbstractCdmDetailElement<DerivedUnitFacade> implements CdmCompositeController, ModifyListener{
private final OriginalLabelDataElement originalLabelDataElement;
public OriginalLabelDataController(CdmFormFactory formFactory, ICdmFormElement parentElement, OriginalLabelDataElement originalLabelDataElement, int style) {
super(formFactory, parentElement);
this.originalLabelDataElement = originalLabelDataElement;
+ this.originalLabelDataElement.getText().addModifyListener(this);
}
/* (non-Javadoc)
*/
@Override
protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
- originalLabelDataElement.getText().setText(entity.getTitleCache());
+ String originalLabelInfo = entity.innerDerivedUnit().getOriginalLabelInfo();
+ if(originalLabelInfo!=null){
+// originalLabelDataElement.getText().setText(originalLabelInfo);
+ }
+ }
+
+ /* (non-Javadoc)
+ * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
+ */
+ @Override
+ public void modifyText(ModifyEvent e) {
+ getEntity().innerDerivedUnit().setOriginalLabelInfo(originalLabelDataElement.getText().getText());
+ firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e));
}
/* (non-Javadoc)
@Override
public void handleEvent(Object eventSource) {
}
+
}
tableWrapLayout.leftMargin = 0;
tableWrapLayout.horizontalSpacing = 0;
tableWrapLayout.bottomMargin = 0;
- tableWrapLayout.numColumns = 3;
+ tableWrapLayout.numColumns = 2;
setLayout(tableWrapLayout);
}
lblOriginalLabelData.setLayoutData(new TableWrapData(TableWrapData.RIGHT, TableWrapData.TOP, 1, 1));
lblOriginalLabelData.setText("Original Label Data");
- text = new Text(this, SWT.BORDER | SWT.READ_ONLY | SWT.WRAP | SWT.MULTI);
- text.setEditable(false);
+ text = new Text(this, SWT.BORDER | SWT.WRAP | SWT.MULTI);
text.setLayoutData(new TableWrapData(TableWrapData.FILL_GRAB, TableWrapData.TOP, 1, 1));
new Label(this, SWT.NONE);
*/
@Override
public String getHeading() {
- return "Original Label Data: ";
- }
-
- /* (non-Javadoc)
- * @see org.eclipse.ui.forms.widgets.ExpandableComposite#setText(java.lang.String)
- */
- @Override
- public void setText(String title) {
- String text = getHeading();
- if(getEntity()!=null){// && getEntity().getOriginalLabelData!=null){
- String titleCache = getEntity().getTitleCache();
- text += titleCache.substring(0, Math.min(10, titleCache.length()));
- text += "...";
- }
- if(text!=null){
- super.setText(text);
- }
- else{
- super.setText(title);
- }
+ return "Original Label Data";
}
/* (non-Javadoc)
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.IOccurrenceService;
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.common.DefinedTerm;
import eu.etaxonomy.cdm.model.molecular.DnaSample;
import eu.etaxonomy.cdm.model.molecular.Sequence;
import eu.etaxonomy.cdm.model.molecular.SingleRead;
-import eu.etaxonomy.cdm.model.occurrence.Collection;
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
import eu.etaxonomy.cdm.model.occurrence.GatheringEvent;
label += mediaSpecimen.getMediaSpecimen().getTitle()!=null?mediaSpecimen.getMediaSpecimen().getTitle().getText()+", ":"[no motif]";
label += mediaSpecimen.getMediaSpecimen().getArtist()!=null?mediaSpecimen.getMediaSpecimen().getArtist()+", ":"";
label += mediaSpecimen.getAccessionNumber()!=null?mediaSpecimen.getAccessionNumber()+", ":"";
- Collection collection = mediaSpecimen.getCollection();
+ eu.etaxonomy.cdm.model.occurrence.Collection collection = mediaSpecimen.getCollection();
if(collection!=null){
label += collection.getName()!=null?collection.getName()+" ":"";
}
if(fieldUnits!=null && !fieldUnits.isEmpty()){
FieldUnit fieldUnit = fieldUnits.iterator().next();
GatheringEvent gatheringEvent = fieldUnit.getGatheringEvent();
+// gatheringEvent = HibernateProxyHelper.deproxy(gatheringEvent, GatheringEvent.class);
if(gatheringEvent!=null){
label += gatheringEvent.getCollector()!=null?gatheringEvent.getCollector()+", ":"";
}
label += fieldUnit.getFieldNumber()!=null?fieldUnit.getFieldNumber()+", ":"";
}
- Collection collection = derivedUnit.getCollection();
+ eu.etaxonomy.cdm.model.occurrence.Collection collection = derivedUnit.getCollection();
if(collection!=null){
label += collection.getName()!=null?collection.getName()+" ":"";
label += collection.getCode()!=null?"("+collection.getCode()+"), ":"";
}
else if(derivedUnit.getRecordBasis()==SpecimenOrObservationType.TissueSample){
//TODO: implement
-// kindofTissue + SampleDesignation
+ label += "kindofTissue? + SampleDesignation?";
}
}
else if(element instanceof Sequence){
private final DerivateSearchComposite derivateSearchComposite;
private IIdentifiableEntityServiceConfigurator<SpecimenOrObservationBase<DerivedUnitFacadeCacheStrategy>> configurator;
private EnumTermComboController<SpecimenOrObservationType> enumTermComboController;
+ private final DerivateSearchView derivateSearchView;
/**
* @param parent
+ * @param derivateSearchView
*/
- public DerivateSearchCompositeController(Composite parent) {
+ public DerivateSearchCompositeController(Composite parent, DerivateSearchView derivateSearchView) {
this.derivateSearchComposite = new DerivateSearchComposite(parent, SWT.NONE);
+ this.derivateSearchView = derivateSearchView;
init();
}
}
private void searchDerivates(){
+ if(!derivateSearchView.getConversationHolder().isBound()){
+ derivateSearchView.setFocus(); //rebind the conversation
+ }
+
configurator.setTitleSearchString(derivateSearchComposite.getSearchField().getText());
SpecimenOrObservationType type = enumTermComboController.getSelection();
//filter by specimen type
*/
@Override
public void createPartControl(Composite parent) {
- derivateSearchCompositeController = new DerivateSearchCompositeController(parent);
+ derivateSearchCompositeController = new DerivateSearchCompositeController(parent, this);
getSite().setSelectionProvider(derivateSearchCompositeController.getResultViewer());
derivateSearchCompositeController.setEnabled(CdmStore.isActive());
}
<properties>
<java.codelevel>1.6</java.codelevel>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cdmlib.version>3.3.6-SNAPSHOT</cdmlib.version>
+ <cdmlib.version>3.4.0-SNAPSHOT</cdmlib.version>
<!-- TODO can we use project.version ????? -->
<tycho.version>0.14.0</tycho.version>
<taxeditor.version>3.3.6-SNAPSHOT</taxeditor.version>