Bundle-ManifestVersion: 2
Bundle-Name: Application
Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Bundle-Activator: eu.etaxonomy.taxeditor.TaxonomicEditorPlugin
Bundle-Vendor: EDIT
Bundle-Localization: OSGI-INF/l10n/plugin
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Bulkeditor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: CDM Library Dependencies Plugin
Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Eclipse-BundleShape: dir
Export-Package: com.sun.istack.internal.tools,
com.sun.istack.internal.ws,
Bundle-ClassPath: .,
lib/apache-log4j-extras-1.2.17.jar,
lib/aspectjrt-1.9.7.jar,
- lib/cdmlib-commons-5.30.0.jar,
- lib/cdmlib-ext-5.30.0.jar,
- lib/cdmlib-io-5.30.0.jar,
- lib/cdmlib-model-5.30.0.jar,
- lib/cdmlib-api-5.30.0.jar,
- lib/cdmlib-persistence-5.30.0.jar,
- lib/cdmlib-cache-5.30.0.jar,
- lib/cdmlib-services-5.30.0.jar,
+ lib/cdmlib-commons-5.31.0.jar,
+ lib/cdmlib-ext-5.31.0.jar,
+ lib/cdmlib-io-5.31.0.jar,
+ lib/cdmlib-model-5.31.0.jar,
+ lib/cdmlib-api-5.31.0.jar,
+ lib/cdmlib-persistence-5.31.0.jar,
+ lib/cdmlib-cache-5.31.0.jar,
+ lib/cdmlib-services-5.31.0.jar,
lib/commons-beanutils-1.9.4.jar,
lib/commons-codec-1.15.jar,
lib/commons-collections-3.2.2.jar,
lib/apache-log4j-extras-1.2.17.jar,\
lib/aspectjrt-1.9.7.jar,\
lib/aspectjweaver-1.9.7.jar,\
- lib/cdmlib-commons-5.30.0.jar,\
- lib/cdmlib-ext-5.30.0.jar,\
- lib/cdmlib-io-5.30.0.jar,\
- lib/cdmlib-model-5.30.0.jar,\
- lib/cdmlib-api-5.30.0.jar,\
- lib/cdmlib-persistence-5.30.0.jar,\
- lib/cdmlib-services-5.30.0.jar,\
+ lib/cdmlib-commons-5.31.0.jar,\
+ lib/cdmlib-ext-5.31.0.jar,\
+ lib/cdmlib-io-5.31.0.jar,\
+ lib/cdmlib-model-5.31.0.jar,\
+ lib/cdmlib-api-5.31.0.jar,\
+ lib/cdmlib-persistence-5.31.0.jar,\
+ lib/cdmlib-services-5.31.0.jar,\
lib/commons-beanutils-1.9.4.jar,\
lib/commons-codec-1.15.jar,\
lib/commons-collections-3.2.2.jar,\
lib/lucene-analyzers-common-5.4.1.jar,\
lib/lucene-sandbox-5.4.1.jar,\
lib/lucene-suggest-5.4.1.jar,\
- lib/cdmlib-cache-5.30.0.jar,\
+ lib/cdmlib-cache-5.31.0.jar,\
lib/org.swtchart_0.10.0.v20160212.jar,\
lib/commons-collections4-4.4.jar,\
lib/commons-math3-3.6.1.jar,\
<parent>\r
<groupId>eu.etaxonomy</groupId>\r
<artifactId>taxeditor-parent</artifactId>\r
- <version>5.30.0</version>\r
+ <version>5.31.0</version>\r
</parent>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
private static List<CdmServerInfoConfig> createDefaultServerConfigList() {
List<CdmServerInfoConfig> serverInfoList = new ArrayList<>();
- serverInfoList.add(new CdmServerInfoConfig(NAME_PRODUCTION, SERVER_PRODUCTION, 80, "", false));
+ serverInfoList.add(new CdmServerInfoConfig(NAME_PRODUCTION, SERVER_PRODUCTION, 443, "", false));
serverInfoList.add(new CdmServerInfoConfig(NAME_DEMO_1, SERVER_DEMO_1, 80, CDMSERVER_PREFIX, false));
serverInfoList.add(new CdmServerInfoConfig(NAME_LOCALHOST, SERVER_LOCALHOST, 8080, CDMSERVER_PREFIX, true));
return serverInfoList;
Bundle-ManifestVersion: 2
Bundle-Name: Editor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: OSGI-INF/l10n/plugin
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@Inject
private MPart thisPart;
- @Persist
+ @Override
+ @Persist
public void save(IProgressMonitor monitor) {
getConversationHolder().commit(true);
setDirty(false);
}
}
- public boolean isDirty() {
+ @Override
+ public boolean isDirty() {
return dirty.isDirty();
}
@Optional
private void updateView(@UIEventTopic(WorkbenchEventConstants.REFRESH_NAME_EDITOR) List<CdmBase> cdmBases) {
+ if (cdmBases == null){
+ return;
+ }
for (CdmBase cdmBase: cdmBases){
if (cdmBase instanceof Taxon || cdmBase instanceof TaxonName){
if (this.taxon != null && (this.taxon.equals(cdmBase)
DerivedUnit derivedUnit = createDerivative();
if(derivedUnit!=null){
specimenOrObservationBase.addDerivationEvent(DerivationEvent.NewSimpleInstance(specimenOrObservationBase, derivedUnit, getDerivationeType()));
- derivedUnit.setCacheStrategy(new DerivedUnitFacadeCacheStrategy());
+ derivedUnit.setCacheStrategy(DerivedUnitFacadeCacheStrategy.NewInstance());
derivedUnit.getTitleCache(); //update title cache
createdElement = derivedUnit;
CdmStore.getService(IOccurrenceService.class).merge((SpecimenOrObservationBase<?>) selectedDerivative, true);
<feature\r
id="eu.etaxonomy.taxeditor.feature.platform"\r
label="Taxeditor Dependencies"\r
- version="5.30.0"\r
+ version="5.31.0"\r
os="linux,macosx,win32"\r
ws="cocoa,gtk,win32"\r
arch="x86,x86_64">\r
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature.platform</artifactId>
<feature\r
id="eu.etaxonomy.taxeditor.feature"\r
label="Taxonomic Editor"\r
- version="5.30.0"\r
+ version="5.31.0"\r
provider-name="EDIT"\r
plugin="eu.etaxonomy.taxeditor.application"\r
os="linux,macosx,win32"\r
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.feature</artifactId>
Bundle-ManifestVersion: 2
Bundle-Name: Help
Bundle-SymbolicName: eu.etaxonomy.taxeditor.help; singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Bundle-Activator: eu.etaxonomy.taxeditor.help.Activator
Bundle-Vendor: EDIT
Require-Bundle: org.eclipse.ui,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Local
Bundle-SymbolicName: eu.etaxonomy.taxeditor.local;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface,
org.eclipse.ui.ide,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.local</artifactId>
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Bundle-ClassPath: .,
lib/owlapi-xmlutils-4.1.4.jar,
lib/commons-collections4-4.1.jar,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<name>Molecular Library Dependencies Bundle</name>
Bundle-ManifestVersion: 2
Bundle-Name: Molecular Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Bundle-Activator: eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: Navigation Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.taxeditor.navigation,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
import org.eclipse.e4.ui.workbench.modeling.EModelService;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
+import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.LocalSelectionTransfer;
+import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.IElementComparer;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
viewer.setExpandedElements(expandedElements);
}
}
+
+
}
\ No newline at end of file
Bundle-ManifestVersion: 2
Bundle-Name: Printpublisher Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Export-Package: eu.etaxonomy.cdm.print,
eu.etaxonomy.cdm.print.out,
eu.etaxonomy.cdm.print.out.odf,
eu.etaxonomy.taxeditor.editor,
eu.etaxonomy.taxeditor.store
Bundle-ClassPath: .,
- lib/cdmlib-print-5.30.0.jar,
- lib/cdmlib-remote-5.30.0.jar
+ lib/cdmlib-print-5.31.0.jar,
+ lib/cdmlib-remote-5.31.0.jar
Import-Package: org.apache.log4j,
org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
bin.includes = META-INF/,\
.,\
plugin.xml,\
- lib/cdmlib-print-5.30.0.jar,\
- lib/cdmlib-remote-5.30.0.jar,\
+ lib/cdmlib-print-5.31.0.jar,\
+ lib/cdmlib-remote-5.31.0.jar,\
OSGI-INF/l10n/bundle.properties,\
OSGI-INF/l10n/bundle_de.properties,\
<parent>
<artifactId>taxeditor-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Bundle-ManifestVersion: 2
Bundle-Name: DataStore Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
Bundle-Vendor: EDIT
Bundle-Localization: OSGI-INF/l10n/bundle
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
private void addChildTermsToMenuManager(List<MMenuElement> items, TermType termType, boolean skipChildren) {
//FIXME : need a better way to find out if a term type can be editable (ticket 3853)
- if(termType.getEmptyDefinedTermBase() != null) {
+ if(termType.getEmptyDefinedTermBase(PreferencesUtil.getGlobalLanguage()) != null) {
Set<TermType> children = termType.getGeneralizationOf();
// term type has no children, so create menu item
if(skipChildren || children.isEmpty()) {
private void addChildTermsToMenuManager(List<MMenuElement> items, TermType termType, boolean skipChildren) {
//FIXME : need a better way to find out if a term type can be editable (ticket 3853)
- if(termType.getEmptyDefinedTermBase() != null) {
+ if(termType.getEmptyDefinedTermBase(PreferencesUtil.getGlobalLanguage()) != null) {
Set<TermType> children = termType.getGeneralizationOf();
// term type has no children, so create menu item
if(skipChildren || children.isEmpty()) {
import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;\r
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
import eu.etaxonomy.taxeditor.store.CdmStore;\r
\r
/**\r
throws ExecutionException {\r
TermDto newTerm = null;\r
if(parent instanceof TermDto){\r
- newTerm = CdmStore.getService(ITermService.class).addNewTerm(definedTermInput.getTermType(), parent.getUuid(), addTermAsKindOf);\r
+ newTerm = CdmStore.getService(ITermService.class).addNewTerm(definedTermInput.getTermType(), parent.getUuid(), addTermAsKindOf, PreferencesUtil.getGlobalLanguage());\r
}\r
else if(parent instanceof TermVocabularyDto){\r
- newTerm = CdmStore.getService(IVocabularyService.class).addNewTerm(definedTermInput.getTermType(), parent.getUuid());\r
+ newTerm = CdmStore.getService(IVocabularyService.class).addNewTerm(definedTermInput.getTermType(), parent.getUuid(), PreferencesUtil.getGlobalLanguage());\r
}\r
// newTerm.setTitleCache("_" + newTerm.getTitleCache());\r
return postExecute(newTerm);\r
import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;\r
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;\r
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;\r
import eu.etaxonomy.taxeditor.store.CdmStore;\r
\r
/**\r
throws ExecutionException {\r
\r
TermType type= definedEditorInput.getTermType();\r
- DefinedTermBase test = type.getEmptyDefinedTermBase();\r
+ DefinedTermBase test = type.getEmptyDefinedTermBase(PreferencesUtil.getGlobalLanguage());\r
TermVocabulary termVocabulary = null;\r
if (test instanceof OrderedTermBase){\r
- termVocabulary = OrderedTermVocabulary.NewInstance(definedEditorInput.getTermType(),\r
- null,\r
- "Untitled",\r
- null,\r
- null);\r
+ termVocabulary = OrderedTermVocabulary.NewInstance(definedEditorInput.getTermType());\r
+ termVocabulary.setLabel("Untitled", PreferencesUtil.getGlobalLanguage()); \r
}\r
\r
if (termVocabulary == null){\r
termVocabulary =\r
TermVocabulary.NewInstance(definedEditorInput.getTermType(),\r
- null,\r
+ null,null, \r
"Untitled",\r
null,\r
- null);\r
+ null, PreferencesUtil.getGlobalLanguage());\r
}\r
\r
termVocabulary = CdmStore.getService(IVocabularyService.class).save(termVocabulary);\r
DeleteConfiguration_media_removeFromGallery=Remove the media from the image gallery but leave it in database
DeleteConfiguration_media_deleteIfUsedInTaxonDescription=Delete also if media is used in taxon description
-DeleteConfiguration_media_deleteIfUsedSomeWhereElse=Delete the media also if it is used somewhere else
+DeleteConfiguration_media_deleteIfUsedSomeWhereElse=Delete from taxon and specimen descriptions or if used as protologue for taxon names
DeleteConfiguration_media_delete=Remove the media from the image gallery and delete the media completely, if possible
DeleteResultMessagingUtils_ABORT=Delete was aborted
DeleteResultMessagingUtils_SUCCES=Delete was successful
DeleteConfiguration_media_removeFromGallery=Entferne Mediendaten aus der Gallerie, aber behalte sie in der Datenbank
DeleteConfiguration_media_deleteIfUsedInTaxonDescription=Lösche die Mediendaten, auch wenn sie Teil einer Taxonbeschreibung ist
-DeleteConfiguration_media_deleteIfUsedSomeWhereElse=Lösche die Mediendaten vollständig, auch wenn sie an anderer Stelle verwendet werden
+DeleteConfiguration_media_deleteIfUsedSomeWhereElse=Lösche die Mediendaten vollständig, auch wenn sie in einer Beschreibung oder als Protolog verwendet werden.
DeleteConfiguration_media_delete=Entferne die Mediendaten aus der Gallerie und lösche sie aus der Datenbank, wenn sie nicht anderweitig verwendet werden.
DeleteResultMessagingUtils_ABORT=Löschen wurde abgebrochen
DeleteResultMessagingUtils_SUCCES=Löschen war erfolgreich
name = "No name provided";
}
Language language = commonName.getLanguage();
- if (language == null) {
- name += " (No language provided)";
- } else {
-
- String languageLabel = language.getPreferredRepresentation(CdmStore.getDefaultLanguage()).getLabel();
-
- name += " (" + languageLabel + ")";
+ NamedArea area = commonName.getArea();
+ String areaLabel = null;
+ String languageLabel = null;
+ if (area != null){
+ areaLabel = area.getPreferredRepresentation(CdmStore.getDefaultLanguage()).getLabel();
+ }
+ if (language != null){
+ languageLabel = language.getPreferredRepresentation(CdmStore.getDefaultLanguage()).getLabel();
+ }
+ if (areaLabel != null || languageLabel != null){
+ name += " (" ;
+ if (languageLabel != null){
+ name += languageLabel;
+ }
+ if (areaLabel != null){
+ if (languageLabel != null){
+ name += ", ";
+ }
+ name += areaLabel;
+ }
+ name += ")";
}
+
+
return name;
}
\r
import eu.etaxonomy.cdm.model.metadata.CdmPreference;\r
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;\r
+import eu.etaxonomy.taxeditor.event.EventUtility;\r
+import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;\r
import eu.etaxonomy.taxeditor.l10n.Messages;\r
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;\r
\r
}\r
PreferencesUtil.setBooleanValue(PreferencesUtil.prefOverrideKey(PreferencePredicate.ShowTaxonNodeWizard.getKey()), isOverrideShowTaxonNodeWizard);\r
}\r
-\r
+ EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAVIGATOR, true);\r
}\r
+ \r
return true;\r
\r
}\r
private final static String EDITOR_PREFERENCES_NODE = "eu.etaxonomy.taxeditor";
public static final String PREFERRED_TERMS_CHANGE = "preferred_terms";
-
+ public static final String UPDATE_NAVIGATOR = "update_navigator";
public static final String P2_REPOSITORIES_DELIM = ",";
public static final String P2_REPOSITORY_FIELDS_DELIM = ";";
public static final String SUBJECT_DELIM = "/";
getPreferenceStore().firePropertyChangeEvent(PREFERRED_TERMS_CHANGE,
null, clazz);
}
+
+ public static void firePreferencesChangedForNavigator() {
+ getPreferenceStore().firePropertyChangeEvent(UPDATE_NAVIGATOR,
+ null, null);
+ }
public static String createPreferenceString(String property){
package eu.etaxonomy.taxeditor.store;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collection;
import java.util.Comparator;
import java.util.HashMap;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.UUID;
+import org.apache.commons.lang3.StringUtils;
+
+import eu.etaxonomy.cdm.api.service.ITermService;
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
import eu.etaxonomy.cdm.model.term.TermBase;
import eu.etaxonomy.cdm.model.term.TermType;
filteredTerms.add(type);
}
}
-
+
if(PreferencesUtil.getBooleanValue(getPrefName(term), true)){
filteredTerms.add(term);
}
preferredTerms = cachedTermMap.get(initialTerms.get(0).getVocabulary().getUuid());
}
if (preferredTerms == null){
- preferredTerms = cachedTermMap.get(initialTerms.get(0).getTermType());
+ preferredTerms = cachedTermMap.get(initialTerms.get(0).getTermType().getUuid());
}
if (preferredTerms == null){
return initialTerms;
return filteredTerms;
}
+
+ public <T extends DefinedTermBase>List<T> createTermListFromString(String stringValue, TermType type){
+ List<String> checked = new ArrayList<>();
+
+ if (stringValue != null){
+ String[] listChecked = stringValue.split(";"); //$NON-NLS-1$
+ String[] listCheckedComma = stringValue.split(","); //$NON-NLS-1$
+ if (listChecked != null ){
+ checked = Arrays.asList(listChecked);
+ }
+ if (listCheckedComma != null && stringValue.contains(",")){ //$NON-NLS-1$
+ checked = Arrays.asList(listCheckedComma);
+ }
+ }
+ List<T> termsFromStringValues = getTermsFromStringValues(checked, type);
+ return termsFromStringValues;
+ }
+
+ protected <T extends DefinedTermBase>List<T> getTermsFromStringValues(List<String> listValue, TermType type) {
+ Collection<DefinedTermBase> termlist = new ArrayList<>();
+ ITermService termService = CdmStore.getService(ITermService.class);
+ Set<UUID> uuidList = new HashSet();
+ for (String s : listValue) {
+ if (!StringUtils.isBlank(s)){
+ UUID uuid = UUID.fromString(s);
+ uuidList.add(uuid);
+ }
+ }
+ if (!uuidList.isEmpty()){
+ termlist = termService.find(uuidList);
+ }
+
+ if (listValue == null || listValue.isEmpty() ){
+ termlist = termService.listByTermType(type, null, null, null, null);
+ }
+
+ return new ArrayList(termlist);
+ }
+
/**
* Generic method to get term preferences for a term vocabulary
*
clearTermMapForTermType(type);
List<TermDto> list = new ArrayList<>(preferredTerms);
- cachedTermMap.put(type, list);
+ cachedTermMap.put(type.getUuid(), list);
}
/**
}
public void clearTermMapForTermType(TermType termType){
- cachedTermMap.remove(termType);
+ cachedTermMap.remove(termType.getUuid());
}
/**
@Override
public void setBackground(Color color) {
- if (label != null) {
+ if (label != null && !label.isDisposed()) {
label.setBackground(color);
}
}
for(Entry<T, String> keyLabelPair : orderedTerms.entrySet()){
elementTypeList.add(keyLabelPair.getKey());
combo.add(keyLabelPair.getValue(), index);
+ combo.setData(keyLabelPair.getValue(), keyLabelPair.getKey());
index++;
}
}else if(enumType.equals(NomenclaturalCodeEdition.class)){
for (NomenclaturalCodeEdition codeEdition: elements){
elementTypeList.add((T)codeEdition);
combo.add(codeEdition.getLabel(), index);
+ combo.setData(codeEdition.getLabel(), (T)codeEdition);
index++;
}
}
elementTypeList.add(enumElement);
if (enumElement instanceof IEnumTerm) {
combo.add(((IEnumTerm) enumElement).getLabel(), index);
+ combo.setData(((IEnumTerm) enumElement).getLabel(), enumElement);
index++;
}else{
combo.add(((Enum) enumElement).name(), index);
+ combo.setData(((Enum) enumElement).name(), enumElement);
index++;
}
}
import org.eclipse.swt.events.SelectionEvent;
import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
+import eu.etaxonomy.cdm.model.name.Rank;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
import eu.etaxonomy.cdm.model.term.Representation;
import eu.etaxonomy.cdm.model.term.TermType;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
Comparator<T> comparator) {
super(cdmFormFactory, parentElement);
// labelString, selection, addEmptyElement, style, comparator
- terms = getTermManager().getPreferredTerms(TermType.NameRelationshipType);
+
+ String availableTypes = PreferencesUtil.getStringValue(PreferencePredicate.AvailableNameRelationshipType.getKey());
+ List<NameRelationshipType> relTypes = CdmStore.getTermManager().createTermListFromString(availableTypes, TermType.NameRelationshipType);
+
+// terms = getTermManager().getPreferredTerms(TermType.NameRelationshipType);
+
+ terms = relTypes;
// PreferencesUtil.get
this.useAbbrevLabel = useAbbrevLabel;
populateTerms();
int style, boolean useAbbrevLabel, Comparator<T> comparator) {
super(formFactory, parentElement);
- this.termType = termType;
+// this.termType = termType;
this.termVocabulary = termVocabulary;
this.termClass = termClass;
this.addEmptyElement = addEmptyElement;
}else if (terms != null){
addTerms(terms);
}
-
+ if (termType == null && terms != null && !terms.isEmpty()){
+ this.termType = terms.get(0).getTermType();
+ }else{
+ this.termType = termType;
+ }
addContentProposalAdapter();
combo.addSelectionListener(this);
int style, boolean useAbbrevLabel, Comparator<T> comparator) {
super(formFactory, parentElement);
- this.termType = termType;
+// this.termType = termType;
this.termVocabulary = termVocabulary;
this.termClass = termClass;
this.addEmptyElement = addEmptyElement;
}
else if(this.termClass!=null){
addTerms(getPreferredTerms());
- }else if (terms != null){
+ }else if (terms != null && !terms.isEmpty()){
addTerms(terms);
+
+ }
+ if (termType == null){
+ this.termType = terms.get(0).getTermType();
+ }else{
+ this.termType = termType;
}
if (element instanceof TeamOrPersonUuidAndTitleCache){
collectorTitleCache = ((TeamOrPersonUuidAndTitleCache)element).getCollectorTitleCache();
}
- if (!titleCache.equals(abbrevTitleCache)){
+ if (!titleCache.equals(abbrevTitleCache) && abbrevTitleCache != null){
titleCache += " - " + abbrevTitleCache;
}
if (collectorTitleCache != null && !uuidAndTitleCache.getTitleCache().equals(collectorTitleCache) && !abbrevTitleCache.equals(collectorTitleCache)){
Control control =getSearchField();
lastSelectedReferences = PreferencesUtil.getLastSelectedReferences();
if (firstCall && author != null){
- pattern = author.getNomenclaturalTitleCache();
+ int authorID = author.getId();
if (control!= null){
firstCall = false;
- model = CdmStore.getService(IReferenceService.class).getUuidAndAbbrevTitleCacheForAuthor(null, pattern, null);
+ model = CdmStore.getService(IReferenceService.class).getUuidAndAbbrevTitleCacheForAuthorID(null, authorID, null);
}
}else{
package eu.etaxonomy.taxeditor.ui.dialog.selection;
+import java.util.List;
import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
for (ICdmFormElement element : getElements()) {
element.setBackground(color);
}
- getLayoutComposite().setBackground(color);
+ if (!getLayoutComposite().isDisposed()){
+ getLayoutComposite().setBackground(color);
+ }
super.setBackground(color);
}
import eu.etaxonomy.cdm.model.name.TextualTypeDesignation;
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
+import eu.etaxonomy.cdm.model.occurrence.OccurrenceStatus;
import eu.etaxonomy.cdm.model.permission.GrantedAuthorityImpl;
import eu.etaxonomy.cdm.model.permission.Group;
import eu.etaxonomy.cdm.model.permission.User;
import eu.etaxonomy.taxeditor.ui.section.occurrence.GatheringEventDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.GeoScopeDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.GeoScopePolyKeyDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.OccurrenceStatusElement;
import eu.etaxonomy.taxeditor.ui.section.occurrence.OriginalLabelDataSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.SourceCollectionDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.SpecimenCollectionDetailElement;
import eu.etaxonomy.taxeditor.ui.section.occurrence.SpecimenCollectionDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.occurrence.StatusCollectionDetailSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.association.DerivedUnitTypeDesignationElement;
import eu.etaxonomy.taxeditor.ui.section.occurrence.association.DerivedUnitTypeDesignationSection;
import eu.etaxonomy.taxeditor.ui.section.occurrence.association.TaxonAssociationDetailElement;
addAndAdaptSection(parentElement, section);
return section;
}
+
+ public StatusCollectionDetailSection createStatusCollectionDetailSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){
+ StatusCollectionDetailSection section = new StatusCollectionDetailSection(this, conversation, parentElement, style);
+ addAndAdaptSection(parentElement, section);
+ return section;
+ }
public ScopeRestrictionSection createScopeRestrictionSection(ConversationHolder conversation, ICdmFormElement parentElement, int style){
ScopeRestrictionSection section = new ScopeRestrictionSection(this, conversation, parentElement, style);
element = new InapplicableIfCollectionElementForDto(this, parentElement, (FeatureStateDto) entity, removeListener, backgroundColor, style);
} else if (entity instanceof FeatureStateDto && parentElement instanceof OnlyApplicableIfEntityCollectionSection) {
element = new OnlyApplicableIfCollectionElementForDto(this, parentElement, (FeatureStateDto) entity, removeListener, backgroundColor, style);
+ }else if (entity instanceof OccurrenceStatus) {
+ element = new OccurrenceStatusElement(this, parentElement, (OccurrenceStatus)entity, removeListener, style);
}
//check for parent section when entity is null
import org.apache.log4j.Logger;
import org.eclipse.swt.SWT;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
import eu.etaxonomy.cdm.model.name.IBacterialName;
import eu.etaxonomy.cdm.model.name.ICultivarPlantName;
import eu.etaxonomy.cdm.model.name.IFungusName;
if (o2 == null){
return -1;
}
- return o1.compareTo(o2);
+ return -1*o1.compareTo(o2);
}
};
}
private List<Rank> getRanks(INonViralName name, NomenclaturalCode code) {
List<Rank> ranks = new ArrayList<>();
- List<DefinedTermBase> allRanks = CdmStore.getTermManager().getPreferredTerms(TermType.Rank);
+ String availableRanks = PreferencesUtil.getStringValue(PreferencePredicate.AvailableRanks.getKey());
+ List<DefinedTermBase> allRanks = CdmStore.getTermManager().createTermListFromString(availableRanks, TermType.Rank);
for(DefinedTermBase term: allRanks){
Rank rank = (Rank)term;
if (rank.isCultivar() == code.equals(NomenclaturalCode.ICNCP)){
package eu.etaxonomy.taxeditor.ui.section.name;
import java.util.Comparator;
+import java.util.List;
import org.eclipse.swt.events.SelectionListener;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
import eu.etaxonomy.cdm.model.term.TermType;
import eu.etaxonomy.taxeditor.preference.NameDetailsConfigurator;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
}
};
- nomenclaturalStatusTypeCombo = formFactory.createDefinedTermComboElement(TermType.NomenclaturalStatusType, this, "Status", null,true, style, true);
- nomenclaturalStatusTypeCombo.setTermComparator(termComparator);
+ String availableStatus = PreferencesUtil.getStringValue(PreferencePredicate.AvailableNomenclaturalStatus.getKey());
+ List<NomenclaturalStatusType> allStatus = CdmStore.getTermManager().createTermListFromString(availableStatus, TermType.NomenclaturalStatusType);
+
+ nomenclaturalStatusTypeCombo = formFactory.createDefinedTermComboElement(allStatus, this, "Status", null,style, termComparator);
+
if (config == null || config.isNomenclaturalStatusRuleConsideredActivated()){
ruleConsidered = formFactory.createRuleConsideredElement(this, "Rule Considered", config == null || config.isNomenclaturalStatusRuleConsideredCodeEditionActivated(), style);
}
*/
package eu.etaxonomy.taxeditor.ui.section.name;
+import java.util.List;
+
import org.eclipse.swt.events.SelectionListener;
import eu.etaxonomy.cdm.compare.name.TypeDesignationStatusComparator;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
+import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
+import eu.etaxonomy.cdm.model.name.NameRelationshipType;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
import eu.etaxonomy.cdm.model.term.TermType;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
+import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
.createSelectionElement(DerivedUnit.class,
formElement, "Specimen", null,
EntitySelectionElement.ALL, style);
- combo_typeStatus = formFactory.createDefinedTermComboElement(TermType.SpecimenTypeDesignationStatus,
- formElement, "Designation Status", null, style, new TypeDesignationStatusComparator<SpecimenTypeDesignationStatus>());
-
+ String availableTypes = PreferencesUtil.getStringValue(PreferencePredicate.SpecimenTypeDesignationStatus.getKey());
+ List<SpecimenTypeDesignationStatus> relTypes = CdmStore.getTermManager().createTermListFromString(availableTypes, TermType.SpecimenTypeDesignationStatus);
+// combo_typeStatus = formFactory.createDefinedTermComboElement(TermType.SpecimenTypeDesignationStatus,
+// formElement, "Designation Status", null, style, new TypeDesignationStatusComparator<SpecimenTypeDesignationStatus>());
+ combo_typeStatus = formFactory.createDefinedTermComboElement(relTypes, formElement, "Designation Status", null,style, new TypeDesignationStatusComparator<SpecimenTypeDesignationStatus>());
+
super.createControls(formElement, style);
setEntity(entity);
}
private OriginalLabelDataElement textOriginalLabel;
private DerivedUnitMediaSection mediaDetailElement;
-
+
/**
super.createControls(formElement, entity, style);
-
- section_source = formFactory.createSourceCollectionDetailSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(SourceCollectionDetailSection.class, entity.getClass().getCanonicalName()));
+
+
+ section_source = formFactory.createSourceCollectionDetailSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(SourceCollectionDetailSection.class, entity.getClass().getCanonicalName()));
section_source.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
section_source.setEntity(entity);
import eu.etaxonomy.cdm.model.common.LanguageString;
import eu.etaxonomy.cdm.model.location.NamedArea;
import eu.etaxonomy.cdm.model.occurrence.Collection;
+import eu.etaxonomy.cdm.model.occurrence.OccurrenceStatus;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.StoreUtil;
import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
+import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
import eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement;
private GatheringEventUnitElement element_elevation;
private UriWithLabelElement uriPreferredStableUri;
private CheckboxElement checkIsPublish;
+ private StatusCollectionDetailSection section_status;
public DerivedUnitGeneralDetailElement(CdmFormFactory formFactory,
formElement, "Accession Number", entity.getAccessionNumber(),
style);
uriPreferredStableUri = formFactory.createUriWithLabelElement(formElement, "Pref. Stable URI", entity.getPreferredStableUri(), style);
- checkIsPublish = formFactory.createCheckbox(formElement, "Publish", entity.innerDerivedUnit().isPublish(), style);
+ section_status = formFactory.createStatusCollectionDetailSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(SourceCollectionDetailSection.class, entity.getClass().getCanonicalName()));
+ section_status.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+ section_status.setEntity(entity);
+
+ checkIsPublish = formFactory.createCheckbox(formElement, "Publish", entity.innerDerivedUnit().isPublish(), style);
}
--- /dev/null
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
+
+import org.eclipse.swt.events.SelectionListener;
+import org.eclipse.swt.graphics.Color;
+
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
+import eu.etaxonomy.cdm.model.common.ExtensionType;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.occurrence.OccurrenceStatus;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
+import eu.etaxonomy.cdm.model.term.DefinedTermBase;
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
+import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator;
+import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
+import eu.etaxonomy.taxeditor.ui.section.reference.SingleSourceSection;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractOriginalSourceElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractSingleSourceElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractSourcedEntityBaseElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.AbstractSourcedEntityElement;
+import eu.etaxonomy.taxeditor.ui.section.supplemental.IdentifiableSourceElement;
+
+public class OccurrenceStatusElement extends AbstractSourcedEntityElement<OccurrenceStatus>{
+
+ private TermComboElement<DefinedTerm> combo_statusType;
+
+// private IdentifiableSourceElement sourceElement;
+
+
+ public OccurrenceStatusElement(CdmFormFactory formFactory, AbstractFormSection section, OccurrenceStatus entity, SelectionListener removeListener, int style) {
+ super(formFactory, section, entity, removeListener, "Status", style);
+
+ }
+
+ @Override
+ public void setEntity(OccurrenceStatus entity) {
+ super.setEntity(entity);
+ if (combo_statusType != null){
+ DefinedTerm statusType = HibernateProxyHelper.deproxy(entity.getType());
+ combo_statusType.setSelection(statusType);
+ }
+ this.setSourceLabel("Source");
+
+
+ }
+
+ @Override
+ public void createControls(ICdmFormElement element, int style) {
+ combo_statusType = formFactory.createDefinedTermComboElement(TermType.OccurrenceStatusType, element, "Type", null, style);
+ if (entity != null){
+ setEntity(entity);
+ }
+ super.createControls(element, style);
+ this.setSourceLabel("Source");
+
+ }
+
+ @Override
+ public void handleEvent(Object eventSource) {
+ if(eventSource == combo_statusType){
+ getEntity().setType(combo_statusType.getSelection());
+ }
+ if (getParentElement() instanceof AbstractCdmDetailSection) {
+ ((AbstractCdmDetailSection<?>) getParentElement()).updateTitle();
+ }
+
+ }
+
+ @Override
+ public SelectionArbitrator getSelectionArbitrator() {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+
+}
--- /dev/null
+/**
+* Copyright (C) 2007 EDIT
+* European Distributed Institute of Taxonomy
+* http://www.e-taxonomy.eu
+*
+* The contents of this file are subject to the Mozilla Public License Version 1.1
+* See LICENSE.TXT at the top of this package for the full license terms.
+*/
+
+package eu.etaxonomy.taxeditor.ui.section.occurrence;
+
+import java.util.Collection;
+import java.util.Comparator;
+
+import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
+import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
+import eu.etaxonomy.cdm.model.common.IdentifiableSource;
+import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
+import eu.etaxonomy.cdm.model.occurrence.OccurrenceStatus;
+import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
+import eu.etaxonomy.taxeditor.store.CdmStore;
+import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
+import eu.etaxonomy.taxeditor.ui.section.DefaultCdmBaseComparator;
+
+/**
+ * <p>SourceCollectionDetailSection class.</p>
+ *
+ * @author n.hoffmann
+ * @created Oct 15, 2010
+ * @version 1.0
+ */
+public class StatusCollectionDetailSection extends
+ AbstractEntityCollectionSection<DerivedUnitFacade, OccurrenceStatus> {
+
+ /**
+ * <p>Constructor for SourceCollectionDetailSection.</p>
+ *
+ * @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
+ * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
+ * @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
+ * @param style a int.
+ */
+ public StatusCollectionDetailSection(CdmFormFactory formFactory,
+ ConversationHolder conversation, ICdmFormElement parentElement, int style) {
+ super(formFactory, conversation, parentElement, "Status", style);
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#getCollection(java.lang.Object)
+ */
+ /** {@inheritDoc} */
+ @Override
+ public Collection<OccurrenceStatus> getCollection(DerivedUnitFacade entity) {
+ if (entity.baseUnit() instanceof DerivedUnit){
+ return ((DerivedUnit)entity.baseUnit()).getStatus();
+ }
+ return null;
+ }
+
+ @Override
+ public Comparator<OccurrenceStatus> getComparator() {
+ return new DefaultCdmBaseComparator<>();
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#createNewElement()
+ */
+ /** {@inheritDoc} */
+ @Override
+ public OccurrenceStatus createNewElement() {
+ return OccurrenceStatus.NewInstance(null);
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#addElement(eu.etaxonomy.cdm.model.common.IVersionableEntity)
+ */
+ /** {@inheritDoc} */
+ @Override
+ public void addElement(OccurrenceStatus element) {
+ ((DerivedUnit)getEntity().baseUnit()).addStatus(element);
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#removeElement(eu.etaxonomy.cdm.model.common.IVersionableEntity)
+ */
+ /** {@inheritDoc} */
+ @Override
+ public void removeElement(OccurrenceStatus element) {
+ ((DerivedUnit)getEntity().baseUnit()).removeStatus(element);
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#getEmptyString()
+ */
+ /** {@inheritDoc} */
+ @Override
+ public String getEmptyString() {
+ return "No status yet.";
+ }
+
+ /* (non-Javadoc)
+ * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionSection#getTooltipString()
+ */
+ /** {@inheritDoc} */
+ @Override
+ protected String getTooltipString() {
+ return "Add status";
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public OccurrenceStatus addExisting() {
+ return null;
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ @Override
+ public boolean allowAddExisting() {
+ return false;
+ }
+
+ @Override
+ protected void setSectionTitle() {
+ DerivedUnitFacade entity = getEntity();
+ Collection<OccurrenceStatus> collection = getCollection(entity);
+ if(collection != null && collection.size() > 0){
+ String concatenatedLabels = "";
+ for (OccurrenceStatus status: collection){
+ concatenatedLabels += ", "+ (status != null && status.getType() != null? status.getType().getPreferredRepresentation(CdmStore.getDefaultLanguage()) : " - ");
+ }
+ concatenatedLabels = concatenatedLabels.replaceFirst(", ", ": ");
+ this.setText(getTitleString() + concatenatedLabels );
+ }else{
+ this.setText(getTitleString());
+ }
+ }
+
+}
import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.ui.forms.widgets.TableWrapData;
+import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
}
externalLinks = formFactory.createExternalLinksSection(getConversationHolder(), formElement, "Link(s)", StoreUtil.getSectionStyle(ExternalLinksSection.class, DescriptionElementSource.class.getCanonicalName()));
externalLinks.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 3));
- externalLinks.setEntity(entity);
+ externalLinks.setEntity(HibernateProxyHelper.deproxy(entity));
externalLinks.setFont(AbstractUtility.getFont(Resources.COLOR_FONT_DEFAULT));
externalLinks.setEmptySectionString("No links yet.");
selectionArbitrator = formFactory.createSelectionArbitrator(this);
}
this.isCommonNameReference = isCommonNameReference;
+
}
sourceElement.setEntity(entity.getSource());
}
-
+
}
@Override
this.label = sourceLabel;
if (sourceElement != null){
this.sourceElement.getReferenceSelectionElement().setLabel(sourceLabel);
+ this.sourceElement.refresh();
}
}
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.test
Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Bundle-ActivationPolicy: lazy
Bundle-Vendor: EDIT
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<artifactId>eu.etaxonomy.taxeditor.test</artifactId>
<!-- for packaging=eclipse-test-plugin
public void saveNewTerm() {
UUID vocNameFeatureUuid = UUID.fromString("fa7ca3eef-4092-49e1-beec-ed5096193e5e");
UUID vocFeatureUuid = UUID.fromString("b187d555-f06f-4d65-9e53-da7c93f8eaa8");
- Feature newTerm = (Feature)TermType.Feature.getEmptyDefinedTermBase();
+ Feature newTerm = (Feature)TermType.Feature.getEmptyDefinedTermBase(null);
newTerm.setLabel("CreateTest");
try {
eu.etaxonomy.taxeditor.workbench.datasource,
eu.etaxonomy.taxeditor.workbench.part
Bundle-Name: Workbench Bundle
-Bundle-Version: 5.30.0
+Bundle-Version: 5.31.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.e4.ui.workbench,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<?xml version="1.0" encoding="UTF-8"?>
-<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="5.30.0">
+<?pde version="3.5"?><product application="eu.etaxonomy.taxeditor.application.application" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" includeLaunchers="true" name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product" useFeatures="true" version="5.31.0">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<text>
<?xml version="1.0" encoding="UTF-8"?>
<?pde version="3.5"?>
-<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="5.30.0" useFeatures="true" includeLaunchers="true">
+<product name="EDIT Taxonomic Editor" uid="eu.etaxonomy.taxeditor.product.jre" id="eu.etaxonomy.taxeditor.application.eu_etaxonomy_taxeditor_product" application="eu.etaxonomy.taxeditor.application.application" version="5.31.0" useFeatures="true" includeLaunchers="true">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</prerequisites>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.30.0</version>
+ <version>5.31.0</version>
<name>EDIT Taxonomic Editor</name>
<description>The Taxonomic Editor for EDIT's platform for
cybertaxonomy
<properties>
<java.codelevel>1.8</java.codelevel>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <cdmlib.version>5.30.0</cdmlib.version>
+ <cdmlib.version>5.31.0</cdmlib.version>
<!-- TODO can we use project.version ????? -->
<!-- Increasing tycho above 0.22.0 will fail for the macosx build because
for higher version numbers tycho needs to be build against Eclipse Mars or
higher -->
<tycho.version>1.7.0</tycho.version>
- <taxeditor.version>5.30.0</taxeditor.version>
+ <taxeditor.version>5.31.0</taxeditor.version>
<update.dir>snapshot</update.dir>
<log4j.version>1.2.17</log4j.version>
<httpcomponents.version>4.5.13</httpcomponents.version>
<jetty-version>9.4.26.v20200117</jetty-version>
<doclint>none</doclint>
+
<!-- see according comment in cdmlib for possible finetuning -->
</properties>
<modules>
BGBM BDI Projects / taxeditor.git / commitdiff