Project

General

Profile

« Previous | Next » 

Revision dc12a332

Added by Katja Luther over 6 years ago

ref #6860: use timezone offset 0 and change joda DateTime to ZonedDateTime, until in lib DateTime is still joda a converter is used

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/media/MediaSpecimenGeneralDetailElement.java
22 22 
import eu.etaxonomy.cdm.model.occurrence.Collection;
23 23 
import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
24 24 
import eu.etaxonomy.cdm.model.reference.Reference;
25 
import eu.etaxonomy.taxeditor.model.DateConverter;
25 26 
import eu.etaxonomy.taxeditor.store.CdmStore;
26 27 
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
27 28 
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
......
73 74 
            comboKindOfUnit = formFactory.createDefinedTermComboElement(mediaSpecimenVocabulary, formElement, "Kind of Media", entity.getKindOfUnit(), style);
74 75 
            textTitleLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Motif", media.getTitle(), style);
75 76 
            selectionArtist = formFactory.createSelectionElement(AgentBase.class, getConversationHolder(), formElement, "Prepared by", media.getArtist(), EntitySelectionElement.ALL, style);
76 
            date = formFactory.createDateElement(formElement, "Preparation Date", entity.getMediaSpecimen().getMediaCreated(), style, true);
77 
            date = formFactory.createDateElement(formElement, "Preparation Date", DateConverter.convertJoda2ZonedDateTime(entity.getMediaSpecimen().getMediaCreated()), style, true);
77 78 
            textMethodLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Method", media.getDescription(Language.getDefaultLanguage()), style);
78 79 
            selection_collection = formFactory.createSelectionElement(Collection.class, getConversationHolder(), formElement, "Collection", entity.getCollection(), EntitySelectionElement.ALL, style);
79 80 
            text_accessionNumber = formFactory.createTextWithLabelElement(formElement, "Accession Number", entity.getAccessionNumber(), style);
......
108 109 
            media.putTitle(textTitleLanguageString.getLanguageString());
109 110 
        }
110 111 
        else if(eventSource==date.getController()){
111 
            DateTime dateTime = date.getController().getDateTime();
112 
            DateTime dateTime = DateConverter.convertZonedDateTime2Joda(date.getController().getDateTime());
112 113 
            media.setMediaCreated(dateTime);
113 114 
        }
114 115 
        else if(eventSource==selectionArtist){

Also available in: Unified diff