eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-*.jar
eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp.war
eu.etaxonomy.taxeditor.local/lib/postgresql-42.*.jar
+eu.etaxonomy.taxeditor.local/lib/cdmlib-remote-webapp-*.war
Bundle-ManifestVersion: 2
Bundle-Name: Application
Bundle-SymbolicName: eu.etaxonomy.taxeditor.application;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.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.18.2</version>
+ <version>5.19.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
* 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.perspective;
import org.eclipse.ui.IFolderLayout;
/**
* @author a.oppermann
* @created Nov 18, 2014
- * @version 1.0
*/
public class ChecklistPerspective extends Default {
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui
- * .IPageLayout)
- */
@Override
public void createInitialLayout(IPageLayout layout) {
IFolderLayout navigationFolder = layout.createFolder("navigation",
layout.addPlaceholder(MEDIA_VIEW, IPageLayout.RIGHT, 0.5f, FACTUAL_DATA_VIEW);
createAdditionalFolder(layout, layout.getEditorArea());
-
}
-}
+}
\ No newline at end of file
Bundle-ManifestVersion: 2
Bundle-Name: Bulkeditor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.bulkeditor;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.0
Bundle-Activator: eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.taxeditor.annotatedlineeditor,
command.label.2 = Entferne Kandidat f\u00fcr Duplikatenentfernung
command.label.3 = Dedupliziere Gruppe
command.label.4 = L\u00f6schen
-command.label.5 = Umwandeln in Person
+command.label.5 = In Person umwandeln
command.label.6 = Umwandeln in Team
command.name = Gruppen zusammenfügen
command.name.0 = Setze als Ziel für Gruppenzusammenfügung
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.18.2</version>
+ <version>5.19.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
*
* @author p.ciardelli
* @created 25.06.2009
- * @version 1.0
* @param <T>
*/
public interface IEntityContainer<T> {
/**
* <p>getEntity</p>
- *
- * @param <T> a T object.
- * @return a T object.
*/
T getEntity();
/**
* <p>getEditableText</p>
- *
- * @return a {@link java.lang.String} object.
*/
String getEditableText();
/**
* <p>getAttachedEntities</p>
- *
- * @return a {@link java.util.Set} object.
*/
Set<T> getAttachedEntities();
/**
* <p>markAsMerged</p>
- *
- * @param mergeTarget a T object.
*/
void markAsMerged(T mergeTarget);
/**
* <p>setText</p>
- *
- * @param text a {@link java.lang.String} object.
*/
void setText(String text);
* 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.annotatedlineeditor;
import java.util.Map;
-
/**
* <p>IEntityCreator interface.</p>
*
* @author p.ciardelli
* @created 03.07.2009
- * @version 1.0
*/
public interface IEntityCreator<T> {
* <p>createEntity</p>
*
* @param text a {@link java.lang.String} object.
- * @param <T> a T object.
* @return a T object.
*/
- T createEntity(String text);
+ public T createEntity(String text);
/**
* <p>createEntity</p>
* @param text a {@link java.lang.String} object.
* @return a T object.
*/
- T createEntity(Object key, String text);
+ public T createEntity(Object key, String text);
/**
* Get a map of keys for all objects that can be created by this entity creator
*
* @return a {@link java.util.Map} object.
*/
- Map<? extends Object, String> getKeyLabelPairs();
+ public Map<? extends Object, String> getKeyLabelPairs();
/**
* Return a flag indicating whether this creator also saves the entities
*
* @return true or false
*/
- boolean savesEntity();
-
-
-}
+ public boolean savesEntity();
+}
\ No newline at end of file
* 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.annotatedlineeditor;
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
-
/**
* Performs the retrieving and saving of a list of entities edited by a <code>ListEditor</code>,
* interacting with the persistence layer.
*
* @author p.ciardelli
* @created 07.07.2009
- * @version 1.0
*/
public interface IEntityPersistenceService<T> {
/**
* <p>create</p>
- *
- * @param entity a {@link java.lang.Object} object.
* @return a boolean.
*/
- T create(T entity);
+ public T create(T entity);
/**
* <p>save</p>
* @param entity a {@link java.lang.Object} object.
* @return a boolean.
*/
- T save(T entity);
+ public T save(T entity);
/**
* <p>merge</p>
* @param mergeTarget a {@link java.lang.Object} object.
* @return a boolean.
*/
- boolean merge(T entity, T mergeTarget);
+ public boolean merge(T entity, T mergeTarget);
/**
* <p>delete</p>
* @return a boolean.
* @throws ReferencedObjectUndeletableException
*/
- boolean delete(T entity, DeleteConfiguratorBase config) throws ReferencedObjectUndeletableException;
-}
+ public boolean delete(T entity, DeleteConfiguratorBase config) throws ReferencedObjectUndeletableException;
+}
\ No newline at end of file
* 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.bulkeditor;
-
/**
* <p>IBulkEditorConstants interface.</p>
*
* @author p.ciardelli
* @created 03.07.2009
- * @version 1.0
*/
public interface IBulkEditorConstants {
+
/** Constant <code>TYPE_MERGE_TARGET="merge_target_annotation"</code> */
public static final String TYPE_MERGE_TARGET = "merge_target_annotation";
/** Constant <code>TYPE_MERGE_CANDIDATE="merge_candidate_annotation"</code> */
public static final String DYNAMIC_OPEN_OBJECT_ID = "taxeditor-bulkeditor.dynamicnewobjectcommand";
/** Constant <code>DYNAMIC_DELETE_OBJECT_ID="taxeditor-bulkeditor.dynamicdeleteobjec"{trunked}</code> */
public static final String DYNAMIC_DELETE_OBJECT_ID = "taxeditor-bulkeditor.dynamicdeleteobjectcommand";
-}
+}
\ No newline at end of file
* 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.bulkeditor;
import java.util.Comparator;
/**
* @author n.hoffmann
* @created Dec 14, 2010
- * @version 1.0
*/
public interface IBulkEditorSortProvider<T> {
- /**
- *
- */
public Map<String, Comparator<T>> getComparators();
public Set<String> getComparatorNames();
public Comparator<T> getComparatorByName(String name);
-}
+}
\ No newline at end of file
* 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.bulkeditor.command;
import org.apache.log4j.Logger;
/**
* @author p.ciardelli
* @created 21.09.2009
- * @version 1.0
*/
public class BulkEditorPropertyTester extends PropertyTester {
@SuppressWarnings("unused")
- private static final Logger logger = Logger
- .getLogger(BulkEditorPropertyTester.class);
+ private static final Logger logger = Logger.getLogger(BulkEditorPropertyTester.class);
private static final String IS_MERGING_ENABLED = "isMergingEnabled";
}
return false;
}
-}
+}
\ No newline at end of file
* 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.bulkeditor.e4;
import java.io.FileOutputStream;
SpecimenOrObservationBase changedSpecimen = (SpecimenOrObservationBase)sel.getFirstElement();
getEditorInput().addSaveCandidate(changedSpecimen);
input.replaceInModel(changedSpecimen);
+ } else if (firstElement instanceof Media){
+ getEditorInput().addSaveCandidate((Media)element);
+ input.replaceInModel((Media)element);
}
}else if(element instanceof Group){
Group oldGroup = ((GroupEditorInput)input).getEntityFromModel((Group)element);
* 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.bulkeditor.e4;
import java.io.File;
* @author e.-m.lee
* @author n.hoffmann
* @created 17.08.2009
- * @version 1.0
*/
public class BulkEditorSearchE4 {
private Button btnManageState;
-
public Object ORDER_BY = new Object();
public BulkEditorSearchE4(BulkEditorE4Composite editor, Composite parent, int style) {
}
}
-
/**
* Creates the search textfield.
*/
text.setFocus();
}
}
-}
+}
\ No newline at end of file
} catch (IllegalArgumentException e) {
MessagingUtils.errorDialog("Can not convert Person into a Team", null, e.getLocalizedMessage(), TaxeditorBulkeditorPlugin.PLUGIN_ID,e, true);
} catch (MergeException e) {
- MessagingUtils.informationDialog("Convert not possible", "Person can not be transformed into team as it is already part of a team.");
+ MessagingUtils.informationDialog("Convert not possible", "Person can not be transformed into team. Probably it is referenced in a way that allows only persons. Check referencing objects view for details.");
}
if (result != null &&result.isOk()){
team = (Team)result.getCdmEntity();
+/**
+* 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.bulkeditor.handler.defaultHandler;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
public class OpenBulkEditorForIdentifiableEntityE4 extends DefaultOpenHandlerBaseE4<Object>{
- /**
- * {@inheritDoc}
- */
// @Override
// protected IdentifiableEntity getEntity(UUID uuid) {
// return CdmStore.getCommonService().find(IdentifiableEntity.class, uuid);
// }
- /**
- * {@inheritDoc}
- */
@Override
protected void open(Object entity, Shell shell, EPartService partService) {
@SuppressWarnings("rawtypes")
BulkEditorUtil.openBulkEditor(input, modelService, partService, application);
}
- /**
- * {@inheritDoc}
- */
@Override
protected boolean canExecute(Object entity) {
if (entity instanceof UuidAndTitleCache){
* @created 25.06.2009
*/
public abstract class AbstractBulkEditorInput<T extends CdmBase>
- extends CdmEntitySessionInput
+ extends CdmEntitySessionInput<T>
implements IEntityPersistenceService<T> {
-
private static final String PROPERTY_PROTECTED_TITLECACHE = "Protect TitleCache";
private static final String TYPE_PROPERTY = Messages.BulkEditorE4_TYPE;
private static final String ID_PROPERTY = "Id"; //$NON-NLS-1$
this.conversation = CdmStore.createConversation();
}
- static public AbstractBulkEditorInput NewInstance(BulkEditorInputType inputType) {
+ static public AbstractBulkEditorInput<?> NewInstance(BulkEditorInputType inputType) {
return BulkEditorInputType.getInput(inputType);
}
- public static AbstractBulkEditorInput NewInstance(IdentifiableEntity entity) {
+ public static AbstractBulkEditorInput<?> NewInstance(IdentifiableEntity entity) {
BulkEditorInputType inputType = BulkEditorInputType.getByType(entity.getClass());
return editorInput;
}
- public static AbstractBulkEditorInput NewInstance(Class clazz, UUID uuid) {
+ public static AbstractBulkEditorInput<?> NewInstance(Class clazz, UUID uuid) {
BulkEditorInputType inputType = BulkEditorInputType.getByType(clazz);
public void performSearch(final BulkEditorQuery bulkEditorQuery, IStructuredSelection selection) {
//cancel previous search job
if(searchJob!=null && searchJob.getState()!=Job.NONE){
- searchJob.cancel();
+ boolean isCanceled = searchJob.cancel();
+ if (!isCanceled){
+ while (!isCanceled){
+ try {
+ Thread.sleep(200);
+ } catch (InterruptedException e) {
+ }
+ isCanceled = searchJob.cancel();
+ }
+ }
searchJob = null;
- /*
- * wait for a little while for the job to finish
- * to avoid asynchronously loaded results of the
- * previous search being shown in the next search
- * (not critical but explicitly waiting for the job to finish
- * could run into an endless loop by mistake)
- */
- try {
- Thread.sleep(500);
- } catch (InterruptedException e) {
- }
+// /*
+// * wait for a little while for the job to finish
+// * to avoid asynchronously loaded results of the
+// * previous search being shown in the next search
+// * (not critical but explicitly waiting for the job to finish
+// * could run into an endless loop by mistake)
+// */
+// try {
+// Thread.sleep(500);
+// } catch (InterruptedException e) {
+// }
}
model.clear();
markedMergeCandidates.clear();
return getModel();
}
-
@Override
public Map<Object, List<String>> getPropertyPathsMap() {
// TODO Auto-generated method stub
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.store.CdmStore;
-
/**
* @author p.ciardelli
* @created 25.06.2009
- * @version 1.0
*/
public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase> {
- private static final long serialVersionUID = 3387950621617078479L;
-
public static final String ID = "bulkeditor.input.author";
private static AgentEditorInput instance;
* 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.bulkeditor.input;
import java.util.ArrayList;
/**
* @author n.hoffmann
* @created Mar 9, 2011
- * @version 1.0
*/
public class GroupEditorInput extends AbstractBulkEditorInput<Group> {
MessagingUtils.messageDialog(Messages.GROUP_CREATOR_Name_not_accepted, getClass(), Messages.GROUP_CREATOR_Name_not_accepted_message);
return null;
}
-
}
@Override
public void setSaveUserCandidates(Set<User> saveUserCandidates) {
this.saveUserCandidates = saveUserCandidates;
}
-
-
-}
+}
\ No newline at end of file
* 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.bulkeditor.input;
import java.util.ArrayList;
/**
* @author n.hoffmann
* @created Oct 19, 2010
- * @version 1.0
*/
public class NameRelationshipEditorInput extends AbstractBulkEditorInput<NameRelationship> {
- private static final long serialVersionUID = -7453923697752787687L;
-
public static final String ID = "bulkeditor.input.nameRelationship";
private static NameRelationshipEditorInput instance;
public void merge() {
}
-
-}
+}
\ No newline at end of file
+/**\r
+* Copyright (C) 2007 EDIT\r
+* European Distributed Institute of Taxonomy\r
+* http://www.e-taxonomy.eu\r
+*\r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
package eu.etaxonomy.taxeditor.bulkeditor.input;\r
\r
import java.util.ArrayList;\r
* 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.bulkeditor.input;
import java.util.ArrayList;
/**
* @author n.hoffmann
* @created Mar 9, 2011
- * @version 1.0
*/
public class UserEditorInput extends AbstractBulkEditorInput<User> {
return CdmStore.getSearchManager().findUsers(configurator);
}
-
@Override
protected IEntityCreator<User> createEntityCreator() {
return new UserCreator();
public Comparator<User> getTitleComparator(){
return new UserNameComparator();
}
-
-}
+}
\ No newline at end of file
* 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.bulkeditor.input.entitycreator;
import java.util.HashMap;
/**
* @author n.hoffmann
* @created Mar 9, 2011
- * @version 1.0
*/
public class UserCreator implements IEntityCreator<User>{
public static final String USER = "User"; //$NON-NLS-1$
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.String)
- */
@Override
public User createEntity(String text) {
return createEntity(null, text);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.Object, java.lang.String)
- */
@Override
public User createEntity(Object key, String text) {
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#getKeyLabelPairs()
- */
@Override
public Map<Object, String> getKeyLabelPairs() {
Map<Object, String> result = new HashMap<Object, String>();
// TODO Auto-generated method stub
return false;
}
-
-}
+}
\ No newline at end of file
* 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.bulkeditor.input.sortprovider;
import java.util.Comparator;
/**
* @author n.hoffmann
* @created Dec 14, 2010
- * @version 1.0
*/
public abstract class AbstractDateComparator<T extends ICdmBase> implements Comparator<T>{
* 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.bulkeditor.input.sortprovider;
import java.util.Comparator;
/**
* @author n.hoffmann
* @created Dec 14, 2010
- * @version 1.0
*/
public class AbstractSortProvider<T> implements IBulkEditorSortProvider<T> {
- Map<String, Comparator<T>> comparators = new HashMap<String, Comparator<T>>();
+ protected Map<String, Comparator<T>> comparators = new HashMap<>();
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider#getComparators()
- */
@Override
public Map<String, Comparator<T>> getComparators() {
return comparators;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider#getComparatorNames()
- */
@Override
public Set<String> getComparatorNames() {
return comparators.keySet();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider#getComparatorByName(java.lang.String)
- */
@Override
public Comparator<T> getComparatorByName(String name) {
return comparators.get(name);
}
-
-}
+}
\ No newline at end of file
* 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.bulkeditor.input.sortprovider;
import org.joda.time.DateTime;
/**
* @author n.hoffmann
* @created Dec 14, 2010
- * @version 1.0
*/
public class CdmBaseSortProvider<T extends ICdmBase> extends AbstractSortProvider<T> {
- /**
- *
- */
public CdmBaseSortProvider() {
comparators.put("Created When", new CreatedDateComparator());
}
private class CreatedDateComparator extends AbstractDateComparator<T>{
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.AbstractDateComparator#getDate(eu.etaxonomy.cdm.model.common.ICdmBase)
- */
@Override
protected DateTime getDate(T object) {
return object.getCreated();
- }
-
+ }
}
-}
+}
\ No newline at end of file
* 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.bulkeditor.input.sortprovider;
import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
/**
* @author n.hoffmann
* @created Dec 14, 2010
- * @version 1.0
*/
public class IdentifiableEntitySortProvider<T extends IIdentifiableEntity> extends AbstractSortProvider<T> {
public IdentifiableEntitySortProvider(){
comparators.put("Title Cache", new TitleCacheComparator<T>());
}
-
-}
+}
\ No newline at end of file
* 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.bulkeditor.input.sortprovider;
import java.util.Comparator;
/**
* @author n.hoffmann
* @created Dec 14, 2010
- * @version 1.0
*/
public class ReferenceSortProvider extends AbstractSortProvider<Reference> {
- /**
- *
- */
public ReferenceSortProvider() {
comparators.put("Type", new ReferenceTypeComparator());
comparators.put("Year", new ReferenceYearComparator());
private class ReferenceYearComparator implements Comparator<Reference> {
- /**
- * @param o1
- * @return
- */
private String getYearString(Reference o) {
TimePeriod datePublished = o == null ? null : o.getDatePublished();
return datePublished == null? null : datePublished.toString();
}
- /* (non-Javadoc)
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
@Override
public int compare(Reference o1, Reference o2) {
String yearString1 = getYearString(o1);
}
return returnVal;
-
}
}
private class ReferenceTypeComparator implements Comparator<Reference> {
- /* (non-Javadoc)
- * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
- */
@Override
public int compare(Reference o1, Reference o2) {
String typeString1 = o1.getClass().toString();
}
}
}
-
-
-}
+}
\ No newline at end of file
* 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.bulkeditor.operation;
import java.util.Set;
/**
* @author n.hoffmann
* @created Dec 13, 2010
- * @version 1.0
*/
public class SetMarkerFlagOperation extends AbstractPostTaxonOperation {
private MarkerType markerType;
private boolean value;
- /**
- * @param label
- * @param undoContext
- * @param postOperationEnabled
- */
public SetMarkerFlagOperation(String label, IUndoContext undoContext,
Set<IAnnotatableEntity> annotatableEntities, MarkerType markerType, boolean value,
IPostOperationEnabled postOperationEnabled) {
this.value = value;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return postExecute(null);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
@Override
public IStatus redo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return execute(monitor, info);
}
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
+
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return postExecute(null);
}
-
-}
+}
\ No newline at end of file
* 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.bulkeditor.preference;
import org.eclipse.jface.preference.BooleanFieldEditor;
/**
* @author n.hoffmann
* @created Dec 13, 2010
- * @version 1.0
*/
public class BulkEditorGeneralPreferencePage extends FieldEditorPreferencePageE4 {
Messages.BulkEditorGeneralPreferencePage,
getFieldEditorParent()));
}
-
-}
+}
\ No newline at end of file
* 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.bulkeditor.preference;
import org.eclipse.jface.preference.BooleanFieldEditor;
/**
* @author p.ciardelli
* @created 17.08.2009
- * @version 1.0
*/
public class BulkEditorMarkerPreferencePage extends FieldEditorPreferencePageE4 {
-
@Override
protected void createFieldEditors() {
if(CdmStore.isActive()){
}
}
-}
+}
\ No newline at end of file
Bundle-ManifestVersion: 2
Bundle-Name: CDM Library Dependencies Plugin
Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.0
Eclipse-BundleShape: dir
Export-Package: com.sun.istack.internal.tools,
com.sun.istack.internal.ws,
eu.etaxonomy.cdm.common,
eu.etaxonomy.cdm.common.media,
eu.etaxonomy.cdm.common.monitor,
+ eu.etaxonomy.cdm.compare.common,
+ eu.etaxonomy.cdm.compare.location,
+ eu.etaxonomy.cdm.compare.name,
+ eu.etaxonomy.cdm.compare.taxon,
+ eu.etaxonomy.cdm.compare.term,
eu.etaxonomy.cdm.config,
eu.etaxonomy.cdm.database,
eu.etaxonomy.cdm.database.types,
Bundle-ClassPath: .,
lib/apache-log4j-extras-1.2.17.jar,
lib/aspectjrt-1.9.6.jar,
- lib/cdmlib-commons-5.18.0.jar,
- lib/cdmlib-ext-5.18.0.jar,
- lib/cdmlib-io-5.18.0.jar,
- lib/cdmlib-model-5.18.0.jar,
- lib/cdmlib-persistence-5.18.0.jar,
- lib/cdmlib-cache-5.18.0.jar,
- lib/cdmlib-services-5.18.0.jar,
+ lib/cdmlib-commons-5.19.0.jar,
+ lib/cdmlib-ext-5.19.0.jar,
+ lib/cdmlib-io-5.19.0.jar,
+ lib/cdmlib-model-5.19.0.jar,
+ lib/cdmlib-persistence-5.19.0.jar,
+ lib/cdmlib-cache-5.19.0.jar,
+ lib/cdmlib-services-5.19.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.6.jar,\
lib/aspectjweaver-1.9.6.jar,\
- lib/cdmlib-commons-5.18.0.jar,\
- lib/cdmlib-ext-5.18.0.jar,\
- lib/cdmlib-io-5.18.0.jar,\
- lib/cdmlib-model-5.18.0.jar,\
- lib/cdmlib-persistence-5.18.0.jar,\
- lib/cdmlib-services-5.18.0.jar,\
+ lib/cdmlib-commons-5.19.0.jar,\
+ lib/cdmlib-ext-5.19.0.jar,\
+ lib/cdmlib-io-5.19.0.jar,\
+ lib/cdmlib-model-5.19.0.jar,\
+ lib/cdmlib-persistence-5.19.0.jar,\
+ lib/cdmlib-services-5.19.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.18.0.jar,\
+ lib/cdmlib-cache-5.19.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.18.2</version>\r
+ <version>5.19.0</version>\r
</parent>\r
<modelVersion>4.0.0</modelVersion>\r
<artifactId>eu.etaxonomy.taxeditor.cdmlib</artifactId>\r
<repository>\r
<id>repository.springsource.release</id>\r
<name>SpringSource GA Repository</name>\r
- <url>http://repo.springsource.org/release</url>\r
+ <url>https://repo.springsource.org/release</url>\r
</repository>\r
</repositories>\r
<dependencies>\r
import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method;
import java.lang.reflect.Type;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.util.Dictionary;
File file = null;
try {
String urlString = FileLocator.resolve(fileURL).toExternalForm().replace(" ", "%20");
- file = new File(new URI(urlString));
+ file = new File(new URI(urlString).getJavaUri());
JarFile jarFile = new JarFile(file);
Manifest manifest = jarFile.getManifest();
Attributes attributes = manifest.getMainAttributes();
if(requestURI != null){
RemoteExecutionTimestampsUtil.setLastServiceMethod(requestURI.toString());
}
-
}
private void setExecutionResponseHttpHeaderTimestamp(HttpResponse respone){
.setConnectionReuseStrategy(new NoConnectionReuseStrategy()) // see #8812
.build();
}
-}
+}
\ No newline at end of file
+/**
+* Copyright (C) 2015 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.session;
import java.util.Collection;
import java.util.List;
import java.util.Map;
-import eu.etaxonomy.cdm.model.common.CdmBase;
+import eu.etaxonomy.cdm.model.common.ICdmBase;
-public interface ICdmEntitySessionEnabled {
+public interface ICdmEntitySessionEnabled<T extends ICdmBase> {
public ICdmEntitySession getCdmEntitySession();
- public <T extends CdmBase> Collection<T> getRootEntities();
+ public Collection<T> getRootEntities();
public Map<Object, List<String>> getPropertyPathsMap();
Bundle-ManifestVersion: 2
Bundle-Name: Editor Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.0
Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
Bundle-Vendor: %Bundle-Vendor.0
Bundle-Localization: OSGI-INF/l10n/plugin
<handlers xmi:id="_mjo-gOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.CreateDescriptiveDataSetHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.CreateDescriptiveDataSetHandler" command="_XO7eUOSjEee9gvnH2Eirpw"/>
<handlers xmi:id="_yQHcoOS3EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.deleteDescriptiveDataSet" contributionURI="bundleclass://eu.etaxonomy.taxeditor.editor/eu.etaxonomy.taxeditor.editor.descriptiveDataSet.handler.DeleteDescriptiveDataSetHandler" command="_uPmNgOS3EeeKONG__xkGZg"/>
<menus xsi:type="menu:PopupMenu" xmi:id="__S3vQN87Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.popupmenu.descriptiveDataSetNavigator">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_UUfGcOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.newdescriptivedataset" label="%handledmenuitem.label.13" tooltip="%handledmenuitem.tooltip.1" command="_XO7eUOSjEee9gvnH2Eirpw"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_UUfGcOSjEee9gvnH2Eirpw" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.newdescriptivedataset" label="%menu.label" tooltip="%handledmenuitem.tooltip.1" command="_XO7eUOSjEee9gvnH2Eirpw"/>
<children xsi:type="menu:MenuSeparator" xmi:id="_ZD5bgLIfEeqvn5lIFwyIRw" elementId="eu.etaxonomy.taxeditor.editor.menuseparator.31"/>
<children xsi:type="menu:DynamicMenuContribution" xmi:id="_BRxE4N88Eee9zP45RW4C3A" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSetNavigator.dynamicmenucontribution.cdmViewer" label="%dynamicmenucontribution.label.2" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.CdmViewerContextMenuE4"/>
<children xsi:type="menu:MenuSeparator" xmi:id="_aFtd0LIfEeqvn5lIFwyIRw" elementId="eu.etaxonomy.taxeditor.editor.menuseparator.32"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_JSt1kOS4EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.deleteDescriptiveDataSet" label="%handledmenuitem.label.14" tooltip="%handledmenuitem.tooltip.2" command="_uPmNgOS3EeeKONG__xkGZg"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_JSt1kOS4EeeKONG__xkGZg" elementId="eu.etaxonomy.taxeditor.editor.handledmenuitem.deleteDescriptiveDataSet" label="%command.commandname.9" tooltip="%handledmenuitem.tooltip.2" command="_uPmNgOS3EeeKONG__xkGZg"/>
</menus>
<toolbar xmi:id="_gz3CkPycEeeOqKfc2I-67A" elementId="eu.etaxonomy.taxeditor.editor.toolbar.2"/>
</elements>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.18.2</version>
+ <version>5.19.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
* 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.editor;
import java.util.ArrayList;
*
* @author n.hoffmann
* @created 19.03.2009
- * @version 1.0
*/
public class ChooseFromMultipleTaxonNodesDialog extends ListDialog {
public Object[] getElements(Object inputElement) {
Set<TaxonNode> taxonNodes = (Set<TaxonNode>) inputElement;
- List<Classification> classifications = new ArrayList<Classification>();
+ List<Classification> classifications = new ArrayList<>();
for(TaxonNode node : taxonNodes){
classifications.add(node.getClassification());
}
}
-}
+}
\ No newline at end of file
* 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.editor;
import java.util.Collection;
*
* @author n.hoffmann
* @created 20.01.2009
- * @version 1.0
*/
public class EditorUtil extends AbstractUtility {
}
}
-
Collection<MPart> parts = partService.getParts();
//check if part is already opened
for (MPart part : parts) {
showMedia(modelService, partService);
mediaVisible = false;
}
-
-
}
public static void showMedia(EModelService modelService, EPartService partService) {
}
}
-
public static void closeObsoleteDescriptiveDatasetEditor(UUID datasetUuid, EPartService partService){
Collection<MPart> parts = partService.getParts();
}
}
-
public static void closePart(String partID, EPartService partService){
Collection<MPart> parts = partService.getParts();
editor.init(input);
}
}
-
-}
+}
\ No newline at end of file
import eu.etaxonomy.cdm.model.term.TermType;
import eu.etaxonomy.cdm.persistence.dto.TermDto;
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditorComposite;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditorComposite;
import eu.etaxonomy.taxeditor.model.ImageResources;
import eu.etaxonomy.taxeditor.ui.combo.term.TermUuidComboViewer;
import eu.etaxonomy.taxeditor.util.TaxonTreeNodeContentProvider;
private Text txtDescriptiveDataSet;
private TermUuidComboViewer comboRankMin;
private TermUuidComboViewer comboRankMax;
- private FeatureTreeEditorComposite<Feature> featureTreeEditorComposite;
+ private TermTreeEditorComposite<Feature> TermTreeEditorComposite;
private TreeViewer taxonNodeTree;
private List<TermDto> areas = new ArrayList<>();
private Text textAreaText;
btnChooseArea = new Button(composite, SWT.NONE);
btnChooseArea.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
- featureTreeEditorComposite = new FeatureTreeEditorComposite<>(this, SWT.NONE);
- featureTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
+ TermTreeEditorComposite = new TermTreeEditorComposite<>(this, SWT.NONE);
+ TermTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
}
@Override
comboRankMax.setElement(max);
}
- public FeatureTreeEditorComposite<Feature> getFeatureTreeEditorComposite() {
- return featureTreeEditorComposite;
+ public TermTreeEditorComposite<Feature> getTermTreeEditorComposite() {
+ return TermTreeEditorComposite;
}
public TermTree<Feature> getCharacters(){
- return featureTreeEditorComposite.getFeatureTree();
+ return TermTreeEditorComposite.getFeatureTree();
}
public void setCharacters(TermTree<Feature> characters) {
- featureTreeEditorComposite.setSelectedTree(characters);
+ TermTreeEditorComposite.setSelectedTree(characters);
}
public TreeViewer getTaxonNodeTree() {
* @since Nov 21, 2017
*
*/
-public class DescriptiveDataSetEditor implements IE4SavablePart, IConversationEnabled, ICdmEntitySessionEnabled,
-IPartContentHasDetails, IPartContentHasSupplementalData, IDirtyMarkable, IDescriptiveDataSetEditor {
+public class DescriptiveDataSetEditor implements IE4SavablePart, IConversationEnabled,
+ ICdmEntitySessionEnabled<DescriptiveDataSet>, IPartContentHasDetails,
+ IPartContentHasSupplementalData, IDirtyMarkable, IDescriptiveDataSetEditor {
private DescriptiveDataSetComposite composite;
}
});
- composite.getFeatureTreeEditorComposite().init("Character Tree",
+ composite.getTermTreeEditorComposite().init("Character Tree",
TermType.Character,
null,
null,
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.jface.viewers.LabelProvider;
import org.eclipse.jface.viewers.ListViewer;
+import org.eclipse.jface.viewers.ViewerComparator;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.ui.IMemento;
* @date 12.12.2017
*
*/
-public class DescriptiveDataSetNavigator implements IConversationEnabled, ICdmEntitySessionEnabled, IContextListener{
+public class DescriptiveDataSetNavigator
+ implements IConversationEnabled, ICdmEntitySessionEnabled<DescriptiveDataSet>, IContextListener{
private ListViewer viewer;
return super.getText(element);
}
});
+ viewer.setComparator(new ViewerComparator());
viewer.addDoubleClickListener(new IDoubleClickListener() {
refresh();
}
- /**
- * {@inheritDoc}
- */
@Override
public void update(CdmDataChangeMap arg0) {
}
- /**
- * {@inheritDoc}
- */
@Override
public ICdmEntitySession getCdmEntitySession() {
return cdmEntitySession;
}
- /**
- * {@inheritDoc}
- */
@Override
- public <T extends CdmBase> Collection<T> getRootEntities() {
+ public Collection<DescriptiveDataSet> getRootEntities() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public Map<Object, List<String>> getPropertyPathsMap() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public ConversationHolder getConversationHolder() {
return conversation;
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
// TODO Auto-generated method stub
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextStop(IMemento memento, IProgressMonitor monitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextStart(IMemento memento, IProgressMonitor monitor) {
if(viewer!=null && viewer.getControl()!=null && !viewer.getControl().isDisposed()){
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextRefresh(IProgressMonitor monitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
}
-
-}
+}
\ No newline at end of file
import eu.etaxonomy.cdm.model.description.Character;
import eu.etaxonomy.cdm.model.term.TermNode;
import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureNodeDragListener;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermNodeDragListener;
/**
* @author pplitzner
* @since Jun 2, 2017
*
*/
-public class CharacterDragListener extends FeatureNodeDragListener {
+public class CharacterDragListener extends TermNodeDragListener {
private TreeViewer structureViewer;
private TreeViewer propertyViewer;
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeDtoDropAdapter;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeDtoDropAdapter;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.StoreUtil;
* @date Jun 1, 2017
*
*/
-public class CharacterDropAdapter extends FeatureTreeDtoDropAdapter {
+public class CharacterDropAdapter extends TermTreeDtoDropAdapter {
private CharacterEditor characterEditor;
-// $Id$
/**
* Copyright (C) 2017 EDIT
* European Distributed Institute of Taxonomy
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
import eu.etaxonomy.taxeditor.featuretree.CharacterTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
-import eu.etaxonomy.taxeditor.featuretree.e4.AbstractTermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureNodeDtoDragListener;
-import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeDtoDropAdapter;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
import eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeDtoEditorComposite;
import eu.etaxonomy.taxeditor.featuretree.e4.ICharacterEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermNodeDtoDragListener;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeDtoDropAdapter;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
* Editor for combining structure and property terms to characters.
* @author pplitzner
* @date 24.05.2017
- *
*/
public class CharacterEditor implements ICharacterEditor, IConversationEnabled, ISelectionChangedListener,
- ModifyListener, IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData, IDirtyMarkable, IE4SavablePart {
+ ModifyListener, IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData,
+ IDirtyMarkable, IE4SavablePart {
private FeatureTreeDtoEditorComposite characterTreeEditorComposite;
private final FormToolkit formToolkit = new FormToolkit(Display.getDefault());
});
characterTreeEditorComposite = addFeatureTreeEditor(composite_3);
- initFeatureTreeComposite(TermType.Character, characterTreeEditorComposite, new FeatureNodeDtoDragListener(characterTreeEditorComposite.getViewer()),
- new FeatureTreeDtoDropAdapter(this, characterTreeEditorComposite.getViewer(), sync),
+ initFeatureTreeComposite(TermType.Character, characterTreeEditorComposite, new TermNodeDtoDragListener(characterTreeEditorComposite.getViewer()),
+ new TermTreeDtoDropAdapter(this, characterTreeEditorComposite.getViewer(), sync),
null);
characterTreeEditorComposite.getLabel_title().setText(Messages.CharacterEditor_CHARACTERS);
TreeViewer viewer = new TreeViewer(composite);
viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 2, 1));
- viewer.setContentProvider(new FeatureTreeContentProvider());
- viewer.setLabelProvider(new FeatureTreeLabelProvider());
+ viewer.setContentProvider(new TermTreeContentProvider());
+ viewer.setLabelProvider(new TermTreeLabelProvider());
viewer.setComparator(new FeatureTreeViewerComparator());
viewer.addSelectionChangedListener(this);
- viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, AbstractTermTreeEditor.TREE_PROPERTY_PATH));
+ viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, TermTreeEditor.TREE_PROPERTY_PATH));
btnRefresh.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent e) {
- viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, AbstractTermTreeEditor.TREE_PROPERTY_PATH));
+ viewer.setInput(CdmStore.getService(ITermTreeService.class).list(termType, null, null, null, TermTreeEditor.TREE_PROPERTY_PATH));
refresh(viewer);
}
});
}
private <T extends DefinedTermBase> FeatureTreeDtoEditorComposite<T> addFeatureTreeEditor(Composite composite_3) {
- FeatureTreeDtoEditorComposite<T> featureTreeEditorComposite = new FeatureTreeDtoEditorComposite<>(composite_3, SWT.NONE);
- featureTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
- return featureTreeEditorComposite;
+ FeatureTreeDtoEditorComposite<T> TermTreeEditorComposite = new FeatureTreeDtoEditorComposite<>(composite_3, SWT.NONE);
+ TermTreeEditorComposite.setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true, 1, 1));
+ return TermTreeEditorComposite;
}
private void initFeatureTreeComposite(
TermType termType,
- FeatureTreeDtoEditorComposite featureTreeEditorComposite,
- FeatureNodeDtoDragListener featureNodeDragListener,
- FeatureTreeDtoDropAdapter featureNodeDropAdapter,
+ FeatureTreeDtoEditorComposite TermTreeEditorComposite,
+ TermNodeDtoDragListener featureNodeDragListener,
+ TermTreeDtoDropAdapter featureNodeDropAdapter,
Transfer[] transfers) {
- featureTreeEditorComposite.init(
+ TermTreeEditorComposite.init(
featureNodeDragListener,
featureNodeDropAdapter,
transfers,
this,
- new FeatureTreeChooserListener(featureTreeEditorComposite, termType),
+ new FeatureTreeChooserListener(TermTreeEditorComposite, termType),
this);
}
}
private class FeatureTreeChooserListener extends SelectionAdapter{
- private FeatureTreeDtoEditorComposite<Feature> featureTreeEditorComposite;
+ private FeatureTreeDtoEditorComposite<Feature> TermTreeEditorComposite;
private TermType termType;
- public FeatureTreeChooserListener(FeatureTreeDtoEditorComposite<Feature> featureTreeEditorComposite, TermType termType) {
+ public FeatureTreeChooserListener(FeatureTreeDtoEditorComposite<Feature> TermTreeEditorComposite, TermType termType) {
super();
- this.featureTreeEditorComposite = featureTreeEditorComposite;
+ this.TermTreeEditorComposite = TermTreeEditorComposite;
this.termType = termType;
}
@Override
public void widgetSelected(SelectionEvent e) {
- TermTree tree = FeatureTreeSelectionDialog.select(featureTreeEditorComposite.getDisplay().getActiveShell(), null, termType);
+ TermTree tree = FeatureTreeSelectionDialog.select(TermTreeEditorComposite.getDisplay().getActiveShell(), null, termType);
if(tree!=null){
cdmEntitySession.load(tree, true);
- featureTreeEditorComposite.setSelectedTree(tree);
+ TermTreeEditorComposite.setSelectedTree(tree);
}
}
}
import org.eclipse.swt.widgets.Shell;
import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.character.CharacterEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler;
+import eu.etaxonomy.taxeditor.featuretree.e4.handler.AddTermHandler;
/**
* @author pplitzner
* @since Jul 12, 2017
*
*/
-public class AddFeatureToCharacterTreeHandler extends AddFeatureHandler {
+public class AddFeatureToCharacterTreeHandler extends AddTermHandler {
@Execute
@Override
* Character matrix editor for editing specimen/taxon descriptions in a table
* @author pplitzner
* @since Nov 26, 2017
- *
*/
public class CharacterMatrixPart implements IE4SavablePart, IConversationEnabled, IDirtyMarkable,
-ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetails{
+ ICdmEntitySessionEnabled<DescriptiveDataSet>, IPartContentHasSupplementalData,
+ IPartContentHasDetails {
private static final List<String> WS_PROPERTY_PATH = Arrays.asList(new String[] {
"descriptions", //$NON-NLS-1$
* 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.editor.e4;
import java.util.ArrayList;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
-
/**
* @author pplitzner
* @date Aug 24, 2017
*/
-public class TaxonEditorInputE4 extends CdmEntitySessionInput implements IConversationEnabled {
+public class TaxonEditorInputE4 extends CdmEntitySessionInput<TaxonNode>
+ implements IConversationEnabled {
private static final String INCORRECT_STATE = Messages.TaxonEditorInput_INCORRECT_STATE;
private List<TaxonBase> toSaveNewConcepts = new ArrayList<>();
private List<TaxonName> toSaveNewNames = new ArrayList<>();
-
private Set<AbstractPostOperation> operations = new HashSet<>();
private TaxonEditorInputDataChangeBehaviourE4 dataChangeBehavior;
delete(entry.getKey(), entry.getValue());
}
toDeletes.clear();
- for(AbstractPostOperation<?> entry:operations){
- IStatus status = Status.CANCEL_STATUS;
- final IAdaptable uiInfoAdapter = WorkspaceUndoUtil
- .getUIInfoAdapter(AbstractUtility.getShell());
- String operationlabel = entry.getLabel();
- try {
- entry.addContext(IOperationHistory.GLOBAL_UNDO_CONTEXT);
- status = entry.execute(new NullProgressMonitor(), uiInfoAdapter);
- } catch (ExecutionException e) {
-
- MessagingUtils.operationDialog(AbstractUtility.class, e, TaxeditorStorePlugin.PLUGIN_ID, operationlabel, null);
-
- }
- String statusString = status.equals(Status.OK_STATUS) ? "completed"
- : "cancelled";
-
- IPostOperationEnabled postOperationEnabled = entry
- .getPostOperationEnabled();
- if (postOperationEnabled != null) {
- postOperationEnabled.onComplete();
- }
-
-
- //AbstractUtility.executeOperation(entry,sync);
- }
-
- operations.clear();
for (Synonym syn: toSaveNewSynonyms){
- for (HybridRelationship rel : syn.getName().getHybridChildRelations()){
-// if (!rel.getParentName().isPersited()) {
+ if (syn.getName() != null){
+ for (HybridRelationship rel : syn.getName().getHybridChildRelations()){
toSaveNewNames.add(rel.getParentName());
-// }
-// if (!rel.getHybridName().isPersited()) {
- toSaveNewNames.add(rel.getHybridName());
-// }
-
+ toSaveNewNames.add(rel.getHybridName());
+ }
}
}
for (TaxonBase<?> concept: toSaveNewConcepts){
- for (HybridRelationship rel : concept.getName().getHybridChildRelations()){
-// if (!rel.getParentName().isPersited()) {
+ if (concept.getName() != null){
+ for (HybridRelationship rel : concept.getName().getHybridChildRelations()){
toSaveNewNames.add(rel.getParentName());
-// }
-// if (!rel.getHybridName().isPersited()) {
toSaveNewNames.add(rel.getHybridName());
-// }
+ }
+ }
+ }
+ //handle cascading for hybrid relationshis
+ //accepted taxa
+ if (taxonNode.getTaxon().getName() != null){
+ for (HybridRelationship rel : taxonNode.getTaxon().getName().getHybridChildRelations()){
+ toSaveNewNames.add(rel.getParentName());
+ toSaveNewNames.add(rel.getHybridName());
+ }
+ }
+ //synonyms
+ for (TaxonName synonymName : taxonNode.getTaxon().getSynonymNames()){
+ if (synonymName != null){
+ for (HybridRelationship rel : synonymName.getHybridChildRelations()){
+ toSaveNewNames.add(rel.getParentName());
+ toSaveNewNames.add(rel.getHybridName());
+ }
}
}
+
if (!toSaveNewNames.isEmpty()){
CdmStore.getService(INameService.class).merge(toSaveNewNames, true);
}
toSaveNewNames.clear();
toSaveNewConcepts.clear();
+
CdmStore.getService(ITaxonNodeService.class).merge(taxonNode, true);
+ for(AbstractPostOperation<?> entry:operations){
+ IStatus status = Status.CANCEL_STATUS;
+ final IAdaptable uiInfoAdapter = WorkspaceUndoUtil
+ .getUIInfoAdapter(AbstractUtility.getShell());
+ String operationlabel = entry.getLabel();
+ try {
+ entry.addContext(IOperationHistory.GLOBAL_UNDO_CONTEXT);
+ status = entry.execute(new NullProgressMonitor(), uiInfoAdapter);
+ } catch (ExecutionException e) {
+ MessagingUtils.operationDialog(AbstractUtility.class, e, TaxeditorStorePlugin.PLUGIN_ID, operationlabel, null);
+ }
+
+ IPostOperationEnabled postOperationEnabled = entry
+ .getPostOperationEnabled();
+ if (postOperationEnabled != null) {
+ postOperationEnabled.onComplete();
+ }
+
+ //AbstractUtility.executeOperation(entry,sync);
+ }
+
+ operations.clear();
}
"synonyms.name.relationsToThisName.fromName", //$NON-NLS-1$
"synonyms.name.nomenclaturalReference.inReference.authorship", //$NON-NLS-1$
"synonyms.name.nomenclaturalReference.authorship", //$NON-NLS-1$
- "synonyms.name.homotypicalGroup.typifiedNames.taxonBases.synonyms" //$NON-NLS-1$
+ "synonyms.name.homotypicalGroup.typifiedNames.taxonBases.synonyms", //$NON-NLS-1$
+ "relationsFromThisTaxon",//$NON-NLS-1$
+ "relationsToThisTaxon"//$NON-NLS-1$
});
return taxonBasePropertyPaths;
public void addToSaveNewName(TaxonName newName) {
this.toSaveNewNames.add(newName);
}
-}
+}
\ No newline at end of file
*
* @author cmathew
* @created Mar 28, 2013
- *
*/
-
-public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IConversationEnabled {
+public class CdmAuthorityEditorInput
+ extends CdmEntitySessionInput<Group>
+ implements IConversationEnabled {
+
private ConversationHolder conversation;
private Group group;
return null;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.persistence.hibernate.ICdmPostDataChangeObserver#update(eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap)
- */
+
@Override
public void update(CdmDataChangeMap changeEvents) {
// TODO Auto-generated method stub
-
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.conversation.IConversationEnabled#getConversationHolder()
- */
+
@Override
public ConversationHolder getConversationHolder() {
return this.conversation;
}
+
public String getName() {
return group.getName();
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object object) {
if (object instanceof CdmAuthorityEditorInput
return super.equals(object);
}
- /**
- * Getter method for group member.
- *
- * @return
- */
public Group getGroup() {
return this.group;
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getRootEntities()
- */
+
@Override
public Collection<Group> getRootEntities() {
return Arrays.asList(group);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput#merge()
- */
@Override
public void merge() {
group = CdmStore.getService(IGroupService.class).merge(group, true).getMergedEntity();
-
}
-}
+}
\ No newline at end of file
/**
- *
- */
+* 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.editor.key;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
/**
* @author n.hoffmann
- *
*/
public abstract class AbstractIdentificationEditorInput<T extends IIdentificationKey>
extends CdmEntitySessionInput implements IConversationEnabled {
public void update(CdmDataChangeMap changeEvents) {
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object obj) {
// TODO Auto-generated method stub
boolean result = super.equals(obj);
return result;
}
-
-}
+}
\ No newline at end of file
* 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.editor.key.polytomous;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
/**
* @author n.hoffmann
* @created Apr 20, 2011
- * @version 1.0
*/
public interface IPolytomousKeyEditorPage extends IPostOperationEnabled {
-}
+}
\ No newline at end of file
/**
- *
- */
+* 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.editor.key.polytomous;
import java.util.ArrayList;
/**
* @author n.hoffmann
- *
*/
public class PolytomousKeyEditorInput extends AbstractIdentificationEditorInput<PolytomousKey> {
// this.name = name;
// }
-
public static PolytomousKeyEditorInput NewInstance(UUID polytomousKeyUuid) throws Exception{
try{
ConversationHolder conversation = CdmStore.createConversation();
}
}
-
@Override
public PolytomousKey getKey() {
return key;
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object object) {
if (object instanceof PolytomousKeyEditorInput
return super.equals(object);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getRootEntities()
- */
@Override
public List<PolytomousKey> getRootEntities() {
return Arrays.asList(key);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput#merge()
- */
@Override
public void merge() {
key = CdmStore.getService(IPolytomousKeyService.class).merge(key,true).getMergedEntity();
-
}
@Override
propertyPathsMap.put("children", polytomousKeyNodePropertyPaths); //$NON-NLS-1$
return propertyPathsMap;
}
-
-}
+}
\ No newline at end of file
* 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.editor.key.polytomous;
import java.util.ArrayList;
import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
/**
- *
* @author n.hoffmann
* @created Mar 30, 2011
- * @version 1.0
*/
public class PolytomousKeyGraphContentProvider implements IGraphContentProvider {
public Object getDestination(Object relationship) {
return ((PolytomousKeyRelationship) relationship).getDestination();
}
-
-}
+}
\ No newline at end of file
* 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.editor.key.polytomous;
import java.util.Map;
*
* @author n.hoffmann
* @created Mar 30, 2011
- * @version 1.0
*/
public class PolytomousKeyLabelProvider extends LabelProvider implements
IEntityStyleProvider {
return EMPTY;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.zest.core.viewers.IEntityStyleProvider#fisheyeNode(java.lang
- * .Object)
- */
@Override
public boolean fisheyeNode(Object arg0) {
// TODO Auto-generated method stub
return false;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.zest.core.viewers.IEntityStyleProvider#getBackgroundColour
- * (java.lang.Object)
- */
@Override
public Color getBackgroundColour(Object arg0) {
// TODO Auto-generated method stub
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.zest.core.viewers.IEntityStyleProvider#getBorderColor(java
- * .lang.Object)
- */
@Override
public Color getBorderColor(Object arg0) {
// TODO Auto-generated method stub
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.zest.core.viewers.IEntityStyleProvider#getBorderHighlightColor
- * (java.lang.Object)
- */
@Override
public Color getBorderHighlightColor(Object arg0) {
// TODO Auto-generated method stub
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.zest.core.viewers.IEntityStyleProvider#getBorderWidth(java
- * .lang.Object)
- */
@Override
public int getBorderWidth(Object arg0) {
return 0;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.zest.core.viewers.IEntityStyleProvider#getForegroundColour
- * (java.lang.Object)
- */
@Override
public Color getForegroundColour(Object arg0) {
// TODO Auto-generated method stub
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.zest.core.viewers.IEntityStyleProvider#getNodeHighlightColor
- * (java.lang.Object)
- */
@Override
public Color getNodeHighlightColor(Object arg0) {
// TODO Auto-generated method stub
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.zest.core.viewers.IEntityStyleProvider#getTooltip(java.lang
- * .Object)
- */
@Override
public IFigure getTooltip(Object arg0) {
return null;
}
-}
+}
\ No newline at end of file
* 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.editor.key.polytomous;
import java.util.ArrayList;
/**
* @author n.hoffmann
* @created Apr 4, 2011
- * @version 1.0
*/
public class PolytomousKeyListContentProvider implements
IStructuredContentProvider {
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.jface.viewers.IContentProvider#dispose()
- */
@Override
public void dispose() {
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface
- * .viewers.Viewer, java.lang.Object, java.lang.Object)
- */
@Override
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java
- * .lang.Object)
- */
@Override
public Object[] getElements(Object inputElement) {
if (inputElement instanceof PolytomousKeyEditorInput) {
}
}
}
-}
+}
\ No newline at end of file
* 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.editor.key.polytomous;
import java.util.Map;
/**
* @author n.hoffmann
* @created Apr 18, 2011
- * @version 1.0
*/
public class PolytomousKeyListLabelProvider extends StyledCellLabelProvider {
private boolean isParentRoot(PolytomousKeyNode node) {
return getParent(node) == null;
}
-
-}
+}
\ No newline at end of file
/**
* @author n.hoffmann
* @created Dec 6, 2010
- * @version 1.0
*/
public class DeleteNodeHandlerE4 extends RemotingCdmHandlerE4 {
public void onComplete() {
}
- /**
- * {@inheritDoc}
- */
@Override
protected Object getTrigger() {
return this;
menuItem.setVisible(canExecute);
return canExecute;
}
-
}
\ No newline at end of file
public static String KeyEditor_LIST;
public static String KeyEditor_SAVING;
public static String MediaViewPart_MEDIA;
- public static String MisapplicationContainer_SEC_REF_REQUIRED;
public static String MoveDerivateOperation_MOVE_NOT_POSSIBLE;
public static String MoveDerivateOperation_MOVE_TO_NOT_POSSIBLE;
public static String MoveDescriptionElementsHandler_CHOOSE_ACC_TAXON;
EditorAnnotation_ERROR=Error:
EditorAnnotation_WARNING=Warning:
IContainerConstants_CLICK_ADD_NAME=Click to add name
-MisapplicationContainer_SEC_REF_REQUIRED=This misapplication requires a sec. reference.
SynonymContainer_SYNONYM_NULL_NAME=Synonym with a null name detected. This should never happen.
NameEditorDropTargetListener_CHANGE=Change
NameEditorDropTargetListener_CHANGE_ACC_TAXON=Change accepted Taxon
ChangeSynonymToAcceptedTaxonOperation_INCONSISTENT_DATA=Operation may lead to inconsistent data
ChangeSynonymToAcceptedTaxonOperation_NOT_IMPLEMENTED=Not yet implemented
ChangeSynonymToAcceptedTaxonOperation_DifferentSec=Different Secundum Reference
-ChangeSynonymToAcceptedTaxonOperation_DifferentSec_Message=The new taxon and the parent does not have the same secundum reference.
+ChangeSynonymToAcceptedTaxonOperation_DifferentSec_Message=The new taxon and the parent do not have the same secundum reference.
CharacterEditor_CANNOT_PERFORM_MESSAGE=You have to select a structure, a property and a character tree to perform this action.
CharacterEditor_CANNOT_PERFORM_TITLE=Cannot perform action
CharacterEditor_CHARACTERS=Characters:
EditorAnnotation_ERROR=Error:
EditorAnnotation_WARNING=Warnung:
IContainerConstants_CLICK_ADD_NAME=Klicken, um Namen hinzuzufügen
-MisapplicationContainer_SEC_REF_REQUIRED=Diese Fehlanwendung benötigt eine sec. Referenz.
SynonymContainer_SYNONYM_NULL_NAME=Synonym mit einem null-Namen entdeckt. Das sollte nicht passieren.
NameEditorDropTargetListener_CHANGE=Ändern
NameEditorDropTargetListener_CHANGE_ACC_TAXON=Ändere akzeptiertes Taxon
* 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.editor.name.container;
import org.eclipse.swt.graphics.Image;
/**
* @author n.hoffmann
* @created Jan 20, 2011
- * @version 1.0
*/
public interface IContainerConstants {
- /**
- *
- */
+
public static final int SELECTED_FOCUS = 1;
/** Constant <code>SELECTED_NO_FOCUS=2</code> */
public static final int SELECTED_NO_FOCUS = 2;
* 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.editor.name.container;
-import java.util.ArrayList;
-import java.util.Collection;
import java.util.Scanner;
import org.eclipse.swt.custom.StyledText;
-import org.eclipse.swt.events.KeyListener;
import org.eclipse.swt.events.VerifyEvent;
import org.eclipse.swt.events.VerifyListener;
*
* @author p.ciardelli
* @created 19.05.2008
- * @version 1.0
*/
-
public abstract class LineBreakListener implements VerifyListener{
-
private static String LINE_BREAK = System.getProperty("line.separator"); //$NON-NLS-1$
* @param text a {@link java.lang.String} object.
*/
abstract public void handleSplitText(String text);
-}
+}
\ No newline at end of file
* 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.editor.name.container;
import org.apache.log4j.Logger;
*
* @author p.ciardelli
* @created 19.05.2008
- * @version 1.0
*/
public class LineWrapSupport {
private static final Logger logger = Logger
*
* @author p.ciardelli
* @created 21.05.2008
- * @version 1.0
*/
class LineWrapListener implements ModifyListener {
checkLineCount();
}
}
-}
+}
\ No newline at end of file
* 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.editor.name.e4;
import java.util.ArrayList;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionProvider;
import org.eclipse.jface.viewers.StructuredSelection;
import org.eclipse.swt.dnd.DND;
import org.eclipse.swt.dnd.DropTarget;
private ManagedForm managedForm;
private ScrolledForm scrolledForm;
private Composite parent;
- private ISelectionProvider simpleSelectionProvider;
@Inject
private EModelService modelService;
@Inject
private EPartService partService;
- private TaxonBase selection;
+ private TaxonBase<?> selection;
private ConversationHolder conversation;
createManagedForm(parent);
TaxeditorPartService.getInstance().addListener(TaxeditorPartService.PART_ACTIVATED, this);
-
}
protected void createManagedForm(Composite composite) {
parent.pack();
managedForm.refresh();
managedForm.reflow(true);
-
}
@Override
// check permissions
boolean doEnable = permissionsSatisfied();
managedForm.getForm().setEnabled(doEnable);
-
-
}
@Override
TaxonNode taxonNode = input.getTaxonNode();
doEnable = CdmStore.currentAuthentiationHasPermission(taxonNode,
RequiredPermissions.TAXON_EDIT);
-
}
return doEnable;
}
// Otherwise declare this step as done.
monitor.worked(1);
-
}
input.setSync(sync);
input.merge();
setEnabled(false, disabledColor);
}
-
-
protected void setEnabled(boolean enabled, Color background) {
for (AbstractGroupedContainerE4<?> groupedContainer : getGroupedContainers()) {
this.redraw(false, true, true, true);
this.setDirty();
if (cdmbase instanceof TaxonBase) {
- this.selection = (TaxonBase) cdmbase;
+ this.selection = (TaxonBase<?>) cdmbase;
}
-
}
}
// check for match in type designations
.anyMatch(unit -> typeDesignationSpecimens.contains(unit))) {
EditorUtil.updateEditor(this.input.getTaxonNode(), this);
-
}
-
}
@Override
public TaxonNode getTaxonNode() {
return input.getTaxonNode();
}
-}
+}
\ No newline at end of file
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper;
import eu.etaxonomy.cdm.strategy.cache.TaggedText;
-import eu.etaxonomy.taxeditor.editor.l10n.Messages;
-import eu.etaxonomy.taxeditor.editor.name.container.EditorAnnotation;
import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
import eu.etaxonomy.taxeditor.editor.name.e4.container.MisappliedGroupE4.ConceptType;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
@Override
public void showAnnotations() {
- if(getData().getSec() == null){
- getNameViewer().addAnnotation(
- new EditorAnnotation(0, Messages.MisapplicationContainer_SEC_REF_REQUIRED));
- }
super.showAnnotations();
}
* 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.editor.view.checklist;
import org.eclipse.jface.viewers.Viewer;
/**
* @author a.oppermann
* @created 30.04.2014
- * @version 1.0
*/
public class ChecklistEditorComparator extends ViewerComparator {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
Taxon d1 = (Taxon) e1;
}
return result;
}
-}
+}
\ No newline at end of file
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- *
* @author a.oppermann
* @date 25.04.2014
- *
*/
-public class ChecklistEditorInput extends CdmEntitySessionInput implements IPersistable {
+public class ChecklistEditorInput extends CdmEntitySessionInput<TaxonNode> implements IPersistable {
/**
* The selected classification
*/
private TaxonNode taxonNode = null;
- private List<TaxonBase> taxa = new ArrayList();
+ private List<TaxonBase> taxa = new ArrayList<>();
private Classification classification = null;
private final ConversationHolder conversation;
- private List<TaxonBase> taxaToSave = new ArrayList();
+ private List<TaxonBase> taxaToSave = new ArrayList<>();
/**
}
-
- /**
- * @param taxonNode2
- */
private void getChildTaxa(TaxonNode taxonNode2) {
taxonNode2.removeNullValueFromChildren();
if (taxonNode2.hasChildNodes()){
getChildTaxa(node);
}
}
-
-
}
/**
}
-
-
public List<TaxonBase> getTaxa() {
return taxa;
}
}
}
-
- /**
- * @return the taxonNode
- */
public TaxonNode getTaxonNode() {
return taxonNode;
}
- /**
- * @return classification
- */
public Classification getClassification(){
return classification;
}
-// /**
-// * @return the conversationHolder
-// */
// public ConversationHolder getConversationHolder() {
// return conversationHolder;
// }
-
-
-// /* (non-Javadoc)
-// * @see java.lang.Object#hashCode()
-// */
// @Override
// public int hashCode() {
// final int prime = 31;
// return result;
// }
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object obj) {
if (this == obj) {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IPersistable#saveState(org.eclipse.ui.IMemento)
- */
@Override
public void saveState(IMemento memento) {
UUID uuid = classification.getUuid();
CdmStore.getService(ITaxonService.class).merge(taxaToSave, true);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getRootEntities()
- */
@Override
public List<TaxonNode> getRootEntities() {
return Arrays.asList(taxonNode);
}
- /**
- * @return the conversation
- */
public ConversationHolder getConversation() {
return conversation;
}
return taxonBasePropertyPaths;
}
-
public void setTaxa(List<TaxonBase> taxonList) {
this.taxa = taxonList;
}
-
/**
* @param element
*/
// super.dispose();
// }
-}
+}
\ No newline at end of file
import java.util.Map;
import java.util.Set;
-import javax.inject.Inject;
-
-import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.nebula.widgets.nattable.data.IColumnPropertyAccessor;
import eu.etaxonomy.cdm.api.service.dto.TaxonDistributionDTO;
import eu.etaxonomy.taxeditor.event.EventUtility;
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
-
/**
* @author k.luther
* @since 28.11.2018
- *
*/
public class DistributionColumnAccessor implements IColumnPropertyAccessor<TaxonDistributionDTO> {
- private DistributionEditor editor;
+
public static final String DEFAULT_ENTRY = "";
- @Inject
- private IEventBroker eventBroker;
+
+ private DistributionEditor editor;
public DistributionColumnAccessor(DistributionEditor editor) {
this.editor = editor;
}
-
- /**
- * {@inheritDoc}
- */
@Override
public Object getDataValue(TaxonDistributionDTO rowObject, int columnIndex) {
// editor.setActualNameCache(rowObject.getNameCache());
}
-
- /**
- * {@inheritDoc}
- */
@Override
public int getColumnCount() {
return editor.getPropertyToLabelMap().size();
}
- /**
- * {@inheritDoc}
- */
@Override
public String getColumnProperty(int columnIndex) {
return editor.getPropertyToLabelMap().get(columnIndex);
}
- /**
- * {@inheritDoc}
- */
@Override
public int getColumnIndex(String propertyName){
return editor.getPropertyToLabelMap().indexOf(propertyName);
}
-
- /**
- * {@inheritDoc}
- */
@Override
public void setDataValue(TaxonDistributionDTO taxonWrapper, int columnIndex, Object newValue) {
if (newValue instanceof StatusHelper){
}
EventUtility.postEvent(WorkbenchEventConstants.REFRESH_DETAILS, true);
-
}
-
-}
+}
\ No newline at end of file
import java.util.TreeSet;
import java.util.UUID;
-import javax.inject.Inject;
-
import org.apache.commons.collections4.map.LinkedMap;
import org.apache.log4j.Logger;
-import org.eclipse.e4.ui.services.EMenuService;
import org.eclipse.jface.layout.GridDataFactory;
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.jface.wizard.WizardDialog;
import eu.etaxonomy.cdm.api.service.IVocabularyService;
import eu.etaxonomy.cdm.api.service.dto.TaxonDescriptionDTO;
import eu.etaxonomy.cdm.api.service.dto.TaxonDistributionDTO;
+import eu.etaxonomy.cdm.compare.term.OrderedTermComparator;
+import eu.etaxonomy.cdm.compare.term.TermIdInVocabularyComparator;
+import eu.etaxonomy.cdm.compare.term.TermLanguageComparator;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
import eu.etaxonomy.cdm.model.description.Distribution;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
import eu.etaxonomy.cdm.model.term.OrderedTermBase;
-import eu.etaxonomy.cdm.model.term.OrderedTermComparator;
import eu.etaxonomy.cdm.model.term.Representation;
-import eu.etaxonomy.cdm.model.term.TermIdInVocabularyComparator;
-import eu.etaxonomy.cdm.model.term.TermLanguageComparator;
import eu.etaxonomy.cdm.model.term.TermType;
import eu.etaxonomy.cdm.model.term.TermVocabulary;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.editor.IDistributionEditor;
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.preference.Resources;
import eu.etaxonomy.taxeditor.preference.wizard.AvailableDistributionWizard;
import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.store.StoreUtil;
import eu.etaxonomy.taxeditor.ui.dialog.selection.ReferenceSelectionDialog;
/**
* @author k.luther
* @since 27.11.2018
- *
*/
public class DistributionEditor extends Composite implements IDistributionEditor{
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(DistributionEditor.class);
private static final String DISTRIBUTION_EDITOR = "Distribution Editor"; //$NON-NLS-1$
private static final String LOADING_TAXA = Messages.ChecklistEditor_LOAD_TAXA;
static final String RANK_COLUMN = "collector_column";//$NON-NLS-1$
static final String SYNONYM_COLUMN = "synonym_column";//$NON-NLS-1$
- private static final Logger logger = Logger.getLogger(DistributionEditor.class);
- @Inject
- private EMenuService menuService;
+
private NatTable natTable;
private Label statusLabel;
private Label statusLabelSourceReference;
private Reference defaultSource;
- private Map<Integer, NamedArea> areaToColumnIndexMap= new HashMap();
+ private Map<Integer, NamedArea> areaToColumnIndexMap= new HashMap<>();
private int firstDataColumnIndex;
private ListDataProvider<TaxonDistributionDTO> bodyDataProvider;
private LinkedMap<String, String> propertyToLabelMap = new LinkedMap<>();
private boolean isShowRank = false;
- private Integer countNodes;
private Text searchText;
- Button button3;
- Button button2;
-
- EventList<TaxonDistributionDTO> taxonList;
- String actualNameCache = null;
- Map<UUID,Map<NamedArea,Set<DescriptionElementBase>>> taxonDistributionMap = new HashMap<>();
+ private Button button3;
+ private Button button2;
- List<TaxonDistributionDTO> descriptionsToSave = new ArrayList<>();
+ protected EventList<TaxonDistributionDTO> taxonList;
+ private String actualNameCache;
+ protected Map<UUID,Map<NamedArea,Set<DescriptionElementBase>>> taxonDistributionMap = new HashMap<>();
+ protected List<TaxonDistributionDTO> descriptionsToSave = new ArrayList<>();
- SortedSet<DefinedTermBase> areas;
- DistributionEditorPart part;
- BodyLayerStack<TaxonDistributionDTO> bodyLayerStack;
+ protected SortedSet<DefinedTermBase> areas;
+ protected DistributionEditorPart part;
+ private BodyLayerStack<TaxonDistributionDTO> bodyLayerStack;
private FreezeLayer freezeLayer;
private ConfigRegistry configRegistry;
private AbstractLayer topMostLayer;
private SelectionLayer selectionLayer;
-
-
- // private FixedSummaryRowLayer summaryRowLayer;
-
-
- /**
- * @param parent
- * @param style
- */
public DistributionEditor(Composite parent, DistributionEditorPart part) {
super(parent, SWT.NULL);
isShowRank = PreferencesUtil.getBooleanValue(PreferencePredicate.ShowRankInDistributionEditor.getKey());
Composite topComposite = new Composite(parent, SWT.NONE);
createTopComposite(topComposite);
-
-
natTable = new NatTable(parent, false);
parent.pack();
return areaToColumnIndexMap;
}
-
public void setAreaToColumnIndexMap(Map<Integer, NamedArea> areaToColumnIndexMap) {
this.areaToColumnIndexMap = areaToColumnIndexMap;
}
-
public List<TaxonDistributionDTO> getDescriptionsToSave() {
return descriptionsToSave;
}
this.descriptionsToSave = descriptionsToSave;
}
-
-
private void createStatusBar(Composite composite) {
GridData gridData = new GridData();
gridData.horizontalSpan = 2;
statusLabelSourceReference.setLayoutData(gridData);
if (defaultSource != null){
- statusLabelSourceReference.setText(Messages.DistributionEditor_defaultSource + defaultSource.getAbbrevTitle() != null? defaultSource.getAbbrevTitle() : defaultSource.getAbbrevTitleCache());
-
+ statusLabelSourceReference.setText(Messages.DistributionEditor_defaultSource + (defaultSource.getAbbrevTitle() != null? defaultSource.getAbbrevTitle() : defaultSource.getAbbrevTitleCache()));
}
button3 = new Button(composite, SWT.PUSH );
}
statusLabelSourceReference.setText(defaultSourceStr);
- button3.setBackground(EditorUtil.getColor(Resources.COLOR_CONTROL_SELECTED));
+ button3.setBackground(AbstractUtility.getColor(Resources.COLOR_CONTROL_SELECTED));
button3.setEnabled(false);
button2.setText(Messages.ChecklistEditor_DEFAULT_SOURCE);
}
});
-
}
private void applyStyles(){
configuration.cHeaderBgColor = GUIHelper.getColor(211, 211, 211);
configuration.rHeaderBgColor = GUIHelper.getColor(211, 211, 211);
natTable.addConfiguration(configuration);
-
}
private void configureNatTable(ConfigRegistry configRegistry,
*/
natTable.setConfigRegistry(configRegistry);
-
-
//add default configuration because autoconfigure is set to false in constructor
natTable.addConfiguration(new DefaultNatTableStyleConfiguration());
// add custom configuration for data conversion and add column labels to viewport layer
topMostLayer.addConfiguration(new DistributionCellEditorDataConversionConfiguration(this));
-
applyStyles();
natTable.configure();
}
/**
* layers
*/
-
createLayers();
/**
this.layout();
natTable.doCommand(new ClientAreaResizeCommand(natTable));
// boolean ok = natTable.doCommand(new ClientAreaResizeCommand(natTable));
-
}
-
private void createLayers() {
DistributionColumnAccessor columnPropertyAccessor = new DistributionColumnAccessor(this);
-
DistributionEditorConfigLabelAccumulator labelAccumulator = new DistributionEditorConfigLabelAccumulator(this);
- bodyLayerStack = new BodyLayerStack<>(taxonList, columnPropertyAccessor, new TaxonDistributionDtoComparator(), labelAccumulator);
+// bodyLayerStack = new BodyLayerStack<>(taxonList, columnPropertyAccessor, new TaxonDistributionDtoComparator(), labelAccumulator);
+ bodyLayerStack = new BodyLayerStack<>(taxonList, columnPropertyAccessor, null, labelAccumulator);
bodyDataProvider = bodyLayerStack.getBodyDataProvider();
-
-
propertyToLabelMap.put(TAXON_COLUMN, Messages.ChecklistEditor_TAXON);
if (isShowRank){
propertyToLabelMap.put(RANK_COLUMN, Messages.ChecklistEditor_RANK);
initLabels();
this.selectionLayer = bodyLayerStack.getSelectionLayer();
-
-
freezeLayer = new FreezeLayer(selectionLayer);
final CompositeFreezeLayer compositeFreezeLayer = new CompositeFreezeLayer(
freezeLayer, bodyLayerStack.getViewPortLayer(), selectionLayer);
// is working correctly
compositeFreezeLayer.setRegionName(GridRegion.BODY);
-
IDataProvider columnHeaderDataProvider =
new DefaultColumnHeaderDataProvider(propertyToLabelMap.values().toArray(new String[] {}), propertyToLabelMap);
DataLayer columnHeaderDataLayer = new DefaultColumnHeaderDataLayer(columnHeaderDataProvider);
columnHeaderDataLayer.getDataProvider(),
configRegistry);
-
-
// build the row header layer stack
IDataProvider rowHeaderDataProvider = new DefaultRowHeaderDataProvider(bodyDataProvider);
DataLayer rowHeaderDataLayer = new DefaultRowHeaderDataLayer(rowHeaderDataProvider);
compositeFreezeLayer,
selectionLayer);
-
-
IDataProvider cornerDataProvider =
new DefaultCornerDataProvider(
columnHeaderDataProvider,
cornerLayer);
natTable.setLayer(gridLayer);
-
-
topMostLayer = compositeFreezeLayer;
-
-
}
- /**
- * @param parent
- * @return
- */
private Text createSearchBar(Composite parent) {
Button button1 = new Button(parent, SWT.PUSH );
button1.setLayoutData(gridData2);
-
button1.setText(Messages.ChecklistEditor_DIST_STATUS);
button1.setToolTipText(Messages.ChecklistEditor_DIST_STATUS_TOOLTIP);
button1.addSelectionListener(new SelectionAdapter() {
@Override
public void widgetSelected(SelectionEvent event) {
AvailableDistributionWizard availableDistributionWizard = new AvailableDistributionWizard();
- WizardDialog dialog = new WizardDialog(StoreUtil.getShell(),
+ WizardDialog dialog = new WizardDialog(AbstractUtility.getShell(),
availableDistributionWizard);
int open = dialog.open();
}
statusLabelSourceReference.setText(defaultSourceStr);
- button2.setBackground(EditorUtil.getColor(Resources.COLOR_CONTROL_SELECTED));
+ button2.setBackground(AbstractUtility.getColor(Resources.COLOR_CONTROL_SELECTED));
// EventUtility.postEvent(WorkbenchEventConstants.REFRESH_DETAILS, true);
button3.setEnabled(true);
button2.setText(Messages.ChecklistEditor_SWITCH_DEFAULT_SOURCE);
}
-
});
-
-
-
-
parent.pack();
return searchText;
}
* <b>Notice:</b> for data update please use <b>refresh()</b>
*
*/
- @SuppressWarnings({ "unchecked", "rawtypes" })
public void reload(){
this.areaToColumnIndexMap.clear();
this.areas.clear();
natTable.redraw();
}
- /**
- * @param parent
- */
private void createTopComposite(Composite parent) {
GridLayout gridLayout = new GridLayout(3, false);
gridLayout.marginWidth = 0;
this.taxonList = new BasicEventList<>();
}
taxonList.stream().forEach(wrapper->DistributionEditor.this.taxonList.add(wrapper));
- statusLabel.setText(ELEMENT_COUNT + (taxonList != null ? taxonList.size() : UNKNOWN));
+ statusLabel.setText(ELEMENT_COUNT + taxonList.size());
createTaxonDistributionMap();
}
protected void createTaxonDistributionMap() {
Iterator<TaxonDistributionDTO> iterator = this.taxonList.iterator();
- while (iterator.hasNext()){
- TaxonDistributionDTO dto = iterator.next();
- TaxonDescriptionDTO descriptionDto = dto.getDescriptionsWrapper();
- for (TaxonDescription desc: descriptionDto.getDescriptions()){
- if(this.part.getCdmEntitySession()!=null){
- this.part.getCdmEntitySession().load(desc, true);
- }
- for (DescriptionElementBase descElement: desc.getElements()){
- if (descElement instanceof Distribution){
- Map<NamedArea, Set<DescriptionElementBase>> distributionsMap = taxonDistributionMap.get(dto.getTaxonUuid());
-
- if (distributionsMap == null){
- distributionsMap = new HashMap();
- taxonDistributionMap.put(dto.getTaxonUuid(), distributionsMap);
- }
- Set<DescriptionElementBase> distributions = distributionsMap.get(((Distribution) descElement).getArea());
- if (distributions == null){
- distributions = new HashSet();
- distributionsMap.put(((Distribution)descElement).getArea(), distributions);
- }
- distributions.add(descElement);
-
- }
- }
- }
- }
+ while (iterator.hasNext()){
+ TaxonDistributionDTO dto = iterator.next();
+ TaxonDescriptionDTO descriptionDto = dto.getDescriptionsWrapper();
+ for (TaxonDescription desc: descriptionDto.getDescriptions()){
+ if(this.part.getCdmEntitySession()!=null){
+ this.part.getCdmEntitySession().load(desc, true);
+ }
+ for (DescriptionElementBase descElement: desc.getElements()){
+ if (descElement instanceof Distribution){
+ Map<NamedArea, Set<DescriptionElementBase>> distributionsMap = taxonDistributionMap.get(dto.getTaxonUuid());
+
+ if (distributionsMap == null){
+ distributionsMap = new HashMap<>();
+ taxonDistributionMap.put(dto.getTaxonUuid(), distributionsMap);
+ }
+ Set<DescriptionElementBase> distributions = distributionsMap.get(((Distribution) descElement).getArea());
+ if (distributions == null){
+ distributions = new HashSet<>();
+ distributionsMap.put(((Distribution)descElement).getArea(), distributions);
+ }
+ distributions.add(descElement);
+ }
+ }
+ }
+ }
}
-
-
-
-
private void initLabels() {
int index = 2;
if (areas == null){
areas = new TreeSet<>();
}
- for (DefinedTermBase area: areas) {
+ for (DefinedTermBase<?> area: areas) {
this.areaToColumnIndexMap.put(index++, (NamedArea)area);
String areaLabel;
//TODO: adapt to preference
areaLabel = label;
}
-
//String areaLabel = area.getLabel();
String property = area.getUuid().toString();
propertyToLabelMap.put(property, areaLabel);
}
-
}
private SortedSet<DefinedTermBase> loadNamedAreas() {
Set<UUID> uuidList = new HashSet<UUID>();
String[] split;
List<String> listValue;
- List<DefinedTermBase> termlist = new ArrayList<DefinedTermBase>();
+ List<DefinedTermBase> termlist = new ArrayList<>();
if (values != null && values != "") { //$NON-NLS-1$
split = values.split(";"); //$NON-NLS-1$
listValue = Arrays.asList(split);
-
UUID uuid;
for(String s : listValue){
uuid = UUID.fromString(s);
uuidList.add(uuid);
-
}
}
}else{
vocs= service.find(uuidList);
}
- for (TermVocabulary voc: vocs){
+ for (TermVocabulary<?> voc: vocs){
termlist.addAll(service.getTerms(voc, null, null, null, null).getRecords());
}
- List<DefinedTermBase> filteredList = new ArrayList();
+ List<DefinedTermBase> filteredList = new ArrayList<>();
if (valuesAreas != null && valuesAreas != "") {
split = valuesAreas.split(";"); //$NON-NLS-1$
listValue = Arrays.asList(split);
- for (DefinedTermBase area: termlist){
+ for (DefinedTermBase<?> area: termlist){
if (listValue.contains(area.getUuid().toString())) {
filteredList.add(area);
}
-
}
}else{
filteredList.addAll(termlist);
}
-
TermOrder sortOrder = PreferencesUtil.getSortNamedAreasInDistributionEditor();
if (sortOrder.equals(TermOrder.Natural)){
areas = getTermsOrderedByVocabularyOrder(filteredList);
}
public SortedSet<DefinedTermBase> getTermsOrderedByLabels(List<DefinedTermBase> listTerm,Language language){
- TermLanguageComparator<?> comp = new TermLanguageComparator<>();
- comp.setCompareLanguage(language);
- SortedSet<DefinedTermBase> result = new TreeSet(comp);
+ TermLanguageComparator<DefinedTermBase> comp = new TermLanguageComparator<>(Language.DEFAULT(), language);
+ SortedSet<DefinedTermBase> result = new TreeSet<>(comp);
if(listTerm != null){
result.addAll(listTerm);
}
}
public SortedSet<DefinedTermBase> getTermsOrderedByIdInVocabulary(List<DefinedTermBase> namedAreas) {
- TermIdInVocabularyComparator<?> comp = new TermIdInVocabularyComparator<>();
+ TermIdInVocabularyComparator<DefinedTermBase> comp = new TermIdInVocabularyComparator<>();
- SortedSet<DefinedTermBase> result = new TreeSet(comp);
+ SortedSet<DefinedTermBase> result = new TreeSet<>(comp);
if(namedAreas != null){
result.addAll(namedAreas);
}
}
public SortedSet<DefinedTermBase> getTermsOrderedByVocabularyOrder(List<DefinedTermBase> listAreas){
- HashMap<TermVocabulary<DefinedTermBase>, List<DefinedTermBase>> vocs = new HashMap<>();
- OrderedTermComparator<?> comp = new OrderedTermComparator<>();
+ OrderedTermComparator<DefinedTermBase> comp = new OrderedTermComparator<>();
boolean allOrderedTerms = true;
List<TermVocabulary> alreadyOrderIndexNull = new ArrayList<>();
- for (DefinedTermBase term: listAreas){
+ for (DefinedTermBase<?> term: listAreas){
if (!(term instanceof OrderedTermBase)){
allOrderedTerms = false;
break;
- }else if (((OrderedTermBase)term).getOrderIndex() == 0){
+ }else if (((OrderedTermBase<?>)term).getOrderIndex() == 0){
if(alreadyOrderIndexNull.contains(term.getVocabulary())) {
allOrderedTerms = false;
break;
}
}
if (allOrderedTerms){
- SortedSet<DefinedTermBase> result = new TreeSet(comp.reversed());
+ SortedSet<DefinedTermBase> result = new TreeSet<>(comp.reversed());
result.addAll(listAreas);
return result;
}else{
return getTermsOrderedByLabels(listAreas, PreferencesUtil.getGlobalLanguage());
}
-
-
}
private void registerHandlersAndListeners(AbstractLayer topMostLayer) {
//selection listener
- E4SelectionListener selectionListener = new DistributionCellSelectionListener(part.getSelectionService(),
+ E4SelectionListener<?> selectionListener = new DistributionCellSelectionListener(part.getSelectionService(),
selectionLayer, bodyDataProvider, part);
selectionLayer.addLayerListener(selectionListener);
selectionListener.setFullySelectedRowsOnly(false);
// natTable.registerCommandHandler(toolbar.getDisplayPersistenceDialogCommandHandler());
}
- /**
- * @return
- */
public IRowDataProvider<TaxonDistributionDTO> getBodyDataProvider() {
return bodyDataProvider;
}
// loadDistributions(taxonList);
//
// }
-
-
-
-}
+}
\ No newline at end of file
import javax.annotation.PreDestroy;
import javax.inject.Inject;
+import eu.etaxonomy.cdm.compare.taxon.TaxonNodeSortMode;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.e4.core.contexts.ContextInjectionFactory;
import org.eclipse.e4.core.contexts.IEclipseContext;
import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
+import eu.etaxonomy.taxeditor.preference.NavigatorOrderEnum;
+import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
* @author k.luther
* @since 28.11.2018
- *
*/
-public class DistributionEditorPart implements IE4SavablePart, IConversationEnabled, IDirtyMarkable,
-ICdmEntitySessionEnabled, IPartContentHasSupplementalData, IPartContentHasDetails, IDistributionEditorPart{
+public class DistributionEditorPart
+ implements IE4SavablePart, IConversationEnabled, IDirtyMarkable,
+ ICdmEntitySessionEnabled<DescriptionBase>, IPartContentHasSupplementalData,
+ IPartContentHasDetails, IDistributionEditorPart {
private static final List<String> TAXONNODE_PROPERTY_PATH = Arrays.asList(new String[] {
"taxon", //$NON-NLS-1$
}
public void init(UuidAndTitleCache nodeDto) {
- List<UUID> uuidList = new ArrayList();
+ List<UUID> uuidList = new ArrayList<>();
uuidList.add(nodeDto.getUuid());
this.taxonList = CdmStore.getService(ITaxonNodeService.class).getTaxonDistributionDTO(uuidList, TAXONNODE_PROPERTY_PATH, true);
// taxonList.stream().filter(taxonDistribution -> CdmStore.currentAuthentiationHasPermission(taxonDistribution.getTaxonUuid(), RequiredPermissions.TAXONNODE_EDIT));
public void init(List<UuidAndTitleCache> uuidAndTitleCaches) {
List<UUID> nodeUuids = new ArrayList<>();
uuidAndTitleCaches.forEach(element -> nodeUuids.add(element.getUuid()));
- this.taxonList = CdmStore.getService(ITaxonNodeService.class).getTaxonDistributionDTO(nodeUuids, TAXONNODE_PROPERTY_PATH, true);
- // taxonList.stream().filter(taxonDistribution -> CdmStore.currentAuthentiationHasPermission(taxonDistribution.getTaxonUuid(), RequiredPermissions.TAXONNODE_EDIT));
+ TaxonNodeSortMode sortMode = TaxonNodeSortMode.RankAndAlphabeticalOrder;
+ NavigatorOrderEnum orderValue = NavigatorOrderEnum.RankAndNameOrder;
+ try{
+ orderValue = PreferencesUtil.getSortNodes();
+ }catch(IllegalArgumentException e){
+
+ }
+
+ if (orderValue.equals(NavigatorOrderEnum.NaturalOrder)){
+ sortMode = TaxonNodeSortMode.NaturalOrder;
+ } else if (orderValue.equals(NavigatorOrderEnum.AlphabeticalOrder)){
+ sortMode = TaxonNodeSortMode.AlphabeticalOrder;
+ }else {
+ sortMode = TaxonNodeSortMode.RankAndAlphabeticalOrder;
+ }
+ this.taxonList = CdmStore.getService(ITaxonNodeService.class).getTaxonDistributionDTO(nodeUuids, TAXONNODE_PROPERTY_PATH,null, true, sortMode);
+ // taxonList.stream().filter(taxonDistribution -> CdmStore.currentAuthentiationHasPermission(taxonDistribution.getTaxonUuid(), RequiredPermissions.TAXONNODE_EDIT));
if(taxonList!=null){
editor.loadDistributions(taxonList);
cdmEntitySession.bind();
}
EditorUtil.checkAndCloseFactsAndMediaParts(partService);
-
}
@Override
return editor;
}
- /**
- * {@inheritDoc}
- */
@Override
public void update(CdmDataChangeMap changeEvents) {
// TODO Auto-generated method stub
-
}
+
@PreDestroy
public void dispose(){
if (conversation != null) {
cdmEntitySession = null;
}
dirty.setDirty(false);
-
}
-
- /**
- * {@inheritDoc}
- */
@Override
public ICdmEntitySession getCdmEntitySession() {
-
return cdmEntitySession;
}
-
@Override
public List<DescriptionBase> getRootEntities() {
- List<DescriptionBase> rootEntities = new ArrayList();
+ List<DescriptionBase> rootEntities = new ArrayList<>();
editor.taxonList.forEach(dto -> rootEntities.addAll(dto.getDescriptionsWrapper().getDescriptions()));
return rootEntities;
}
- /**
- * {@inheritDoc}
- */
@Override
public Map<Object, List<String>> getPropertyPathsMap() {
// TODO Auto-generated method stub
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public void changed(Object element) {
if (element != null){
dirty.setDirty(true);
}
-
}
- /**
- * {@inheritDoc}
- */
@Override
public void forceDirty() {
// TODO Auto-generated method stub
-
}
- /**
- * {@inheritDoc}
- */
@Override
public ConversationHolder getConversationHolder() {
-
return conversation;
}
-
@Persist
@Override
public void save(IProgressMonitor monitor) {
}
protected void saveDistributions() {
- Set<TaxonDistributionDTO> coll = new HashSet();
+ Set<TaxonDistributionDTO> coll = new HashSet<>();
editor.getDescriptionsToSave().forEach(dto->coll.add(dto));
- Set<TaxonDistributionDTO> removeList = new HashSet();
+ Set<TaxonDistributionDTO> removeList = new HashSet<>();
for (TaxonDistributionDTO dto: coll){
Taxon taxon = null;
for(TaxonDescription desc: dto.getDescriptionsWrapper().getDescriptions()){
editor.getDescriptionsToSave().clear();
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean isDirty() {
return this.dirty.isDirty();
public void setDirty() {
this.dirty.setDirty(true);
}
-
-
-
-
-}
+}
\ No newline at end of file
import org.apache.commons.lang3.StringUtils;
import org.eclipse.nebula.widgets.nattable.edit.editor.IComboBoxDataProvider;
+import eu.etaxonomy.cdm.compare.term.OrderedTermComparator;
+import eu.etaxonomy.cdm.compare.term.TermIdInVocabularyComparator;
+import eu.etaxonomy.cdm.compare.term.TermLanguageComparator;
+import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
import eu.etaxonomy.cdm.model.location.NamedArea;
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
import eu.etaxonomy.cdm.model.metadata.PreferenceSubject;
import eu.etaxonomy.cdm.model.metadata.TermOrder;
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
-import eu.etaxonomy.cdm.model.term.OrderedTermComparator;
import eu.etaxonomy.cdm.model.term.Representation;
-import eu.etaxonomy.cdm.model.term.TermIdInVocabularyComparator;
-import eu.etaxonomy.cdm.model.term.TermLanguageComparator;
import eu.etaxonomy.taxeditor.preference.CdmPreferenceCache;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
if (!StringUtils.isBlank(statusString)){
String [] statusArray = statusString.split(";");
- List<UUID> uuidList = new ArrayList();
+ List<UUID> uuidList = new ArrayList<>();
for (String status: statusArray){
uuidList.add(UUID.fromString(status));
}
TermOrder order = TermOrder.valueOf(PreferencesUtil.getStringValue(PreferencePredicate.StatusSortedInDistributionEditor.getKey()));
if (order.equals(TermOrder.IdInVoc)){
- comp = new TermIdInVocabularyComparator();
+ comp = new TermIdInVocabularyComparator<DefinedTermBase>();
}else if(order.equals(TermOrder.Label)){
- comp = new TermLanguageComparator();
+ comp = new TermLanguageComparator<DefinedTermBase>(Language.DEFAULT(), Language.DEFAULT());
}
Collections.sort(inputList, comp);
// Collections.sort(inputList, Collections.reverseOrder());
public int getMaxVisibleItems(){
return maxVisibleItems;
}
-
-}
+}
\ No newline at end of file
import java.util.Comparator;
import eu.etaxonomy.cdm.api.service.dto.TaxonDistributionDTO;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByNameComparator;
+import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByRankAndNameComparator;
/**
* @author k.luther
* @since 28.11.2018
- *
*/
public class TaxonDistributionDtoComparator implements Comparator<TaxonDistributionDTO> {
- /**
- * {@inheritDoc}
- */
+ Comparator<TaxonNodeDto> comparator1 = new TaxonNodeDtoByRankAndNameComparator();
+ Comparator<TaxonNodeDto> comparator2 = new TaxonNodeDtoByNameComparator();
+
+ public TaxonDistributionDtoComparator(){
+ super();
+ }
+
@Override
- public int compare(TaxonDistributionDTO arg0, TaxonDistributionDTO arg1) {
- if (arg0 == arg1){
- return 0;
+ public int compare(TaxonDistributionDTO taxonDistr0, TaxonDistributionDTO taxonDistr1) {
+ //if node is higher in tree then return 1;
+ if (taxonDistr0.getTaxonNodeDto().getTreeIndex().split("#").length < taxonDistr1.getTaxonNodeDto().getTreeIndex().split("#").length){
+ return -1;
+ }else if (taxonDistr0.getTaxonNodeDto().getTreeIndex().split("#").length > taxonDistr1.getTaxonNodeDto().getTreeIndex().split("#").length){
+ return 1;
}
- if (arg0.getTaxonUuid().equals(arg1.getTaxonUuid())){
- return 0;
+ //if parent is not the same sort by name
+ if ((taxonDistr0.getTaxonNodeDto() != null && taxonDistr1.getTaxonNodeDto() != null) && !taxonDistr0.getTaxonNodeDto().getParentUUID().equals(taxonDistr1.getTaxonNodeDto().getParentUUID()) ){
+ return comparator2.compare(taxonDistr0.getTaxonNodeDto(), taxonDistr1.getTaxonNodeDto());
}
-
- String name1 = arg0.getNameCache();
- String name2 = arg1.getNameCache();
- Integer rankTax1 = arg0.getRankOrderIndex();
- Integer rankTax2 = arg1.getRankOrderIndex();
-// String parentName1 = arg0.get
- if (rankTax1 == null && rankTax2 != null){
- return 1;
- }else if(rankTax2 == null && rankTax1 != null){
+ // if parent is the same sort by rank and name
+ if (taxonDistr0.getTaxonNodeDto() != null && taxonDistr1.getTaxonNodeDto() != null && taxonDistr0.getTaxonNodeDto().getParentUUID().equals( taxonDistr1.getTaxonNodeDto().getParentUUID())){
+ return this.comparator1.compare(taxonDistr0.getTaxonNodeDto(), taxonDistr1.getTaxonNodeDto());
+ }else if (taxonDistr0 == taxonDistr1 || (taxonDistr0.getTaxonNodeDto() == null) && (taxonDistr1.getTaxonNodeDto() == null)){
+ return 0;
+ } else if (taxonDistr0.getTaxonNodeDto() != null && taxonDistr1.getTaxonNodeDto() == null){
return -1;
- }else if (rankTax1 != null && rankTax1 == rankTax2) {
- //same rank, order by name
- return name1.compareTo(name2);
- }else if (rankTax1 == null && rankTax2 == null || rankTax1.equals(rankTax2)){
- return -1;
- }
-
- return 0;
+ } else if (taxonDistr0.getTaxonNodeDto() == null && taxonDistr1.getTaxonNodeDto() != null){
+ return 1;
+ }else{
+ return taxonDistr0.getTaxonUuid().compareTo(taxonDistr1.getTaxonUuid());
+ }
}
}
+/**
+* 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.editor.view.checklist.edit;
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
*
* @author k.luther
* @created 26.09.2017
- * @version 1.0
*/
public class CdmComboBoxViewerCellEditor extends ComboBoxViewerCellEditor implements ISelectionListener, IPartContentHasDetails{
-
public CdmComboBoxViewerCellEditor(Composite parent, int style) {
super(parent, style);
-
}
@Override
System.out.println(selection.toString());
}
-
-}
+}
\ No newline at end of file
* 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.editor.view.concept;
import java.util.HashMap;
/**
* @author n.hoffmann
* @created Jan 24, 2011
- * @version 1.0
*/
public class ConceptContentProvider implements IStructuredContentProvider {
}
return new Object[0];
}
-
-}
+}
\ No newline at end of file
* 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.editor.view.concept;
import java.util.Map.Entry;
/**
* @author n.hoffmann
- * @created Jan 24, 2011
- * @version 1.0
*/
public class ConceptLabelProvider extends LabelProvider implements IStyledLabelProvider {
+/**
+* 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.editor.view.derivate;
import java.util.ArrayList;
/**
* Displays the derivate hierarchy of the specimen specified in the editor input.
- *
*/
public class DerivateView implements IPartContentHasFactualData, IConversationEnabled,
- ICdmEntitySessionEnabled, IDirtyMarkable, IPostOperationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, IPartContentHasMedia,
+ ICdmEntitySessionEnabled<SpecimenOrObservationBase<?>>, IDirtyMarkable, IPostOperationEnabled, IPartContentHasDetails, IPartContentHasSupplementalData, IPartContentHasMedia,
IContextListener, IE4SavablePart, ICollapsableExpandable {
private static final String SPECIMEN_EDITOR = Messages.DerivateView_SPECIMEN_EDITOR;
public DerivateView() {
}
- /**
- * {@inheritDoc}
- */
public void init(DerivateViewEditorInput editorInput){
this.derivateToRootEntityMap = new HashMap<>();
this.rootElements = new HashSet<>();
}
}
-
public void updateRootEntities(List<SpecimenOrObservationBase> derivates) {
if(derivates!=null){
eventBroker.post(WorkbenchEventConstants.CURRENT_ACTIVE_EDITOR, null);
this.derivateToRootEntityMap = new HashMap<>();
this.rootElements = new HashSet<>();
- for (SpecimenOrObservationBase derivate : derivates) {
+ for (SpecimenOrObservationBase<?> derivate : derivates) {
if(derivate instanceof FieldUnit){
derivateToRootEntityMap.put(derivate, derivate);
labelProvider.updateLabelCache(rootElements);
viewer.setInput(rootElements);
viewer.setComparator(new ViewerComparator() {
- @Override
- @SuppressWarnings("unchecked")
- public int compare(Viewer testViewer, Object e1, Object e2) {
- if (((TreeNode)e1).getValue() instanceof SpecimenOrObservationBase){
- return ((SpecimenOrObservationBase)((TreeNode)e1).getValue()).getTitleCache().compareTo(((SpecimenOrObservationBase)((TreeNode)e2).getValue()).getTitleCache());
- }else{
- return e1.toString().compareTo(e2.toString());
- }
- //return (((SpecimenOrObservationBase) e1).getTitleCache()).compareTo(((SpecimenOrObservationBase) e2).getTitleCache());
+ @Override
+ public int compare(Viewer testViewer, Object e1, Object e2) {
+ if (((TreeNode)e1).getValue() instanceof SpecimenOrObservationBase){
+ return ((SpecimenOrObservationBase)((TreeNode)e1).getValue()).getTitleCache().compareTo(((SpecimenOrObservationBase)((TreeNode)e2).getValue()).getTitleCache());
+ }else{
+ return e1.toString().compareTo(e2.toString());
+ }
+ //return (((SpecimenOrObservationBase) e1).getTitleCache()).compareTo(((SpecimenOrObservationBase) e2).getTitleCache());
}
});
obj = ((TreeNode)obj).getValue();
}
rootElements.remove(obj);
- Object o = this.derivateToRootEntityMap.remove(obj);
+ this.derivateToRootEntityMap.remove(obj);
viewer.setInput(rootElements);
}
else if(selection != null){
Object selectedElement = selection.getFirstElement();
if(selectedElement instanceof TaxonNodeDto){
- TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).load(((TaxonNodeDto)selectedElement).getTaxonUuid());
+ TaxonBase<?> taxonBase = CdmStore.getService(ITaxonService.class).load(((TaxonNodeDto)selectedElement).getTaxonUuid());
if(HibernateProxyHelper.isInstanceOf(taxonBase, Taxon.class)){
selectedTaxon = HibernateProxyHelper.deproxy(taxonBase, Taxon.class);
}
}
}
if(selectedTaxon!=null){
- Collection<SpecimenOrObservationBase> fieldUnits = CdmStore.getService(IOccurrenceService.class).listFieldUnitsByAssociatedTaxon(selectedTaxon, null, null);
+ Collection<FieldUnit> fieldUnits = CdmStore.getService(IOccurrenceService.class).listRootUnitsByAssociatedTaxon(FieldUnit.class, selectedTaxon, null, null);
Collection<UUID> uuids = new HashSet<>();
- for (SpecimenOrObservationBase specimenOrObservationBase : fieldUnits) {
+ for (SpecimenOrObservationBase<?> specimenOrObservationBase : fieldUnits) {
uuids.add(specimenOrObservationBase.getUuid());
}
checkWarnThreshold(uuids);
return viewer;
}
- /**
- * {@inheritDoc}
- */
@Override
public List<SpecimenOrObservationBase<?>> getRootEntities() {
return new ArrayList<>(rootElements);
return listenToSelectionChange;
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextStop(IMemento memento, IProgressMonitor monitor) {
//close view when workbench closes
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextStart(IMemento memento, IProgressMonitor monitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextRefresh(IProgressMonitor monitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
}
-
@Override
public boolean isDirty() {
return dirty.isDirty();
public void expand() {
viewer.expandAll();
}
-
-}
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.editor.view.derivate.handler;
-import eu.etaxonomy.cdm.model.molecular.DnaSample;
import eu.etaxonomy.cdm.model.occurrence.DerivationEventType;
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
*/
@Override
protected DerivedUnit createDerivative() {
- DnaSample dnaSample = DnaSample.NewInstance();
- dnaSample.setRecordBasis(SpecimenOrObservationType.TissueSample);
- return dnaSample;
+ DerivedUnit tissueSample = DerivedUnit.NewInstance(SpecimenOrObservationType.TissueSample);
+ return tissueSample;
}
/**
* 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.editor.view.descriptive;
import java.util.ArrayList;
/**
* @author n.hoffmann
* @created Feb 8, 2011
- * @version 1.0
*/
public class DescriptionElementDragListener extends DragSourceAdapter {
private FactualDataPartE4 part;
- private DescriptionBase description;
+ private DescriptionBase<?> description;
public DescriptionElementDragListener(FactualDataPartE4 part){
this.part = part;
}
}
-
}
/**
public void dragStart(DragSourceEvent event) {
event.doit = !part.getViewer().getSelection().isEmpty();
}
-
-}
+}
\ No newline at end of file
* 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.editor.view.descriptive;
import java.util.ArrayList;
/**
* @author n.hoffmann
* @created Feb 8, 2011
- * @version 1.0
*/
public class DescriptionElementDropAdapter extends EditViewerDropAdapter {
private static final String OPERATION_NOT_SUPPORTED_YET = Messages.DescriptionElementDropAdapter_NOT_SUPPORTED;
-
-
- /**
- * @param viewer
- */
public DescriptionElementDropAdapter(Viewer viewer) {
super(viewer);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerDropAdapter#performDrop(java.lang.Object)
- */
@Override
public boolean performDrop(Object data) {
DescriptionBase target = (DescriptionBase) getCurrentTarget();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerDropAdapter#validateDrop(java.lang.Object, int, org.eclipse.swt.dnd.TransferData)
- */
@Override
public boolean validateDrop(Object target, int operation,
TransferData transferData) {
transferData);
return target instanceof DescriptionBase && transferDataIsSupported;
}
-
-}
+}
\ No newline at end of file
* 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.editor.view.descriptive;
import java.util.UUID;
/**
* @author n.hoffmann
* @created Feb 8, 2011
- * @version 1.0
*/
public class DescriptionElementTransfer extends CdmObjectTransfer<DescriptionElementBase> {
private DescriptionElementTransfer(){}
- /* (non-Javadoc)
- * @see org.eclipse.swt.dnd.Transfer#getTypeIds()
- */
@Override
protected int[] getTypeIds() {
return new int[] { TYPEID };
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.dnd.Transfer#getTypeNames()
- */
@Override
protected String[] getTypeNames() {
return new String[] { TYPE_NAME };
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.model.CdmObjectTransfer#loadElement(java.util.UUID)
- */
@Override
public DescriptionElementBase loadElement(UUID uuid) {
return CdmStore.getService(IDescriptionService.class).loadDescriptionElement(uuid, null);
}
-}
+}
\ No newline at end of file
* 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.editor.view.descriptive;
import org.eclipse.jface.viewers.Viewer;
/**
* @author n.hoffmann
* @created Dec 2, 2010
- * @version 1.0
*/
public class DescriptiveViewerSorter extends ViewerSorter {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ViewerComparator#compare(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
- */
@Override
public int compare(Viewer viewer, Object e1, Object e2) {
if((e1 instanceof DescriptionElementBase) && (e2 instanceof DescriptionElementBase)){
}
return super.compare(viewer, e1, e2);
}
-
-}
+}
\ No newline at end of file
-// $Id$
/**
* Copyright (C) 2017 EDIT
* European Distributed Institute of Taxonomy
* @date 15.08.2017
*/
public class FactualDataPartE4 extends AbstractCdmEditorPartE4
- implements IPartContentHasDetails, IPartContentHasSupplementalData, ICdmEntitySessionEnabled,
- ICollapsableExpandable {
+ implements IPartContentHasDetails, IPartContentHasSupplementalData,
+ ICdmEntitySessionEnabled<CdmBase>, ICollapsableExpandable {
/**
* Maps {@link FeatureNodeContainerTree} to their corresponding {@link TaxonDescritpion}.<br>
* This serves as input for the {@link ITreeContentProvider} of the {@link TreeViewer}
*/
- protected Map<DescriptionBase<?>, FeatureNodeContainerTree> featureNodeContainerCache = new HashMap<DescriptionBase<?>, FeatureNodeContainerTree>();
+ protected Map<DescriptionBase<?>, FeatureNodeContainerTree> featureNodeContainerCache = new HashMap<>();
protected int dndOperations = DND.DROP_COPY | DND.DROP_MOVE;
@Override
public ICdmEntitySession getCdmEntitySession() {
if(selectionProvidingPart != null && selectionProvidingPart instanceof ICdmEntitySessionEnabled) {
- return ((ICdmEntitySessionEnabled) selectionProvidingPart).getCdmEntitySession();
+ return ((ICdmEntitySessionEnabled<?>) selectionProvidingPart).getCdmEntitySession();
}
return null;
}
@Override
- public List<? extends CdmBase> getRootEntities() {
+ public List<CdmBase> getRootEntities() {
return Arrays.asList((CdmBase)getViewer().getInput());
}
@Override
((TreeViewer)this.viewer).setExpandedElements(expandedObjects);
}
}
-
-
-
}
\ No newline at end of file
for(DescriptionElementBase descriptionElement : descriptions){
operation = new DeleteDescriptionElementOperation(label, undoContext, descriptionElement, factualDataPart, cdmEntitySessionEnabled);
-
}
+ ((FeatureNodeContainer)object).getContainerTree().removeContainer((FeatureNodeContainer)object);
+
+
}
-// if (operation != null){
-// operation.getPostOperationEnabled().postOperation(object);
-// }
if (factualDataPart.getSelectionProvidingPart().getObject() instanceof TaxonNameEditorE4){
((TaxonNameEditorE4)factualDataPart.getSelectionProvidingPart().getObject()).getEditorInput().addOperation(operation);
((TaxonNameEditorE4)factualDataPart.getSelectionProvidingPart().getObject()).setDirty();
((TaxonNameEditorE4)factualDataPart.getSelectionProvidingPart().getObject()).redraw();
-
}
if (factualDataPart.getSelectionProvidingPart().getObject() instanceof DerivateView){
((DerivateView)factualDataPart.getSelectionProvidingPart().getObject()).addOperation(operation);
}
}
viewer.refresh();
-// viewer.collapseAll();
if (expandedElements.length>0){
for (Object o: expandedElements){
MHandledMenuItem menuItem){
FactualDataPartE4 factualDataPart = (FactualDataPartE4) activePart.getObject();
ISelection selection = factualDataPart.getViewer().getSelection();
- boolean canExecute = selection instanceof IStructuredSelection && !selection.isEmpty();
+ boolean canExecute = selection instanceof IStructuredSelection && !selection.isEmpty() && !(((IStructuredSelection)selection).getFirstElement() instanceof FeatureNodeContainer);
+
menuItem.setVisible(canExecute);
return canExecute;
}
* 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.editor.view.descriptive.operation;
import org.eclipse.core.commands.ExecutionException;
/**
* @author n.hoffmann
* @created Feb 11, 2011
- * @version 1.0
*/
public class AddDerivedUnitFacadeMediaOperation extends AbstractPostTaxonOperation {
this.specimen = specimen;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
DerivedUnitFacade facade;
return postExecute(specimen);
}
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
@Override
public IStatus redo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
// TODO Auto-generated method stub
return null;
}
-
-}
+}
\ No newline at end of file
* 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.editor.view.descriptive.operation;
import org.eclipse.core.commands.ExecutionException;
import eu.etaxonomy.cdm.model.description.DescriptionBase;
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
*
* @author p.ciardelli
* @created 05.02.2009
- * @version 1.0
*/
public class DeleteDescriptionElementOperation extends AbstractPostTaxonOperation {
private final DescriptionElementBase element;
- private DescriptionBase description = null;
+ private DescriptionBase<?> description = null;
/**
* <p>Constructor for DeleteDescriptionElementOperation.</p>
*/
public DeleteDescriptionElementOperation(String label, IUndoContext undoContext,
DescriptionElementBase element, IPostOperationEnabled postOperationEnabled,
- ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ ICdmEntitySessionEnabled<Taxon> cdmEntitySessionEnabled) {
super(label, undoContext, postOperationEnabled, cdmEntitySessionEnabled);
this.element = element;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return postExecute(description);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus redo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return execute(monitor, info);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return postExecute(element);
}
-}
+}
\ No newline at end of file
* 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.editor.view.descriptive.operation;
import org.eclipse.core.commands.ExecutionException;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- *
* @author pplitzner
* @date Jan 15, 2015
- *
*/
-public class DeleteSpecimenDescriptionOperation extends AbstractPostOperation<SpecimenOrObservationBase<?>> {
+public class DeleteSpecimenDescriptionOperation
+ extends AbstractPostOperation<SpecimenOrObservationBase<?>> {
private final SpecimenDescription description;
IUndoContext undoContext,
SpecimenDescription description,
IPostOperationEnabled postOperationEnabled,
- ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ ICdmEntitySessionEnabled<SpecimenOrObservationBase<?>> cdmEntitySessionEnabled) {
super(label, undoContext, description.getDescribedSpecimenOrObservation(), postOperationEnabled, cdmEntitySessionEnabled);
this.description = description;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return postExecute(description);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus redo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return execute(monitor, info);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return postExecute(null);
}
-}
+}
\ No newline at end of file
* 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.editor.view.descriptive.operation;
import org.eclipse.core.commands.ExecutionException;
* @author p.ciardelli
* @author n.hoffmann
* @created 05.02.2009
- * @version 1.0
*/
public class DeleteTaxonDescriptionOperation extends AbstractPostTaxonOperation {
element = description.getTaxon();
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus redo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return execute(monitor, info);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return postExecute(null);
}
-}
+}
\ No newline at end of file
/**
* @author k.luther
* @since 4 Mar 2019
- *
*/
public class DeleteTaxonNameDescriptionOperation extends AbstractPostOperation<TaxonName> {
- private final TaxonNameDescription description;
- /**
- * @param label
- * @param undoContext
- * @param element
- * @param postOperationEnabled
- * @param cdmEntitySessionEnabled
- */
+
+ private final TaxonNameDescription description;
+
public DeleteTaxonNameDescriptionOperation(String label, IUndoContext undoContext, TaxonNameDescription description,
- IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled<TaxonName> cdmEntitySessionEnabled) {
super(label, undoContext, description.getTaxonName(), postOperationEnabled, cdmEntitySessionEnabled);
this.description = description;
-
}
- /**
- * {@inheritDoc}
- */
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
return execute(monitor, info);
}
- /**
- * {@inheritDoc}
- */
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
element.addDescription(description);
return postExecute(null);
}
-
-}
+}
\ No newline at end of file
* 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.editor.view.descriptive.operation;
import java.util.Collection;
/**
* @author n.hoffmann
* @created Feb 8, 2011
- * @version 1.0
*/
public class MoveDescriptionElementsOperation extends AbstractPostTaxonOperation{
private Collection<DescriptionElementBase> descriptionElements;
- private DescriptionBase targetDescription;
- private DescriptionBase sourceDescription;
+ private DescriptionBase<?> targetDescription;
+ private DescriptionBase<?> sourceDescription;
private IDescriptionService service;
private UUID targetTaxonUuid;
private UISynchronize sync;
private boolean setNameInSource;
- /**
- *
- * @param label
- * @param undoContext
- * @param targetDescription
- * @param descriptionElements
- * @param isCopy
- * @param postOperationEnabled
- */
public MoveDescriptionElementsOperation(String label,
IUndoContext undoContext, DescriptionBase targetDescription, DescriptionBase sourceDescription,
Collection<DescriptionElementBase> descriptionElements, boolean isCopy,
service = CdmStore.getService(IDescriptionService.class);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return postExecute(null);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
@Override
public IStatus redo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return null;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
// TODO Auto-generated method stub
return null;
}
-
-
-
-}
+}
\ No newline at end of file
-// $Id$
/**
* Copyright (C) 2017 EDIT
* European Distributed Institute of Taxonomy
package eu.etaxonomy.taxeditor.editor.view.media;
import java.io.InputStream;
-import java.net.URI;
import java.util.List;
import java.util.Set;
import org.eclipse.swt.graphics.Image;
import org.eclipse.swt.widgets.Display;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.common.UriUtils;
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
import eu.etaxonomy.cdm.model.media.Media;
/**
* @author k.luther
* @date 11.10.2017
- *
*/
public class MediaViewLabelProvider extends LabelProvider implements IStyledLabelProvider {
* See LICENSE.TXT at the top of this package for the full license terms.
*/
package eu.etaxonomy.taxeditor.editor.view.media.handler;
+
import eu.etaxonomy.taxeditor.editor.view.media.operation.MoveMediaInListOperation;
/**
- *
* @author p.ciardelli
* @created 11.08.2009
- * @version 1.0
*/
public class MoveImageDownInListHandler extends AbstractMoveImageHandler{
public int moveImageOperation() {
return MoveMediaInListOperation.DOWN;
}
-
-}
+}
\ No newline at end of file
import eu.etaxonomy.taxeditor.editor.view.media.operation.MoveMediaInListOperation;
/**
- *
* @author p.ciardelli
* @created 11.08.2009
- * @version 1.0
*/
public class MoveImageUpInListHandler extends AbstractMoveImageHandler{
public int moveImageOperation() {
return MoveMediaInListOperation.UP;
}
-
-}
+}
\ No newline at end of file
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
- // ImagesUtility.removeMediaFromGallery(description, media);
+
if (monitor != null) {
monitor.worked(20);
}
errorMessage += "could not be deleted from database. ";
//MessagingUtils.errorDialog("test", getClass(), "message", TaxeditorBulkeditorPlugin.PLUGIN_ID, result.getExceptions().iterator().next(),true);
DeleteResultMessagingUtils.messageDialogWithDetails(result,errorMessage, TaxeditorBulkeditorPlugin.PLUGIN_ID);
-// if (config.isDeleteFromDescription()){
-// ImagesUtility.removeMediaFromGallery(description, media);
-// }
- }else{
-// ImagesUtility.removeMediaFromGallery(description, media);
+
}
- } else{
-// ImagesUtility.removeMediaFromGallery(description, media);
}
if (monitor != null){
monitor.worked(40);
}
- return postExecute(media);
+ return postExecute(null);
}
@Override
* 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.editor.view.media.operation;
import java.util.Collections;
*
* @author p.ciardelli
* @created 05.02.2009
- * @version 1.0
*/
public class MoveMediaInListOperation extends AbstractPostTaxonOperation {
/** Constant <code>DOWN=-1</code> */
public static final int DOWN = 1;
- private DescriptionBase description;
+ private DescriptionBase<?> description;
private Media media;
private int direction;
this.direction = direction;
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return postExecute(media);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus redo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return execute(monitor, info);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return postExecute(media);
}
- private void moveMedia(DescriptionBase description, Media media, int direction){
+ private void moveMedia(DescriptionBase<?> description, Media media, int direction){
Set<DescriptionElementBase> elements = description.getElements();
if(elements.size() != 1){
}
}
}
-}
+}
\ No newline at end of file
* The class provides the required content to the Uses View\r
* @author a.theys\r
* @created mar 13, 2012\r
- * @version 1.0\r
*/\r
public class UsesContentProvider extends DescriptiveContentProvider {\r
\r
- Set<MarkerType> markerTypes = new HashSet<MarkerType>();\r
+ Set<MarkerType> markerTypes = new HashSet<>();\r
\r
/**\r
* <p>Constructor for DescriptiveContentProvider.</p>\r
*/\r
@Override\r
protected List<DescriptionBase<?>> getDescriptions(IDescribable<?> parentElement) {\r
- List<DescriptionBase<?>> descriptions = new ArrayList<DescriptionBase<?>>();\r
+ List<DescriptionBase<?>> descriptions = new ArrayList<>();\r
if(parentElement instanceof Taxon){\r
Taxon taxon = (Taxon) parentElement;\r
this.markerTypes.addAll(CdmStore.getTermManager().getPreferredTerms(MarkerType.class));\r
}\r
return descriptions;\r
}\r
-\r
-}\r
+}
\ No newline at end of file
/**
- *
* @author pplitzner
* @since Sep 8, 2017
- *
*/
public class UsesViewPartE4 extends FactualDataPartE4 {
treeViewer.addDropSupport(dndOperations, transfers,
dropListener);
-
-
// Propagate selection from viewer
selectionChangedListener = (event -> selService.setSelection(event.getSelection()));
treeViewer.addSelectionChangedListener(selectionChangedListener);
return Messages.UsesViewPart_VIEWER_NAME;
}
- /** {@inheritDoc} */
@Override
public boolean postOperation(Object objectAffectedByOperation) {
viewer.refresh();
return super.postOperation(objectAffectedByOperation);
}
-
-}
+}
\ No newline at end of file
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
-
/**
* CreateUseRecordOperation Class
* @author a.theys
* @created mar 13, 2012
- * @version 1.0
*/
-public class CreateUseRecordOperation extends AbstractPostOperation {
+public class CreateUseRecordOperation extends AbstractPostOperation<Taxon> {
/** Constant <code>ID="eu.etaxonomy.taxeditor.editor.view.use."{trunked}</code> */
public static final String ID = "eu.etaxonomy.taxeditor.editor.use.createUseRecord"; //$NON-NLS-1$
this.feature = feature;
}
-
/**
* <p>Constructor for CreateUseRecordOperation.</p>
*
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;\r
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
\r
-\r
/**\r
* CreateUseSummaryOperation Class\r
* @author a.theys\r
* @created mar 13, 2012\r
- * @version 1.0\r
*/\r
-public class CreateUseSummaryOperation extends AbstractPostOperation {\r
+public class CreateUseSummaryOperation extends AbstractPostOperation<Taxon> {\r
\r
public static final String ID = "eu.etaxonomy.taxeditor.editor.use.createUseRecord"; //$NON-NLS-1$\r
\r
private final Feature feature;\r
private DescriptionElementBase element;\r
\r
-\r
/**\r
* <p>Constructor for CreateUseSummaryOperation.</p>\r
*\r
\r
/**\r
* <p>Constructor for CreateUseSummaryOperation.</p>\r
- *\r
- * @param undoContext a {@link org.eclipse.core.commands.operations.IUndoContext} object.\r
- * @param taxon a {@link eu.etaxonomy.cdm.model.taxon.Taxon} object.\r
- * @param description a {@link eu.etaxonomy.cdm.model.description.TaxonDescription} object.\r
- * @param feature a {@link eu.etaxonomy.cdm.model.description.Feature} object.\r
- * @param element a {@link eu.etaxonomy.cdm.model.description.DescriptionElementBase} object.\r
- * @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.\r
- * @param label a {@link java.lang.String} object.\r
*/\r
public CreateUseSummaryOperation(String label,\r
IUndoContext undoContext, Taxon taxon,\r
TaxonDescription description, Feature feature,\r
DescriptionElementBase element, IPostOperationEnabled postOperationEnabled) {\r
- this(label, undoContext, description, feature, postOperationEnabled);\r
-\r
+ \r
+ this(label, undoContext, description, feature, postOperationEnabled);\r
this.element = element;\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
throws ExecutionException {\r
monitor.worked(20);\r
if (element == null) {\r
-\r
element = TextData.NewInstance();\r
}\r
\r
-\r
element.setFeature(feature);\r
description.addElement(element);\r
monitor.worked(40);\r
package eu.etaxonomy.taxeditor.editor.name.operation;
-import junit.framework.Assert;
-
import org.eclipse.core.commands.ExecutionException;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
*
* @author n.hoffmann
* @created 07.04.2009
- * @version 1.0
*/
public class ChangeConceptRelationshipTypeOperationTest extends AbstractTaxeditorOperationTestBase {
Assert.assertEquals(relatedTaxon, taxon.getRelationsFromThisTaxon().toArray(a)[0].getFromTaxon());
Assert.assertEquals(newRelationshipType, taxon.getRelationsFromThisTaxon().toArray(a)[0].getType());
}
-
-}
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.editor.name.operation;
-import junit.framework.Assert;
-
import org.apache.log4j.Logger;
import org.eclipse.core.commands.ExecutionException;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
/**
* @author n.hoffmann
* @created 07.04.2009
- * @version 1.0
*/
public class ChangeConceptToSynonymOperationTest extends AbstractTaxeditorOperationTestBase {
- private static final Logger logger = Logger
- .getLogger(ChangeConceptToSynonymOperationTest.class);
+ private static final Logger logger = Logger.getLogger(ChangeConceptToSynonymOperationTest.class);
private static Taxon taxon;
package eu.etaxonomy.taxeditor.editor.name.operation;
-import junit.framework.Assert;
-
import org.apache.log4j.Logger;
import org.eclipse.core.commands.ExecutionException;
+import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
/**
* @author n.hoffmann
* @created 02.04.2009
- * @version 1.0
*/
public class ChangeHomotypicGroupOperationTest extends AbstractTaxeditorOperationTestBase {
- private static final Logger logger = Logger
- .getLogger(ChangeHomotypicGroupOperationTest.class);
-
- private static AbstractPostOperation operation;
-
+ private static final Logger logger = Logger.getLogger(ChangeHomotypicGroupOperationTest.class);
+ private static AbstractPostOperation<Taxon> operation;
+
private static Taxon taxon;
-
-
private static Synonym synonym;
-
-
private static HomotypicalGroup newHomotypicalGroup;
-
-
private static HomotypicalGroup oldHomotypicalGroup;
- /**
- * @throws java.lang.Exception
- */
@BeforeClass
public static void setUpBeforeClass() throws Exception {
operation = new ChangeHomotypicGroupOperation("Change Homotypical Group", null, taxon, synonym, newHomotypicalGroup, postOperation);
}
-
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.ChangeHomotypicGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testExecute() throws ExecutionException {
operation.execute(null, null);
* 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.editor.name.operation;
import org.apache.log4j.Logger;
/**
* @author n.hoffmann
* @created 08.04.2009
- * @version 1.0
*/
public class ChangeHomotypicalGroupBasionymOperationTest extends AbstractTaxeditorOperationTestBase {
private static final Logger logger = Logger
private static HomotypicalGroup homotypicalGroup;
- /**
- * @throws java.lang.Exception
- */
@BeforeClass
public static void setUpBeforeClass() throws Exception {
taxon = Taxon.NewInstance(null, null);
synonym = Synonym.NewInstance(null, null);
homotypicalGroup = HomotypicalGroup.NewInstance();
- // FIXME homotypical group and basionym related maethods are not implemented in the library
+ // FIXME homotypical group and basionym related methods are not implemented in the library
// wait till this gets done before implementing the test
operation = new ChangeHomotypicalGroupBasionymOperation("", undoContext, taxon, synonym, postOperation);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.ChangeHomotypicalGroupBasionymOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException {
operation.execute(monitor, info);
* 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.editor.name.operation;
import org.apache.log4j.Logger;
import org.junit.Test;
import eu.etaxonomy.cdm.model.common.ICdmBase;
-import eu.etaxonomy.cdm.model.name.INonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.SynonymType;
/**
* @author n.hoffmann
* @created 07.04.2009
- * @version 1.0
*/
public class ChangeSynonymToConceptOperationTest extends AbstractTaxeditorOperationTestBase{
- private static final Logger logger = Logger
- .getLogger(ChangeSynonymToConceptOperationTest.class);
+
+ private static final Logger logger = Logger.getLogger(ChangeSynonymToConceptOperationTest.class);
private static TaxonRelationshipType taxonRelationshipType;
-
private static Synonym synonym;
-
- /**
- * @throws java.lang.Exception
- */
@BeforeClass
public static void setUpBeforeClass() throws Exception {
operation = new ChangeSynonymToConceptOperation("Change Synonym To Concept", null, taxon, synonym, taxonRelationshipType, postOperation);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToConceptOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException {
operation.execute(monitor, info);
Assert.assertEquals("Name of synonym and newly created related taxon should be equal", synonym.getName(), taxon.getTaxonRelations().toArray(new TaxonRelationship[0])[0].getFromTaxon().getName());
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToConceptOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testUndoIProgressMonitorIAdaptable() throws ExecutionException {
operation.undo(monitor, info);
Assert.assertTrue("There should not be taxon relationships.", taxon.getRelationsToThisTaxon().size() == 0);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToConceptOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testRedoIProgressMonitorIAdaptable() throws ExecutionException {
operation.redo(monitor, info);
Assert.assertEquals("Name of synonym and newly created related taxon should be equal", synonym.getName(), taxon.getTaxonRelations().toArray(new TaxonRelationship[0])[0].getFromTaxon().getName());
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.
- */
@Test
public void testPostExecute() {
// TODO there is not post operation functionality for this class
// at the moment. Implement test when there is.
logger.warn("No post operation functionality for this class");
}
-}
+}
\ No newline at end of file
* 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.editor.name.operation;
import org.apache.log4j.Logger;
import org.junit.Test;
import eu.etaxonomy.cdm.model.common.ICdmBase;
-import eu.etaxonomy.cdm.model.name.INonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.SynonymType;
/**
* @author n.hoffmann
* @created 07.04.2009
- * @version 1.0
*/
public class ChangeSynonymToMisapplicationOperationTest extends AbstractTaxeditorOperationTestBase {
- private static final Logger logger = Logger
- .getLogger(ChangeSynonymToMisapplicationOperationTest.class);
+
+ private static final Logger logger = Logger.getLogger(ChangeSynonymToMisapplicationOperationTest.class);
+ private static AbstractPostOperation<Taxon> operation;
+
private static Synonym synonym;
-
private static Taxon taxon;
-
- private static AbstractPostOperation operation;
-
private static SynonymType synonymType;
- /**
- * @throws java.lang.Exception
- */
@BeforeClass
public static void setUpBeforeClass() throws Exception {
taxon = Taxon.NewInstance(null, null);
operation = new ChangeSynonymToMisapplicationOperation("Change Synonym To Misapplication", null, taxon, synonym, postOperation);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToMisapplicationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException {
operation.execute(null, null);
Assert.assertEquals("The name of synonym and misapplication should be equal", synonym.getName(), taxon.getMisappliedNames(false).toArray(new Taxon[0])[0].getName());
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToMisapplicationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testUndoIProgressMonitorIAdaptable() throws ExecutionException {
operation.undo(null, null);
Assert.assertEquals("SynonymType is not the expected.", synonymType, taxon.getSynonyms().iterator().next().getType());
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToMisapplicationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testRedoIProgressMonitorIAdaptable() throws ExecutionException {
operation.redo(null, null);
Assert.assertEquals("The name of synonym and misapplication should be equal", synonym.getName(), taxon.getMisappliedNames(false).toArray(new Taxon[0])[0].getName());
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.
- */
@Test
public void testPostExecute() {
// TODO there is not post operation functionality for this class
// at the moment. Implement test when there is.
logger.warn("No post operation functionality for this class");
}
-}
+}
\ No newline at end of file
* 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.editor.name.operation;
import org.apache.log4j.Logger;
/**
* @author n.hoffmann
* @created 07.04.2009
- * @version 1.0
*/
public class CreateConceptRelationOperationTest extends AbstractTaxeditorOperationTestBase {
- private static final Logger logger = Logger
- .getLogger(CreateConceptRelationOperationTest.class);
+
+ private static final Logger logger = Logger.getLogger(CreateConceptRelationOperationTest.class);
private static TaxonRelationshipType taxonRelationshipType;
-
private static Taxon concept;
- /**
- * @throws java.lang.Exception
- */
@BeforeClass
public static void setUpBeforeClass() throws Exception {
operation = new CreateConceptRelationOperation("Create Concept Relation", null, taxon, concept, taxonRelationshipType, postOperation);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.view.concept.operation.CreateConceptRelationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException {
operation.execute(monitor, info);
Assert.assertEquals("Relationship type is not the expected", taxonRelationshipType, taxon.getRelationsToThisTaxon().toArray(new TaxonRelationship[0])[0].getType());
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.view.concept.operation.CreateConceptRelationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testUndoIProgressMonitorIAdaptable() throws ExecutionException {
operation.undo(monitor, info);
Assert.assertTrue("There should not be taxon relationships", taxon.getTaxonRelations().size() == 0);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.view.concept.operation.CreateConceptRelationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testRedoIProgressMonitorIAdaptable() throws ExecutionException {
operation.redo(monitor, info);
Assert.assertEquals("Relationship type is not the expected", taxonRelationshipType, taxon.getRelationsToThisTaxon().toArray(new TaxonRelationship[0])[0].getType());
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.
- */
@Test
public void testPostExecute() {
// TODO there is not post operation functionality for this class
// at the moment. Implement test when there is.
logger.warn("No post operation functionality for this class");
}
-}
+}
\ No newline at end of file
* 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.editor.name.operation;
import org.eclipse.core.commands.ExecutionException;
/**
* @author n.hoffmann
* @created 07.04.2009
- * @version 1.0
*/
public class CreateSynonymInNewGroupOperationTest extends AbstractTaxeditorOperationTestBase {
private static TaxonName newSynonymName;
- /**
- * @throws java.lang.Exception
- */
@BeforeClass
public static void setUpBeforeClass() throws Exception {
operation = new CreateSynonymInNewGroupOperation("Create Synonyma In New Group", undoContext, taxon, newSynonymName, postOperation);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException {
operation.execute(monitor, info);
Assert.assertTrue("Taxon should have a homotypical group now.", taxon.getHomotypicSynonymyGroups().size() > 0);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testUndoIProgressMonitorIAdaptable() throws ExecutionException {
operation.undo(monitor, info);
Assert.assertTrue("Taxon should not have synonyms now.", taxon.getSynonyms().size() == 0);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testRedoIProgressMonitorIAdaptable() throws ExecutionException {
operation.redo(monitor, info);
Assert.assertTrue("Taxon should have synonyms now.", taxon.getSynonyms().size() > 0);
Assert.assertTrue("Taxon should have a homotypical group now.", taxon.getHomotypicSynonymyGroups().size() > 0);
-
}
-}
+}
\ No newline at end of file
* 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.editor.name.operation;
import org.apache.log4j.Logger;
/**
* @author n.hoffmann
* @created 08.04.2009
- * @version 1.0
*/
public class DeleteConceptRelationOperationTest extends AbstractTaxeditorOperationTestBase{
- private static final Logger logger = Logger
- .getLogger(DeleteConceptRelationOperationTest.class);
+
+ private static final Logger logger = Logger.getLogger(DeleteConceptRelationOperationTest.class);
private static TaxonRelationshipType relationshipType;
-
private static Taxon relatedTaxon;
-
- /**
- * @throws java.lang.Exception
- */
+
@BeforeClass
public static void setUpBeforeClass() throws Exception {
// operation = new DeleteConceptRelationOperation("", undoContext, taxon, relatedTaxon, postOperation);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.view.concept.operation.DeleteConceptRelationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException {
operation.execute(monitor, info);
Assert.assertTrue(taxon.getTaxonRelations().size() == 0);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.view.concept.operation.DeleteConceptRelationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testUndoIProgressMonitorIAdaptable() throws ExecutionException {
operation.undo(monitor, info);
Assert.assertTrue(taxon.getTaxonRelations().size() > 0);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.view.concept.operation.DeleteConceptRelationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testRedoIProgressMonitorIAdaptable() throws ExecutionException {
operation.redo(monitor, info);
Assert.assertTrue(taxon.getTaxonRelations().size() == 0);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.
- */
@Test
public void testPostExecute() {
// TODO there is not post operation functionality for this class
// at the moment. Implement test when there is.
logger.warn("No post operation functionality for this class");
}
-}
+}
\ No newline at end of file
* 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.editor.name.operation;
import org.eclipse.core.commands.ExecutionException;
/**
* @author n.hoffmann
* @created 08.04.2009
- * @version 1.0
*/
public class DeleteDescriptionElementOperationTest extends AbstractTaxeditorOperationTestBase {
private static DescriptionElementBase descriptionElement;
-
private static TaxonDescription description;
- /**
- * @throws java.lang.Exception
- */
@BeforeClass
public static void setUpBeforeClass() throws Exception {
taxon = Taxon.NewInstance(null, null);
descriptionElement = TextData.NewInstance();
-
description = TaxonDescription.NewInstance();
-
description.addElement(descriptionElement);
-
taxon.addDescription(description);
-
operation = new DeleteDescriptionElementOperation("", undoContext, descriptionElement, postOperation, cdmEntitySessionEnabled);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteDescriptionElementOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException {
operation.execute(monitor, info);
-
Assert.assertTrue(taxon.getDescriptions().toArray(new TaxonDescription[0])[0].getElements().size() == 0);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteDescriptionElementOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testUndoIProgressMonitorIAdaptable() throws ExecutionException {
operation.undo(monitor, info);
Assert.assertEquals(descriptionElement, taxon.getDescriptions().toArray(new TaxonDescription[0])[0].getElements().toArray(new DescriptionElementBase[0])[0]);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteDescriptionElementOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testRedoIProgressMonitorIAdaptable() throws ExecutionException {
operation.redo(monitor, info);
-
Assert.assertTrue(taxon.getDescriptions().toArray(new TaxonDescription[0])[0].getElements().size() == 0);
}
-}
+}
\ No newline at end of file
* 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.editor.name.operation;
import org.apache.log4j.Logger;
/**
* @author n.hoffmann
* @created 08.04.2009
- * @version 1.0
*/
public class DeleteMisapplicationOperationTest extends AbstractTaxeditorOperationTestBase{
- private static final Logger logger = Logger
- .getLogger(DeleteMisapplicationOperationTest.class);
+
+ private static final Logger logger = Logger.getLogger(DeleteMisapplicationOperationTest.class);
private static Taxon taxon;
-
private static Taxon misapplication;
- /**
- * @throws java.lang.Exception
- */
@BeforeClass
public static void setUpBeforeClass() throws Exception {
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.DeleteMisapplicationOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testExecuteIProgressMonitorIAdaptable() throws ExecutionException {
operation.execute(monitor, info);
Assert.assertTrue(taxon.getMisappliedNames(false).size() == 0);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.DeleteMisapplicationOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testUndoIProgressMonitorIAdaptable() throws ExecutionException {
operation.undo(monitor, info);
Assert.assertEquals(misapplication, taxon.getMisappliedNames(false).toArray(new Taxon[0])[0]);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.editor.name.operation.DeleteMisapplicationOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)}.
- * @throws ExecutionException
- */
@Test
public void testRedoIProgressMonitorIAdaptable() throws ExecutionException {
operation.redo(monitor, info);
Assert.assertTrue(taxon.getMisappliedNames(false).size() == 0);
}
- /**
- * Test method for {@link eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation#postExecute(ICdmBase)}.
- */
@Test
public void testPostExecute() {
// TODO there is not post operation functionality for this class
// at the moment. Implement test when there is.
logger.warn("No post operation functionality for this class");
}
-}
+}
\ No newline at end of file
<feature\r
id="eu.etaxonomy.taxeditor.feature.platform"\r
label="Taxeditor Dependencies"\r
- version="5.18.2"\r
+ version="5.19.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.18.2</version>
+ <version>5.19.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.18.2"\r
+ version="5.19.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.18.2</version>
+ <version>5.19.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.18.2
+Bundle-Version: 5.19.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.18.2</version>
+ <version>5.19.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.18.2
+Bundle-Version: 5.19.0
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.jface,
org.eclipse.ui.ide,
lib/mysql-connector-java-8.0.21.jar,
lib/jetty-webapp-9.4.26.v20200117.jar,
lib/jetty-xml-9.4.26.v20200117.jar,
- lib/cdmlib-remote-5.18.0.jar,
lib/jetty-http-9.4.26.v20200117.jar,
lib/jetty-io-9.4.26.v20200117.jar,
lib/jetty-security-9.4.26.v20200117.jar,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.18.2</version>
+ <version>5.19.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>eu.etaxonomy.taxeditor.local</artifactId>
// We need to use the 3-arg constructor of URI in order to properly escape file system chars
URI resolvedURI = new URI(resolvedWarURL.getProtocol(), resolvedWarURL.getPath(), null);
warFile = new File(resolvedURI);
- System.out.println("war url : " + warFile.getAbsolutePath());
+// System.out.println("war url : " + warFile.getAbsolutePath());
if(warFile == null || !warFile.exists()) {
throw new CdmEmbeddedServerException("Cdmlib War file does not exist");
*
* @author n.hoffmann
* @created 19.05.2009
- * @version 1.0
*/
public abstract class CdmDataSourceCredentialsWizardPage extends WizardPage implements ModifyListener {
private ICdmDataSource dataSource;
}
}
- /** {@inheritDoc} */
@Override
public void createControl(Composite parent) {
this.parent = parent;
formLayout.numColumns = 2;
composite.setLayout(formLayout);
-
-
// Create composite for data source name
Composite editDatasourceComposite = new Composite(composite, SWT.NONE);
GridData datasourceGridData = new GridData(SWT.FILL, SWT.TOP, true, true,2,1);
});
setControl(composite);
-
init();
-
}
/**
// Create password input
text_password = new Text(authenticationGroup, SWT.BORDER | SWT.PASSWORD);
text_password.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-
}
/**
} else {
name = text_dataSourceName.getText();
}
-
}
private void addListeners() {
this.setPageComplete(complete);
}
-
-
/**
* updates the current datasource with form values
*/
password = text_password.getText();
}
- /** {@inheritDoc} */
@Override
public IWizardPage getNextPage() {
return null;
}
- /**
- * <p>Setter for the field <code>dataSource</code>.</p>
- *
- * @param dataSource the dataSource to set
- */
public void setDataSource(ICdmDataSource dataSource) {
this.dataSource = dataSource;
}
- /**
- * <p>Getter for the field <code>dataSource</code>.</p>
- *
- * @return the dataSource
- */
public ICdmDataSource getUpdatedDataSource() {
updateDataSource();
return dataSource;
return dataSource;
}
- /**
- * <p>getDataSourceName</p>
- *
- * @return a {@link java.lang.String} object.
- */
public String getDataSourceName() {
return name;
}
- /** {@inheritDoc} */
@Override
public void modifyText(ModifyEvent e) {
}
}
-
private void updateAndCheck() {
updateLocation();
updateAuthentication();
text.setText(string);
text.addModifyListener(listener);
}
-}
+}
\ No newline at end of file
* 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.local.datasource.wizard;
import org.eclipse.swt.SWT;
*
* @author n.hoffmann
* @created 19.05.2009
- * @version 1.0
*/
public class CdmDataSourceSQLServerWizardPage extends CdmDataSourceCredentialsWizardPage {
this.setDataSource(dataSource);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceCredentialsWizardPage#createDatabaseForm()
- */
- /** {@inheritDoc} */
@Override
public void createDatabaseForm() {
// Create group composite for location data
text_port.addModifyListener(this);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.store.datasource.CdmDataSourceCredentialsWizardPage#updateLocation()
- */
- /** {@inheritDoc} */
@Override
public void updateLocation() {
server = text_server.getText();
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.webapp.datasource.common.wizard.CdmDataSourceCredentialsWizardPage#updateDataSource()
- */
- /** {@inheritDoc} */
@Override
public void updateDataSource() {
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.webapp.datasource.common.wizard.CdmDataSourceCredentialsWizardPage#checkPageComplete()
- */
- /** {@inheritDoc} */
@Override
public void checkPageComplete() {
// check if widgets of this component are complete
super.checkPageComplete();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.webapp.datasource.common.wizard.CdmDataSourceCredentialsWizardPage#init()
- */
- /** {@inheritDoc} */
@Override
public void init() {
super.init();
// for the initial value
addListeners();
}
-
}
private void addListeners() {
text_server.removeModifyListener(this);
text_port.removeModifyListener(this);
}
-
-
-}
+}
\ No newline at end of file
* 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.local.datasource.wizard;
import java.util.ArrayList;
*
* @author n.hoffmann
* @created 18.05.2009
- * @version 1.0
*/
public class CdmDataSourceTypeSelectionWizardPage extends WizardPage implements ModifyListener{
/*DatabaseTypeEnum.SqlServer2005*/
};
-
private ArrayList<DatabaseTypeEnum> databaseTypes;
private Text datasourceNameText;
setTitle(pageName);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- /** {@inheritDoc} */
@Override
public void createControl(Composite parent) {
}
}
- /**
- * @param type
- */
private void addDatabasePage(DatabaseTypeEnum type) {
// add credentials wizard page according to selection
Wizard wizard = (Wizard) getWizard();
getContainer().updateButtons();
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#getNextPage()
- */
- /** {@inheritDoc} */
@Override
public IWizardPage getNextPage() {
return nextPage;
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
- */
- /** {@inheritDoc} */
@Override
public void modifyText(ModifyEvent e) {
String name = datasourceNameText.getText();
checkPageComplete();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
- */
- /**
- * <p>checkPageComplete</p>
- */
public void checkPageComplete() {
boolean complete = isDataBaseTypeSelected();
complete &= isDataSourceNameSet();
setPageComplete(complete);
}
- /**
- * <p>Getter for the field <code>dataSourceName</code>.</p>
- *
- * @return a {@link java.lang.String} object.
- */
public String getDataSourceName() {
return dataSourceName;
}
- /**
- * <p>Getter for the field <code>credentialsWizardPage</code>.</p>
- *
- * @return the credentialsWizardPage
- */
public CdmDataSourceCredentialsWizardPage getCredentialsWizardPage() {
return credentialsWizardPage;
}
- /**
- * <p>isDataBaseTypeSelected</p>
- *
- * @return the dataBaseTypeSelected
- */
public boolean isDataBaseTypeSelected() {
return dataBaseTypeSelected;
}
- /**
- * <p>Setter for the field <code>dataBaseTypeSelected</code>.</p>
- *
- * @param dataBaseTypeSelected the dataBaseTypeSelected to set
- */
public void setDataBaseTypeSelected(boolean dataBaseTypeSelected) {
this.dataBaseTypeSelected = dataBaseTypeSelected;
}
- /**
- * <p>isDataSourceNameSet</p>
- *
- * @return the dataSourceNameSet
- */
public boolean isDataSourceNameSet() {
return dataSourceNameSet;
}
- /**
- * <p>Setter for the field <code>dataSourceNameSet</code>.</p>
- *
- * @param dataSourceNameSet the dataSourceNameSet to set
- */
public void setDataSourceNameSet(boolean dataSourceNameSet) {
this.dataSourceNameSet = dataSourceNameSet;
}
- /**
- * <p>Getter for the field <code>nomenclaturalCode</code>.</p>
- *
- * @return the nomenclaturalCode
- */
public NomenclaturalCode getNomenclaturalCode() {
return nomenclaturalCode;
}
-
-
-}
+}
\ No newline at end of file
* 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.local.datasource.wizard;
import org.eclipse.jface.wizard.Wizard;
*
* @author n.hoffmann
* @created 18.05.2009
- * @version 1.0
*/
public class CdmDataSourceWizard extends Wizard {
this.mode = Mode.CREATE;
setForcePreviousAndNextButtons(true);
setWindowTitle("Datasource Dialog");
-
}
-
/**
* <p>Constructor for CdmDataSourceWizard.</p>
*
setWindowTitle("Datasource Dialog");
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
switch(mode) {
default:
}
-
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
ICdmDataSource dataSource;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#canFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean canFinish() {
switch(mode) {
default:
return false;
}
-
}
-}
+}
\ No newline at end of file
* 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.local.view.datasource;
import java.util.HashMap;
*
* @author n.hoffmann
* @created Sep 22, 2010
- * @version 1.0
*/
public class CdmMetaDataAwareDataSourceContainer {
-
-
/** Constant <code>DEFAULT_ENTRY="-"</code> */
public static final String DEFAULT_ENTRY = "-";
this.cdmSource = cdmSource;
metaDataMap = getDefaultMetaDataMap();
-
}
-// /**
-// * <p>Getter for the field <code>dataSource</code>.</p>
-// *
-// * @return the dataSource
-// */
-// public ICdmDataSource getDataSource() {
-// return dataSource;
-// }
-
public ICdmSource getCdmSource() {
- return cdmSource;
-}
+ return cdmSource;
+ }
public void getMetaDataFromDataSource(){
try {
return resultMap;
}
- /**
- * <p>Getter for the field <code>metaDataMap</code>.</p>
- *
- * @return the metaDataMap
- */
public Map<CdmMetaDataPropertyName, String> getMetaDataMap() {
return metaDataMap;
}
- /**
- * <p>isDataSourceCompatible</p>
- *
- * @return a boolean.
- */
public boolean isDataSourceCompatible(){
String version = metaDataMap.get(CdmMetaDataPropertyName.DB_SCHEMA_VERSION);
return version == null || version.equals(DEFAULT_ENTRY) ? false : CdmMetaData.isDbSchemaVersionCompatible(version);
}
- /**
- * <p>getMetaData</p>
- *
- * @param metaDataPropertyName a {@link eu.etaxonomy.cdm.model.common.CdmMetaData.MetaDataPropertyName} object.
- * @return a {@link java.lang.String} object.
- */
public String getMetaData(CdmMetaDataPropertyName metaDataPropertyName){
String property = metaDataMap.get(metaDataPropertyName);
return property != null ? property : DEFAULT_ENTRY;
}
- /**
- * <p>isRunning</p>
- *
- * @return the running
- */
public boolean isRunning() {
return running;
}
- /** {@inheritDoc} */
@Override
public String toString() {
return cdmSource.getName();
}
-}
+}
\ No newline at end of file
* 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.local.view.datasource.handler;
import org.eclipse.core.expressions.PropertyTester;
/**
* @author n.hoffmann
* @created Sep 23, 2010
- * @version 1.0
*/
public class DataSourceMenuPropertyTester extends PropertyTester {
return false;
}
- private boolean hasDataModel(Object[] selectedElements) {
-
- if (selectedElements.length == 0 ) {
- // nothing selected so all tests should fail
- return false;
- }
- for (Object object : selectedElements) {
+ private boolean hasDataModel(Object[] selectedElements) {
- if (object instanceof CdmMetaDataAwareDataSourceContainer) {
- CdmMetaDataAwareDataSourceContainer container = (CdmMetaDataAwareDataSourceContainer) object;
- String schemaVersion = container.getMetaData(CdmMetaDataPropertyName.DB_SCHEMA_VERSION);
- return !schemaVersion.equals(CdmMetaDataAwareDataSourceContainer.DEFAULT_ENTRY);
- }
- }
- return false;
-
- }
+ if (selectedElements.length == 0 ) {
+ // nothing selected so all tests should fail
+ return false;
+ }
+ for (Object object : selectedElements) {
+ if (object instanceof CdmMetaDataAwareDataSourceContainer) {
+ CdmMetaDataAwareDataSourceContainer container = (CdmMetaDataAwareDataSourceContainer) object;
+ String schemaVersion = container.getMetaData(CdmMetaDataPropertyName.DB_SCHEMA_VERSION);
+ return !schemaVersion.equals(CdmMetaDataAwareDataSourceContainer.DEFAULT_ENTRY);
+ }
+ }
+ return false;
+ }
private boolean isCompatible(Object[] selectedElements) {
}
}
return false;
-
}
-}
+}
\ No newline at end of file
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.molecular.lib
Bundle-SymbolicName: eu.etaxonomy.taxeditor.molecular.lib;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.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.18.2</version>
+ <version>5.19.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.18.2
+Bundle-Version: 5.19.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.18.2</version>
+ <version>5.19.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
* @author Ben Stöver
* @date 04.08.2014
*/
-public class AlignmentEditorInput extends CdmEntitySessionInput {
+public class AlignmentEditorInput extends CdmEntitySessionInput<Sequence> {
private final UUID sequenceNodeUuid;
private Sequence sequenceNode;
this.sequenceNode = sequenceNode;
}
- @Override
+ @Override
public List<Sequence> getRootEntities() {
return Arrays.asList(sequenceNode);
}
*/
package eu.etaxonomy.taxeditor.molecular.editor.e4;
-
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.molecular.ISequenceService;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.model.media.MediaUtils;
import eu.etaxonomy.cdm.model.molecular.Sequence;
import eu.etaxonomy.cdm.model.molecular.SequenceString;
private void createTestContents() {
// Just for testing:
try {
- addRead(new File("D:/Users/BenStoever/ownCloud/Dokumente/Projekte/EDITor/Quelltexte/LibrAlign branch/Repository/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR430_JR-P01.ab1").toURI(), false); //$NON-NLS-1$
- //addRead(new File("D:/Users/BenStoever/ownCloud/Dokumente/Projekte/EDITor/Quelltexte/LibrAlign branch/Repository/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR444_JR-P05.ab1").toURI(), false);
- addRead(new File("D:/Users/BenStoever/ownCloud/Dokumente/Projekte/EDITor/Quelltexte/LibrAlign branch/Repository/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/Test_qualityScore.scf").toURI(), false); //$NON-NLS-1$
+ addRead(URI.fromFile(new File("D:/Users/BenStoever/ownCloud/Dokumente/Projekte/EDITor/Quelltexte/LibrAlign branch/Repository/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR430_JR-P01.ab1")), false); //$NON-NLS-1$
+ //addRead(URI.fromFile(new File("D:/Users/BenStoever/ownCloud/Dokumente/Projekte/EDITor/Quelltexte/LibrAlign branch/Repository/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/JR444_JR-P05.ab1")), false);
+ addRead(URI.fromFile(new File("D:/Users/BenStoever/ownCloud/Dokumente/Projekte/EDITor/Quelltexte/LibrAlign branch/Repository/eu.etaxonomy.taxeditor.editor/src/main/resources/AlignmentTestData/Test_qualityScore.scf")), false); //$NON-NLS-1$
// Add test consensus sequence:
AlignmentModel consensusModel = getEditableConsensusArea().getAlignmentModel();
return null;
}
}
-}
+}
\ No newline at end of file
import org.eclipse.swt.widgets.FileDialog;
import org.eclipse.swt.widgets.Shell;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.molecular.TaxeditorMolecularPlugin;
import eu.etaxonomy.taxeditor.molecular.editor.e4.AlignmentEditorE4;
String path = fileDialog.open();
if (path != null) {
try {
- alignmentEditor.addRead(new File(path).toURI(), false);
+ alignmentEditor.addRead(URI.fromFile(new File(path)), false);
}
catch (UnsupportedChromatogramFormatException e) {
MessagingUtils.errorDialog(Messages.LoadPherogramHandler_UNSUPPORTED_FORMAT, this,
package eu.etaxonomy.taxeditor.molecular.editor.e4.handler;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
import javax.inject.Named;
-// $Id$\r
-/**\r
-* Copyright (C) 2016 EDIT\r
-* European Distributed Institute of Taxonomy\r
-* http://www.e-taxonomy.eu\r
-*\r
-* The contents of this file are subject to the Mozilla Public License Version 1.1\r
-* See LICENSE.TXT at the top of this package for the full license terms.\r
-*/\r
package eu.etaxonomy.taxeditor.molecular.io;\r
\r
-\r
import java.io.IOException;\r
-import java.net.URI;\r
import java.util.ArrayList;\r
import java.util.Collections;\r
import java.util.Iterator;\r
\r
import javax.xml.namespace.QName;\r
\r
+import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.model.molecular.Sequence;\r
import eu.etaxonomy.cdm.model.molecular.SingleReadAlignment;\r
import eu.etaxonomy.taxeditor.molecular.editor.e4.AlignmentEditorE4;\r
import info.bioinfweb.jphyloio.events.type.EventContentType;\r
import info.bioinfweb.jphyloio.utils.JPhyloIOWritingUtils;\r
\r
-\r
-\r
/**\r
* In implementation of {@link MatrixDataAdapter} that delegates to a {@link Sequence} object.\r
* <p>\r
URI pherogramURI = AlignmentEditorE4.getPherogramURI(singleRead.getSingleRead());\r
if (pherogramURI != null) {\r
JPhyloIOWritingUtils.writeTerminalResourceMetadata(receiver, createMetadataID(sequenceID, PREDICATE_HAS_PHEROGRAM),\r
- null, PREDICATE_HAS_PHEROGRAM, pherogramURI);\r
+ null, PREDICATE_HAS_PHEROGRAM, pherogramURI.getJavaUri());\r
}\r
\r
writeMetadataEvents(receiver, sequenceID, PREDICATE_HAS_PHEROGRAM_ALIGNMENT, DATA_TYPE_PHERORAGM_ALIGNMENT, singleRead.getShifts());\r
Bundle-ManifestVersion: 2
Bundle-Name: Navigation Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.navigation;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.0
Bundle-Activator: eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin
Bundle-Vendor: EDIT
Export-Package: eu.etaxonomy.taxeditor.navigation,
org.eclipse.core.resources,
org.eclipse.core.runtime,
org.eclipse.core.runtime.jobs,
+ org.eclipse.e4.core.services.events,
org.eclipse.equinox.app,
org.eclipse.osgi.util;version="1.1.0",
org.eclipse.ui.forms.widgets,
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.18.2</version>
+ <version>5.19.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
/**
- *
- */
+* 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.navigation.key.polytomous.e4;
import java.util.List;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
/**
- *
* @author pplitzner
* @since Sep 28, 2017
- *
*/
public class PolytomousKeyViewPartE4 implements
-IConversationEnabled, ICdmEntitySessionEnabled, IPostOperationEnabled,
-ICdmChangeListener {
+ IConversationEnabled, ICdmEntitySessionEnabled<PolytomousKey>, IPostOperationEnabled,
+ ICdmChangeListener {
private class FilterModifyListener implements ModifyListener{
@Override
}
}
-
public static final String ID = "eu.etaxonomy.taxeditor.navigation.key.polytomous.polytomousKeyViewPart"; //$NON-NLS-1$
public static final String OPEN_COMMAND_ID = "eu.etaxonomy.taxeditor.navigation.key.polytomous.editNodes"; //$NON-NLS-1$
}
});
-
-
//propagate selection
selectionChangedListener = (event -> selService.setSelection(event.getSelection()));
viewer.addSelectionChangedListener(selectionChangedListener);
if(event.getAction() == Action.Delete && PolytomousKey.class.equals(event.getEntityType())) {
refresh();
}
-
}
@Override
public Map<Object, List<String>> getPropertyPathsMap() {
return null;
}
-
-}
+}
\ No newline at end of file
* 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.navigation.navigator.e4;
import java.util.ArrayList;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
import eu.etaxonomy.taxeditor.editor.ITaxonEditor;
import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
+import eu.etaxonomy.taxeditor.event.EventUtility;
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.DataChangeBridge;
import eu.etaxonomy.taxeditor.workbench.part.ICollapsableExpandable;
/**
- *
* @author pplitzner
* @since Sep 7, 2017
- *
*/
public class TaxonNavigatorE4 implements
IPostOperationEnabled, IConversationEnabled, Observer,
}
}
+ @Inject
+ @Optional
+ public void updateLinkWithTaxon(@UIEventTopic(WorkbenchEventConstants.UPDATE_LINK_WITH_TAXON) boolean isDummy){
+ this.linkWithTaxon = !linkWithTaxon;
+
+ if(this.isLinkWithTaxon()){
+ this.updateCurrentTaxon(EventUtility.getTaxonEditor());
+ }
+ }
+
public void setLinkWithTaxon(boolean linkWithTaxon) {
this.linkWithTaxon = linkWithTaxon;
}
return propertyPathsMap;
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
// TODO Auto-generated method stub
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextStop(IMemento memento, IProgressMonitor monitor) {
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextStart(IMemento memento, IProgressMonitor monitor) {
if(viewer!=null && viewer.getControl()!=null && !viewer.getControl().isDisposed()){
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void contextRefresh(IProgressMonitor monitor) {
// viewer.refresh();
}
- /**
- * {@inheritDoc}
- */
@Override
public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
}
*/
package eu.etaxonomy.taxeditor.navigation.navigator.e4.handler;
+import javax.inject.Inject;
import javax.inject.Named;
import org.eclipse.e4.core.di.annotations.CanExecute;
import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.core.services.events.IEventBroker;
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
import org.eclipse.e4.ui.services.IServiceConstants;
-import eu.etaxonomy.taxeditor.event.EventUtility;
+import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
import eu.etaxonomy.taxeditor.navigation.navigator.e4.TaxonNavigatorE4;
/**
*
*/
public class LinkWithTaxonHandlerE4 {
+ @Inject
+ private IEventBroker eventBroker;
@Execute
public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart activePart) {
- if (activePart!=null && activePart.getObject() instanceof TaxonNavigatorE4) {
- TaxonNavigatorE4 taxonNavigator = (TaxonNavigatorE4) activePart.getObject();
- taxonNavigator.setLinkWithTaxon(!taxonNavigator.isLinkWithTaxon());
- if(taxonNavigator.isLinkWithTaxon()){
- taxonNavigator.updateCurrentTaxon(EventUtility.getTaxonEditor());
- }
- }
+ eventBroker.post(WorkbenchEventConstants.UPDATE_LINK_WITH_TAXON, true);
}
@CanExecute
private static final Logger logger = Logger.getLogger(SetSecundumForSubtreeOperation.class);
@Inject
- UISynchronize sync;
+ private UISynchronize sync;
public SetSecundumForSubtreeOperation(Object source, boolean async, UUID taxonNodeUuid, EPartService partService,
}
- /**
- * {@inheritDoc}
- */
@Override
protected UpdateResult doUpdateExecute(IProgressMonitor monitor, IAdaptable info) throws Exception {
EditorUtil.checkForChanges(null, partService);
}
});
-
-
}
-
-
- /**
- * {@inheritDoc}
- */
@Override
public void postOperation(IRemotingProgressMonitor monitor) {
// TODO Auto-generated method stub
+/**
+* Copyright (C) 2018 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.navigation.navigator.operation;
import java.util.UUID;
public abstract class UpdateSubtreeOperation extends RemotingCdmUpdateOperation {
- ForSubtreeConfiguratorBase config;
+ protected ForSubtreeConfiguratorBase config;
- UUID parentUuid;
+ private UUID parentUuid;
- TaxonNode subtreeNode;
- ITaxonNodeService taxonNodeService;
- ILongRunningTasksService longRunningTaskService;
+ private TaxonNode subtreeNode;
+ private ITaxonNodeService taxonNodeService;
+ protected ILongRunningTasksService longRunningTaskService;
- protected EModelService modelService = null;
+ protected EModelService modelService = null;
- public UpdateSubtreeOperation(Object source,
+ public UpdateSubtreeOperation(Object source,
boolean async,
UUID taxonNodeUuid,
EPartService partService,
longRunningTaskService = CdmApplicationState.getLongRunningTasksService();
subtreeNode = CdmStore.getService(ITaxonNodeService.class).load(config.getSubtreeUuid());
}
-
-}
+}
\ No newline at end of file
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.api.service.config.SubtreeCloneConfigurator;
-import eu.etaxonomy.cdm.api.service.IClassificationService;
+import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
import eu.etaxonomy.cdm.api.service.UpdateResult;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.Classification;
private final Classification classification;
- private final IClassificationService service;
+ private final ITaxonNodeService service;
private String classificationName;
this.classificationName = classificationName;
this.sec = sec;
this.relationType = relationType;
- this.service = CdmStore.getService(IClassificationService.class);
+ this.service = CdmStore.getService(ITaxonNodeService.class);
}
@Override
cloneConfig.setTaxonSecundum(sec);
cloneConfig.setRelationTypeToOldTaxon(relationType);
- UpdateResult result = service.cloneClassification(cloneConfig);
+ UpdateResult result = service.cloneSubtree(cloneConfig);
return postExecute(result.getCdmEntity());
}
* 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.navigation.operation;
import org.eclipse.core.commands.ExecutionException;
*
* @author n.hoffmann
* @created 08.05.2009
- * @version 1.0
*/
@Deprecated // we do not undo creation of elements
public class CreateTaxonNode extends AbstractPersistentPostOperation {
this.newTaxon = taxon;
}
-
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus execute(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
}
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus redo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
return execute(monitor, info);
}
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
- */
- /** {@inheritDoc} */
@Override
public IStatus undo(IProgressMonitor monitor, IAdaptable info)
throws ExecutionException {
MessagingUtils.warn(this.getClass(), "Not yet implemented."); //$NON-NLS-1$
return null;
}
-}
+}
\ No newline at end of file
* 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.navigation.search;
import java.util.List;
* @author n.hoffmann
* @author e.-m.lee
* @created 15.04.2009
- * @version 1.0
*/
public class SearchBar implements IContextListener{
*
* @author n.hoffmann
* @created Feb 2, 2010
- * @version 1.0
*/
class DropdownSelectionListener extends SelectionAdapter {
Bundle-ManifestVersion: 2
Bundle-Name: Printpublisher Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.printpublisher;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.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.18.0.jar,
- lib/cdmlib-remote-5.18.0.jar
+ lib/cdmlib-print-5.19.0-SNAPSHOT.jar,
+ lib/cdmlib-remote-5.19.0-SNAPSHOT.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.18.0.jar,\
- lib/cdmlib-remote-5.18.0.jar,\
+ lib/cdmlib-print-5.19.0-SNAPSHOT.jar,\
+ lib/cdmlib-remote-5.19.0-SNAPSHOT.jar,\
OSGI-INF/l10n/bundle.properties,\
OSGI-INF/l10n/bundle_de.properties,\
<parent>
<artifactId>taxeditor-parent</artifactId>
<groupId>eu.etaxonomy</groupId>
- <version>5.18.2</version>
+ <version>5.19.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
* 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.printpublisher;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
*
* @author n.hoffmann
* @created Oct 14, 2010
- * @version 1.0
*/
public class PrintUtil extends AbstractUtility {
-}
+}
\ No newline at end of file
private PublishConfigurator configurator;
- /** {@inheritDoc} */
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
// make the editors taxon the selected taxon to export
* 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.printpublisher.internal;
import org.eclipse.ui.plugin.AbstractUIPlugin;
*
* @author n.hoffmann
* @created Jul 15, 2010
- * @version 1.0
*/
public class PrintpublisherPlugin extends AbstractUIPlugin {
public PrintpublisherPlugin() {
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
- */
- /** {@inheritDoc} */
public void start(BundleContext context) throws Exception {
super.start(context);
plugin = this;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
- */
- /** {@inheritDoc} */
public void stop(BundleContext context) throws Exception {
plugin = null;
super.stop(context);
public static PrintpublisherPlugin getDefault() {
return plugin;
}
-}
+}
\ No newline at end of file
* 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.printpublisher.wizard;
import java.net.URL;
-import java.nio.channels.IllegalSelectorException;
import org.eclipse.jface.dialogs.IDialogSettings;
import org.eclipse.jface.wizard.WizardPage;
*
* @author n.hoffmann
* @created Apr 27, 2010
- * @version 1.0
*/
public abstract class AbstractPublishWizardPage extends WizardPage {
- /**
- * <p>Constructor for AbstractPublishWizardPage.</p>
- *
- * @param pageName a {@link java.lang.String} object.
- */
protected AbstractPublishWizardPage(String pageName) {
super(pageName);
}
- /**
- * <p>getConfigurator</p>
- *
- * @return a {@link eu.etaxonomy.cdm.print.PublishConfigurator} object.
- */
public PublishConfigurator getConfigurator(){
return ((AbstractPublishWizard) getWizard()).getConfigurator();
}
-
- /**
- * <p>setConfigurator</p>
- *
- * @param configurator a {@link eu.etaxonomy.cdm.print.PublishConfigurator} object.
- */
+
public void setConfigurator(PublishConfigurator configurator){
((AbstractPublishWizard) getWizard()).setConfigurator(configurator);
}
-
- /**
- * <p>getOutputModule</p>
- *
- * @return a {@link eu.etaxonomy.cdm.print.out.IPublishOutputModule} object.
- */
+
public IPublishOutputModule getOutputModule(){
IPublishOutputModule outputModule = ((AbstractPublishWizard) getWizard()).getOutputModule();
if(outputModule == null)
* 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.printpublisher.wizard;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.ui.IWorkbench;
-
import eu.etaxonomy.cdm.print.PublishConfigurator;
import eu.etaxonomy.cdm.print.out.IPublishOutputModule;
*
* @author n.hoffmann
* @created Aug 6, 2010
- * @version 1.0
*/
public class DirectPublishingWizard extends AbstractPublishWizard {
-
- /**
- * <p>Constructor for DirectPublishingWizard.</p>
- *
- * @param configurator a {@link eu.etaxonomy.cdm.print.PublishConfigurator} object.
- */
+
public DirectPublishingWizard(PublishConfigurator configurator) {
setConfigurator(configurator);
IPublishOutputModule module = configurator.getOutputModules().iterator().next();
setOutputModule(module);
}
-
- /** {@inheritDoc} */
+
@Override
public void addPages() {
pageOptions = new SelectOptionsWizardPage(PAGE_OPTIONS);
addPage(pageOptions);
-
+
pageFeatureTree = new SelectFeatureTreeWizardPage(PAGE_FEATURETREE);
addPage(pageFeatureTree);
-
+
pageStylesheet = new SelectStylesheetWizardPage(PAGE_STYLESHEET);
addPage(pageStylesheet);
-
+
pageFolder = new SelectDirectoryWizardPage(PAGE_FOLDER);
addPage(pageFolder);
-
}
-
- /** {@inheritDoc} */
+
@Override
public boolean performFinish() {
return super.performFinish();
}
-
- /**
- * <p>canFinish</p>
- *
- * @return a boolean.
- */
+
public boolean canFinish() {
return pageFeatureTree.isPageComplete()
&& pageFolder.isPageComplete();
}
-}
+}
\ No newline at end of file
/**
- *
- */
+* 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.printpublisher.wizard;
import eu.etaxonomy.cdm.print.out.odf.OdfOutputModule;
-
/**
* <p>PublishWizardODF class.</p>
*
* @author n.hoffmann
* @created Apr 1, 2010
- * @version 1.0
*/
public class PublishWizardODF extends AbstractPublishWizard {
* 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.printpublisher.wizard;
import org.eclipse.ui.IExportWizard;
*
* @author n.hoffmann
* @created Aug 4, 2010
- * @version 1.0
*/
public class PublishWizardPDF extends AbstractPublishWizard implements
IExportWizard {
-
+
/**
* <p>Constructor for PublishWizardPDF.</p>
*/
setOutputModule(new PdfOutputModule());
setWindowTitle("Publish PDF");
}
-}
+}
\ No newline at end of file
* 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.printpublisher.wizard;
import org.eclipse.ui.IExportWizard;
*
* @author n.hoffmann
* @created Aug 4, 2010
- * @version 1.0
*/
public class PublishWizardTaxPub extends AbstractPublishWizard implements
IExportWizard {
-
- /**
- * <p>Constructor for PublishWizardTaxPub.</p>
- */
+
public PublishWizardTaxPub(){
setOutputModule(new TaxPubOutputModule());
setWindowTitle("Publish TaxPub");
}
-}
+}
\ No newline at end of file
/**
- *
- */
+* 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.printpublisher.wizard;
import org.eclipse.ui.IExportWizard;
import eu.etaxonomy.cdm.print.out.xml.XMLOutputModule;
-
-
/**
* <p>PublishWizardXML class.</p>
*
* @author n.hoffmann
* @created Apr 1, 2010
- * @version 1.0
*/
public class PublishWizardXML extends AbstractPublishWizard implements IExportWizard{
+
/**
* <p>Constructor for PublishWizardXML.</p>
*/
setOutputModule(new XMLOutputModule());
setWindowTitle("Publish XML");
}
-}
+}
\ No newline at end of file
* 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.printpublisher.wizard;
import java.io.File;
*
* @author n.hoffmann
* @created Apr 7, 2010
- * @version 1.0
*/
public class SelectDirectoryWizardPage extends AbstractPublishWizardPage implements IHasPersistableSettings {
private static final String DIALOG_SETTING_OUTPUT_DIRECTORY = "dialogSettingOutputDirectory";
private DirectoryDialog folderDialog;
private Text text_folder;
- /**
- * <p>Constructor for SelectFolderWizardPage.</p>
- *
- * @param pageName a {@link java.lang.String} object.
- */
public SelectDirectoryWizardPage(String pageName) {
super(pageName);
setTitle("Select a folder");
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- /** {@inheritDoc} */
public void createControl(Composite parent) {
// configurator = ((IPublishConfigurer) getWizard()).getConfigurator();
text_folder = new Text(composite, SWT.BORDER);
text_folder.setEditable(false);
text_folder.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false));
-
+
Button button = new Button(composite, SWT.PUSH);
button.setText("Browse...");
button.addSelectionListener(new SelectionAdapter(){
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
+
@Override
public void widgetSelected(SelectionEvent e) {
super.widgetSelected(e);
}
}
});
-
+
loadSettings();
-
+
setControl(composite);
}
-
+
@Override
public void loadSettings() {
String directory = getDialogSettingValue(DIALOG_SETTING_OUTPUT_DIRECTORY);
setDirectory(directory);
}
}
-
+
private void setDirectory(String directory){
text_folder.setText(directory);
getConfigurator().setExportFolder(new File(directory));
setPageComplete(true);
}
-
- /** {@inheritDoc} */
+
@Override
public boolean isPageComplete() {
return getConfigurator().getExportFolder() != null;
}
-}
+}
\ No newline at end of file
* 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.printpublisher.wizard;
import java.util.ArrayList;
*
* @author n.hoffmann
* @created Aug 6, 2010
- * @version 1.0
*/
public class SelectFeatureTreeWizardPage extends AbstractPublishWizardPage
implements ISelectionChangedListener, IHasPersistableSettings{
private static final String DIALOG_SETTING_FEATURE_TREE_UUID = "dialogSettingFeatureTreeUuid";
private ListViewer viewer;
- /**
- * <p>Constructor for SelectFeatureTreeWizardPage.</p>
- *
- * @param pageName a {@link java.lang.String} object.
- */
protected SelectFeatureTreeWizardPage(String pageName) {
super(pageName);
setTitle("Select Feature Tree");
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- /** {@inheritDoc} */
@Override
public void createControl(Composite parent) {
setPageComplete(false);
viewer = new ListViewer(composite);
viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- viewer.setContentProvider(new FeatureTreeContentProvider());
- viewer.setLabelProvider(new FeatureTreeLabelProvider());
+ viewer.setContentProvider(new TermTreeContentProvider());
+ viewer.setLabelProvider(new TermTreeLabelProvider());
viewer.addSelectionChangedListener(this);
}
}
- /** {@inheritDoc} */
@Override
public void selectionChanged(SelectionChangedEvent event) {
IStructuredSelection selection = (IStructuredSelection) event.getSelection();
setPageComplete(true);
-
Element featureTreeElement = (Element) selection.getFirstElement();
UUID featureTreeUuid = XMLHelper.getUuid(featureTreeElement);
setPageComplete(featureTreeUuid != null);
}
- /** {@inheritDoc} */
@Override
public boolean canFlipToNextPage() {
return isPageComplete();
viewer.setInput(realFeatureTrees);
}
- private class FeatureTreeContentProvider implements IStructuredContentProvider {
+ private class TermTreeContentProvider implements IStructuredContentProvider {
@Override
public void dispose() {}
}
return new Object[0];
}
-
}
- private class FeatureTreeLabelProvider extends LabelProvider {
+ private class TermTreeLabelProvider extends LabelProvider {
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
- */
@Override
public String getText(Object element) {
if(element instanceof Element){
}
return "no title cache";
}
-
}
-}
+}
\ No newline at end of file
* 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.printpublisher.wizard;
import org.eclipse.swt.SWT;
*
* @author n.hoffmann
* @created Jul 26, 2010
- * @version 1.0
*/
public class SelectOptionsWizardPage extends AbstractPublishWizardPage
implements SelectionListener, IHasPersistableSettings{
private Boolean doSynonymy;
private Boolean entireBranches;
- /**
- * <p>Constructor for OptionsWizardPage.</p>
- *
- * @param pageName a {@link java.lang.String} object.
- */
protected SelectOptionsWizardPage(String pageName) {
super(pageName);
setTitle("Select options");
}
- /** {@inheritDoc} */
@Override
public void createControl(Composite parent) {
widgetSelected(null);
}
- /** {@inheritDoc} */
@Override
public void widgetSelected(SelectionEvent e) {
entireBranches = button_doPublishEntireBranches.getSelection();
putDialogSettingValue(DIALOG_SETTING_DO_IMAGES, doImages.toString());
}
- /** {@inheritDoc} */
@Override
public void widgetDefaultSelected(SelectionEvent e) {}
}
* 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.printpublisher.wizard;
import java.lang.reflect.InvocationTargetException;
*
* @author n.hoffmann
* @created Apr 6, 2010
- * @version 1.0
*/
public class SelectServiceWizardPage extends AbstractPublishWizardPage {
private Button button_local;
private Button button_remote;
private Text text_serviceUrl;
-
+
private TreeViewer treeViewer;
- /**
- * <p>Constructor for SelectServiceWizardPage.</p>
- *
- * @param pageName a {@link java.lang.String} object.
- */
protected SelectServiceWizardPage(String pageName) {
super(pageName);
setTitle("Select a Service");
}
-
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- /** {@inheritDoc} */
+
public void createControl(Composite parent) {
-
+
composite = new Composite(parent, SWT.NULL);
composite.setLayout(new GridLayout());
-
+
RadioSelectionListener listener = new RadioSelectionListener();
-
+
Group radioGroup = new Group(composite, SWT.SHADOW_ETCHED_IN);
radioGroup.setLayout(new GridLayout());
-
+
button_local = new Button(radioGroup, SWT.RADIO);
-
+
button_local.setText("Local (By selecting this option the database you are currently " +
"connected to will be used to gather data.)");
-
+
button_local.addSelectionListener(listener);
-
-
-
+
button_remote = new Button(radioGroup, SWT.RADIO);
button_remote.setText("Remote");
button_remote.addSelectionListener(listener);
text_serviceUrl.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false));
text_serviceUrl.setText("http://");
text_serviceUrl.addModifyListener(new ModifyListener() {
-
+
public void modifyText(ModifyEvent e) {
String text = text_serviceUrl.getText();
-
+
if(!text.endsWith("/")){
SelectServiceWizardPage.this.setErrorMessage("Webservice URL has to end with \"/\"");
setPageComplete(false);
return;
}
-
+
URL url = null;
try {
url = new URL(text);
setPageComplete(false);
return;
}
-
+
getConfigurator().setWebserviceUrl(url);
-
+
SelectServiceWizardPage.this.setErrorMessage(null);
-
+
}
});
-
+
treeViewer = new TreeViewer(composite);
-
+
treeViewer.setContentProvider(new ContentProvider());
treeViewer.setLabelProvider(new LabelProvider());
-
+
treeViewer.addSelectionChangedListener(new SelectionChangedListener());
-
+
treeViewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
-
+
if(CdmStore.isActive()){
enableLocal();
}else{
enableRemote();
button_local.setEnabled(false);
}
-
+
setControl(composite);
-
}
-
+
private class RadioSelectionListener extends SelectionAdapter{
@Override
public void widgetSelected(SelectionEvent e) {
}
}
}
-
+
private void enableRemote() {
button_local.setSelection(false);
button_remote.setSelection(true);
-
+
text_serviceUrl.setEnabled(true);
-
+
setConfigurator(PublishConfigurator.NewRemoteInstance());
getConfigurator().addOutputModule(getOutputModule());
}
-
+
private void enableLocal() {
button_remote.setSelection(false);
button_local.setSelection(true);
-
+
text_serviceUrl.setEnabled(false);
-
+
setConfigurator(PublishConfigurator.NewLocalInstance((ICdmRepository) CdmStore.getCurrentApplicationConfiguration()));
getConfigurator().addOutputModule(getOutputModule());
refresh();
}
-
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#canFlipToNextPage()
- */
- /** {@inheritDoc} */
+
@Override
public boolean canFlipToNextPage() {
return isPageComplete();
}
- /**
- * <p>refresh</p>
- */
public void refresh(){
-
+
if(getConfigurator() != null){
-
+
IRunnableWithProgress runnable = new IRunnableWithProgress(){
@Override
public void run() {
treeViewer.setInput(classifications);
}
-
+
});
monitor.done();
}
-
+
};
try {
getContainer().run(true, false, runnable);
}
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
- */
- /** {@inheritDoc} */
@Override
public boolean isPageComplete() {
boolean complete = true;
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
- }
-
+ }
}
private class LabelProvider extends ColumnLabelProvider
return XMLHelper.getTitleCache(xmlElement);
}
return "no title cache";
- }
-
+ }
}
-
-}
+}
\ No newline at end of file
* 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.printpublisher.wizard;
import java.lang.reflect.InvocationTargetException;
import org.eclipse.swt.SWT;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
import org.eclipse.swt.widgets.Display;
import org.jdom.Element;
*
* @author n.hoffmann
* @created Apr 6, 2010
- * @version 1.0
*/
public class SelectTaxaWizardPage extends AbstractPublishWizardPage {
private Composite composite;
private TreeViewer treeViewer;
-
- private Button button_refresh;
- /**
- * <p>Constructor for SelectTaxaWizardPage.</p>
- *
- * @param pageName a {@link java.lang.String} object.
- */
public SelectTaxaWizardPage(String pageName) {
super(pageName);
setTitle("Select Taxa to export.");
-
-
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
- /** {@inheritDoc} */
public void createControl(Composite parent) {
composite = new Composite(parent, SWT.NULL);
composite.setLayout(new GridLayout());
treeViewer.addSelectionChangedListener(new SelectionChangedListener());
treeViewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
-
+
setControl(composite);
}
-
- /**
- * <p>refresh</p>
- */
+
public void refresh(){
if(getConfigurator() != null){
-
+
IRunnableWithProgress runnable = new IRunnableWithProgress(){
@Override
final List<Element> classifications = factory.getClassifications();
Display.getDefault().asyncExec(new Runnable(){
-
@Override
public void run() {
treeViewer.setInput(classifications);
}
-
});
}
-
};
try {
getContainer().run(true, false, runnable);
setPageComplete(true);
}
}
-
}
private class ContentProvider implements ITreeContentProvider{
IXMLEntityFactory factory = getConfigurator().getFactory();
return factory != null ? factory.getChildNodes(element).toArray() : new Object[]{};
-
}
return new Object[]{};
public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
}
-
}
private class LabelProvider extends ColumnLabelProvider
}
- /** {@inheritDoc} */
@Override
public boolean canFlipToNextPage() {
return isPageComplete();
}
- /** {@inheritDoc} */
@Override
public boolean isPageComplete() {
return getConfigurator().getSelectedTaxonNodeElements() != null && getConfigurator().getSelectedTaxonNodeElements().size() > 0;
}
-}
+}
\ No newline at end of file
Bundle-ManifestVersion: 2
Bundle-Name: DataStore Bundle
Bundle-SymbolicName: eu.etaxonomy.taxeditor.store;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.0
Bundle-Activator: eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin
Bundle-Vendor: EDIT
Bundle-Localization: OSGI-INF/l10n/bundle
command.commandname.9 = Create term tree
command.commandname.10 = Restart
menu.label.1 = Terms
-handledmenuitem.label.8 = Term Trees
+handledmenuitem.label.8 = Term Tree
handledmenuitem.tooltip.1 = Term Tree Editor
handledmenuitem.label.9 = GFBio Term Import
handledmenuitem.tooltip.2 = GFBio Term Import
menu.label.6 = Taxa
menu.label.7 = References
menu.label.8 = Descriptive Data
-menu.label.9 = Factual Data
+menu.label.9 = Factual Data\r
+\r
+handledmenuitem.label.30 = State\r
+handledmenuitem.label.31 = Structure Modifier
+handledmenuitem.label.32 = Named Area Level\r
+handledmenuitem.label.33 = Named Area Type\r
+handledmenuitem.label.34 = Annotation Type\r
+handledmenuitem.label.35 = Identifier Type\r
+handledmenuitem.label.36 = Marker Type\r
+handledmenuitem.label.37 = Extension Type\r
+handledmenuitem.label.38 = Modifier\r
+handledmenuitem.label.39 = Kind of Unit\r
+handledmenuitem.label.40 = Determination Modifier\r
+handledmenuitem.label.41 = Scope\r
+handledmenuitem.label.42 = Sex\r
+handledmenuitem.label.43 = Stage\r
+handledmenuitem.label.44 = DNA Marker\r
+handledmenuitem.label.45 = Namerelationship Type\r
+handledmenuitem.label.46 = Taxonrelationship Type\r
+handledmenuitem.label.47 = Nametypedesignation Status\r
+handledmenuitem.label.48 = Nomenclatural Status Type\r
+handledmenuitem.label.49 = Specimentypedesignation Status\r
+handledmenuitem.label.50 = Taxonnode Agent Relation Type\r
+handledmenuitem.label.51 = Language\r
+\r
+handledmenuitem.label.52 = Öffnen in ...\r
command.commandname.9 = Termbaum erstellen
command.commandname.10 = Neustarten
menu.label.1 = Terme
-handledmenuitem.label.8 = Term-Bäume
-handledmenuitem.tooltip.1 = Term-Baumeditor
+handledmenuitem.label.8 = Termbaum
+handledmenuitem.tooltip.1 = Termbaum-Editor
handledmenuitem.label.9 = GFBio Term Import
handledmenuitem.tooltip.2 = GFBio Term Import
menu.label.2 = Export
command.commandname.20 = Struktur-Baum (OWL)
command.commandname.21 = OWL-Term-Export
handledmenuitem.label.22 = OWL Term Export
-handledmenuitem.label.23 = Term Baum OWL Import
+handledmenuitem.label.23 = Termbaum OWL Import
page.name.104 = Verbreitungsdaten
page.name.105 = Status
menu.label.6 = Taxa
menu.label.7 = Referenzen
menu.label.8 = Beschreibende Daten
-menu.label.9 = Faktendaten
\ No newline at end of file
+menu.label.9 = Faktendaten
+
+handledmenuitem.label.30 = Zustand
+handledmenuitem.label.31 = Struktur Modifikator
+handledmenuitem.label.32 = Gebietsebene
+handledmenuitem.label.33 = Gebietstyp
+handledmenuitem.label.34 = Annotationstyp
+handledmenuitem.label.35 = Identifier-Typ
+handledmenuitem.label.36 = Marker-Typ
+handledmenuitem.label.37 = Erweiterungs-Typ
+handledmenuitem.label.38 = Modifikator
+handledmenuitem.label.39 = Art des Datensatzes
+handledmenuitem.label.40 = Bestimmungs-Modifikator
+handledmenuitem.label.41 = Gültigkeitsbereich
+handledmenuitem.label.42 = Geschlecht
+handledmenuitem.label.43 = Stadium
+handledmenuitem.label.44 = DNA-Marker
+handledmenuitem.label.45 = Namensbeziehungstyp
+handledmenuitem.label.46 = Taxonbeziehungstyp
+handledmenuitem.label.47 = Kategorie der Namenstypisierung
+handledmenuitem.label.48 = Nomenklatorischer Status Typ
+handledmenuitem.label.49 = Kategorie der Belegtypisierung
+handledmenuitem.label.50 = Relationstyp: Taxon-Knoten/Agierende
+handledmenuitem.label.51 = Sprache
+handledmenuitem.label.52 = Öffnen in ...
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_2G0O8IfREeecZ4F2Y9Z0Og" coreExpressionId="isShowExperimentalFeatures"/>
</children>
</children>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_W94ssIdQEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.commandlabel14" label="%command.label.14" command="_Z_XgsIdQEeecZ4F2Y9Z0Og"/>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_XF10EFvsEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.18"/>
+ <children xsi:type="menu:DynamicMenuContribution" xmi:id="_rzOGUEBGEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSetNavigator.dynamicmenucontribution.cdmViewer" label="%handledmenuitem.label.52" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.CdmViewerContextMenuE4"/>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_YBargFvsEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.19"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_aHm7kEAVEembfJNLZI9wiA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.moveto" label="%handledmenuitem.label.15" command="_d6YpoEAVEembfJNLZI9wiA"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_W94ssIdQEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.commandlabel14" label="%command.label.14" command="_Z_XgsIdQEeecZ4F2Y9Z0Og"/>
</menus>
</elements>
<elements xsi:type="basic:PartDescriptor" xmi:id="_HBpj0KkNEeejedk4mZQIGw" elementId="eu.etaxonomy.taxeditor.view.dataimport.e4.SpecimenImportViewE4" label="%view.name.7" allowMultiple="true" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.dataimport.e4.SpecimenImportViewE4">
<elements xsi:type="basic:PartDescriptor" xmi:id="_XV6gkEbOEeiER_VRS0L7wA" elementId="eu.etaxonomy.taxeditor.view.webimport.termimport.GfBioTerminologyImportPart" label="%partdescriptor.label.1" tooltip="%partdescriptor.tooltip.1" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.webimport.termimport.GfBioTerminologyImportPart"/>
<elements xsi:type="basic:PartDescriptor" xmi:id="_namYwB7xEemDKJyLc5CJfQ" elementId="eu.etaxonomy.taxeditor.store.partdescriptor.termsearch" label="%partdescriptor.label.2" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.search.facet.term.TermSearch"/>
<elements xsi:type="basic:PartDescriptor" xmi:id="_mbegMDNMEemOn_75IU-Tvg" elementId="eu.etaxonomy.taxeditor.store.partdescriptor.occurencesearch" label="%partdescriptor.label.3" closeable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.search.facet.occurrence.OccurrenceSearch"/>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_-y1CcMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditor" label="%partdescriptor.label.featureTreeEditor" tooltip="%partdescriptor.label.featureTreeEditor" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditor">
+ <elements xsi:type="basic:PartDescriptor" xmi:id="_-y1CcMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.termTreeEditor" label="%partdescriptor.label.featureTreeEditor" tooltip="" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor">
<tags>nonRestore</tags>
- <handlers xmi:id="_-y1CccKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <handlers xmi:id="_-y1CcsKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandlers" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandler" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- <handlers xmi:id="_-y1Cc8KPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler" command="_I_yx4GcqEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_-y1CdMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_-y1CdcKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
+ <handlers xmi:id="_-y1CccKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateTermTreeHandler" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
+ <handlers xmi:id="_-y1CcsKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandlers" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveTermTreeHandler" command="_3mqzkCFdEeiVXriJfxPIuA"/>
+ <handlers xmi:id="_-y1Cc8KPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.TermTreeExportWordHandler" command="_I_yx4GcqEee0qLTtA2ZpVQ"/>
+ <handlers xmi:id="_-y1CdMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.AddTermHandler" command="_oftL0GceEee0qLTtA2ZpVQ"/>
+ <handlers xmi:id="_-y1CdcKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.TermTreeExportOntologyHandler" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
<menus xsi:type="menu:PopupMenu" xmi:id="_-y1CeMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.popupmenu.featureTreeEditor">
<children xsi:type="menu:HandledMenuItem" xmi:id="_-y1CecKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.newfeaturetree" label="%handledmenuitem.label.1" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/new_wiz.png" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
<children xsi:type="menu:MenuSeparator" xmi:id="_-y1CgMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.5"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_-y1CgcKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.addchildfeature" label="%handledmenuitem.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_aPYxsBezEeiXusClKZjycQ"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_-y1CgsKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.addFeature" label="%handledmenuitem.label.3" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_oftL0GceEee0qLTtA2ZpVQ"/>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_f9QgsFvsEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.20"/>
+ <children xsi:type="menu:DynamicMenuContribution" xmi:id="_NOtlsEBHEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.editor.descriptiveDataSetNavigator.dynamicmenucontribution.cdmViewer" label="%handledmenuitem.label.52" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.view.CdmViewerContextMenuE4"/>
<children xsi:type="menu:MenuSeparator" xmi:id="_-y1Cg8KPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.8"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_-y1ChMKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.paste" label="%handledmenuitem.label.12" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/paste_edit.png" command="_xDk5kNjyEeidDMMI9xTsbQ"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_-y1ChcKPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.copy" label="%handledmenuitem.label.13" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/copy_edit.png" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
<children xsi:type="menu:HandledMenuItem" xmi:id="_-y1Cj8KPEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.deletefeaturetree" label="%handledmenuitem.label.6" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_3mqzkCFdEeiVXriJfxPIuA"/>
</menus>
</elements>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_J-3UEEqgEeeN-dEYnw7m3g" elementId="eu.etaxonomy.taxeditor.featuretree.e4.CharacterTreeEditor" label="%partdescriptor.label.4" tooltip="%partdescriptor.label.4" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.CharacterTreeEditor">
- <tags>nonRestore</tags>
- <handlers xmi:id="_DYhGACHXEeiP8eNo0PEm1g" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.character.CreateFeatureTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <handlers xmi:id="_Bb0TwCFeEeiVXriJfxPIuA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.character.RemoveFeatureTreeHandlers" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandler" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- <handlers xmi:id="_VSc2UGcqEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.character.FeatureTreeExportWordHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler" command="_I_yx4GcqEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_3wq0cGceEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.character.AddFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_DcmpgPhnEei8uPv-H2wqnw" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.character.FeatureTreeExportOntologyHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <menus xsi:type="menu:PopupMenu" xmi:id="__Jwh4GceEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.store.popupmenu.featureTreeEditor">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_GuuM0CHXEeiP8eNo0PEm1g" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.character.newfeaturetree" label="%handledmenuitem.label.1" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/new_wiz.png" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_eIB1kCHXEeiP8eNo0PEm1g" elementId="eu.etaxonomy.taxeditor.store.menuseparator.character.5"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jr4E0Be0EeiXusClKZjycQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.character.addchildfeature" label="%handledmenuitem.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_aPYxsBezEeiXusClKZjycQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_eWBz0GcjEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.character.addFeature" label="%handledmenuitem.label.3" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_XtPjcNjyEeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.8"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_G_IOENj3EeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.character.paste" label="%handledmenuitem.label.12" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/paste_edit.png" command="_xDk5kNjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_QXkWYNjyEeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.character.copy" label="%handledmenuitem.label.13" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/copy_edit.png" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_So5f0NjyEeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.character.7"/>
- <children xsi:type="menu:Menu" xmi:id="_jPawUPhmEei8uPv-H2wqnw" elementId="eu.etaxonomy.taxeditor.store.menu.character.export" label="%menu.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_QGF5kCRZEemBIp_HwXtqoA" coreExpressionId="isFeatureTree"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_7vaEcGcqEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.character.exportFeatureTreeOwl" label="%handledmenuitem.label.14" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_qcmvwPhmEei8uPv-H2wqnw" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.character.exportFeatureTree" label="%handledmenuitem.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_I_yx4GcqEee0qLTtA2ZpVQ">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_qcmvwfhmEei8uPv-H2wqnw" coreExpressionId="isShowExperimentalFeatures"/>
- </children>
- </children>
- <children xsi:type="menu:MenuSeparator" xmi:id="_TFRL0CFgEeiVXriJfxPIuA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.character.0"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_Beb6QGcfEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.character.removeFeature" label="%handledmenuitem.label.5" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_pw1FICFdEeiVXriJfxPIuA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.character.deletefeaturetree" label="%handledmenuitem.label.6" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- </menus>
- </elements>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_D2OD0MKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.StructureTreeEditor" label="%partdescriptor.label.5" tooltip="%partdescriptor.label.5" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.StructureTreeEditor">
- <tags>nonRestore</tags>
- <handlers xmi:id="_D2OD0cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.structure.CreateFeatureTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <handlers xmi:id="_D2OD0sKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.structure.RemoveFeatureTreeHandlers" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandler" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- <handlers xmi:id="_D2OD08KQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.structure.FeatureTreeExportWordHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler" command="_I_yx4GcqEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_D2OD1MKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.structure.AddFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_D2OD1cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.structure.FeatureTreeExportOntologyHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <menus xsi:type="menu:PopupMenu" xmi:id="_D2OD2MKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.popupmenu.featureTreeEditor">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_D2OD2cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.structure.newfeaturetree" label="%handledmenuitem.label.1" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/new_wiz.png" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_D2OD4MKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.structure.5"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_D2OD4cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.structure.addchildfeature" label="%handledmenuitem.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_aPYxsBezEeiXusClKZjycQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_D2OD4sKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.structure.addFeature" label="%handledmenuitem.label.3" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_D2OD48KQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.structure.8"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_D2OD5MKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.structure.paste" label="%handledmenuitem.label.12" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/paste_edit.png" command="_xDk5kNjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_D2OD5cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.structure.copy" label="%handledmenuitem.label.13" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/copy_edit.png" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_D2OD5sKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.structure.7"/>
- <children xsi:type="menu:Menu" xmi:id="_D2OD58KQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menu.structure.export" label="%menu.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_D2OD6MKQEem1vZq1LletZg" coreExpressionId="isFeatureTree"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_D2OD6cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.structure.exportFeatureTreeOwl" label="%handledmenuitem.label.14" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_D2OD68KQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.structure.exportFeatureTree" label="%handledmenuitem.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_I_yx4GcqEee0qLTtA2ZpVQ">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_D2OD7MKQEem1vZq1LletZg" coreExpressionId="isShowExperimentalFeatures"/>
- </children>
- </children>
- <children xsi:type="menu:MenuSeparator" xmi:id="_D2OD7cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.structure.0"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_D2OD7sKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.structure.removeFeature" label="%handledmenuitem.label.5" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_D2OD78KQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.structure.deletefeaturetree" label="%handledmenuitem.label.6" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- </menus>
- </elements>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_HJt04MKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.PropertyTreeEditor" label="%partdescriptor.label.6" tooltip="%partdescriptor.label.6" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.PropertyTreeEditor">
- <tags>nonRestore</tags>
- <handlers xmi:id="_HJt04cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.property.CreateFeatureTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <handlers xmi:id="_HJt04sKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.property.RemoveFeatureTreeHandlers" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandler" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- <handlers xmi:id="_HJt048KQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.property.FeatureTreeExportWordHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler" command="_I_yx4GcqEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_HJt05MKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.property.AddFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_HJt05cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.property.FeatureTreeExportOntologyHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <menus xsi:type="menu:PopupMenu" xmi:id="_HJt06MKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.popupmenu.featureTreeEditor">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_HJt06cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.property.newfeaturetree" label="%handledmenuitem.label.1" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/new_wiz.png" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_HJt08MKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.property.5"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_HJt08cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.property.addchildfeature" label="%handledmenuitem.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_aPYxsBezEeiXusClKZjycQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_HJt08sKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.property.addFeature" label="%handledmenuitem.label.3" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_HJt088KQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.property.8"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_HJt09MKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.property.paste" label="%handledmenuitem.label.12" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/paste_edit.png" command="_xDk5kNjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_HJt09cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.property.copy" label="%handledmenuitem.label.13" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/copy_edit.png" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_HJt09sKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.property.7"/>
- <children xsi:type="menu:Menu" xmi:id="_HJt098KQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menu.property.export" label="%menu.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_HJt0-MKQEem1vZq1LletZg" coreExpressionId="isFeatureTree"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_HJt0-cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.property.exportFeatureTreeOwl" label="%handledmenuitem.label.14" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_HJt0-8KQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.property.exportFeatureTree" label="%handledmenuitem.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_I_yx4GcqEee0qLTtA2ZpVQ">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_HJt0_MKQEem1vZq1LletZg" coreExpressionId="isShowExperimentalFeatures"/>
- </children>
- </children>
- <children xsi:type="menu:MenuSeparator" xmi:id="_HJt0_cKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menuseparator.property.0"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_HJt0_sKQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.property.removeFeature" label="%handledmenuitem.label.5" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_HJt0_8KQEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.property.deletefeaturetree" label="%handledmenuitem.label.6" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- </menus>
- </elements>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_whoc4PynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.PresenceAbsenceTreeEditor" label="%partdescriptor.label.7" tooltip="%partdescriptor.label.7" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.PresenceAbsenceTreeEditor">
- <tags>nonRestore</tags>
- <handlers xmi:id="_whoc4fynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.presenceAbsence.CreateFeatureTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <handlers xmi:id="_whoc4vynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.presenceAbsence.RemoveFeatureTreeHandlers" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandler" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- <handlers xmi:id="_whoc4_ynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.presenceAbsence.FeatureTreeExportWordHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler" command="_I_yx4GcqEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_whoc5PynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.presenceAbsence.AddFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_whoc5fynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.presenceAbsence.FeatureTreeExportOntologyHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <menus xsi:type="menu:PopupMenu" xmi:id="_whoc5vynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.popupmenu.featureTreeEditor">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc5_ynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.newfeaturetree" label="%handledmenuitem.label.1" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/new_wiz.png" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_whoc6PynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.presenceAbsence.5"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc6fynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.addchildfeature" label="%handledmenuitem.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_aPYxsBezEeiXusClKZjycQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc6vynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.addFeature" label="%handledmenuitem.label.3" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_whoc6_ynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.presenceAbsence.8"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc7PynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.paste" label="%handledmenuitem.label.12" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/paste_edit.png" command="_xDk5kNjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc7fynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.copy" label="%handledmenuitem.label.13" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/copy_edit.png" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_whoc7vynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.presenceAbsence.7"/>
- <children xsi:type="menu:Menu" xmi:id="_whoc7_ynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menu.presenceAbsence.export" label="%menu.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_whoc8PynEemPDYtIH5gauA" coreExpressionId="isFeatureTree"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc8fynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.exportFeatureTreeOwl" label="%handledmenuitem.label.14" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc8_ynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.exportFeatureTree" label="%handledmenuitem.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_I_yx4GcqEee0qLTtA2ZpVQ">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_whoc9PynEemPDYtIH5gauA" coreExpressionId="isShowExperimentalFeatures"/>
- </children>
- </children>
- <children xsi:type="menu:MenuSeparator" xmi:id="_whoc9fynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.presenceAbsence.0"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc9vynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.removeFeature" label="%handledmenuitem.label.5" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_whoc9_ynEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.presenceAbsence.deletefeaturetree" label="%handledmenuitem.label.6" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- </menus>
- </elements>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_jGX_YPysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.NamedAreaTreeEditor" label="%partdescriptor.label.8" tooltip="%partdescriptor.label.8" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.NamedAreaTreeEditor">
- <tags>nonRestore</tags>
- <handlers xmi:id="_jGX_YfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.namedArea.CreateFeatureTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <handlers xmi:id="_jGX_YvysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.namedArea.RemoveFeatureTreeHandlers" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandler" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- <handlers xmi:id="_jGX_Y_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.namedArea.FeatureTreeExportWordHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler" command="_I_yx4GcqEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_jGX_ZPysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.namedArea.AddFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_jGX_ZfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.namedArea.FeatureTreeExportOntologyHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <menus xsi:type="menu:PopupMenu" xmi:id="_jGX_ZvysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.popupmenu.featureTreeEditor">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_Z_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.newfeaturetree" label="%handledmenuitem.label.1" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/new_wiz.png" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_jGX_aPysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.namedArea.5"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_afysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.addchildfeature" label="%handledmenuitem.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_aPYxsBezEeiXusClKZjycQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_avysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.addFeature" label="%handledmenuitem.label.3" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_jGX_a_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.namedArea.8"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_bPysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.paste" label="%handledmenuitem.label.12" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/paste_edit.png" command="_xDk5kNjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_bfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.copy" label="%handledmenuitem.label.13" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/copy_edit.png" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_jGX_bvysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.namedArea.7"/>
- <children xsi:type="menu:Menu" xmi:id="_jGX_b_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menu.namedArea.export" label="%menu.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_jGX_cPysEemPDYtIH5gauA" coreExpressionId="isFeatureTree"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_cfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.exportFeatureTreeOwl" label="%handledmenuitem.label.14" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_c_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.exportFeatureTree" label="%handledmenuitem.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_I_yx4GcqEee0qLTtA2ZpVQ">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_jGX_dPysEemPDYtIH5gauA" coreExpressionId="isShowExperimentalFeatures"/>
- </children>
- </children>
- <children xsi:type="menu:MenuSeparator" xmi:id="_jGX_dfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.namedArea.0"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_dvysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.removeFeature" label="%handledmenuitem.label.5" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jGX_d_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.namedArea.deletefeaturetree" label="%handledmenuitem.label.6" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- </menus>
- </elements>
- <elements xsi:type="basic:PartDescriptor" xmi:id="_jK89YPysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.RankTreeEditor" label="%partdescriptor.label.9" tooltip="%partdescriptor.label.9" allowMultiple="true" closeable="true" dirtyable="true" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.RankTreeEditor">
- <tags>nonRestore</tags>
- <handlers xmi:id="_jK89YfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.rank.CreateFeatureTreeHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.CreateFeatureTreeHandler" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <handlers xmi:id="_jK89YvysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.rank.RemoveFeatureTreeHandlers" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureTreeHandler" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- <handlers xmi:id="_jK89Y_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.rank.FeatureTreeExportWordHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportWordHandler" command="_I_yx4GcqEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_jK89ZPysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.rank.AddFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.AddFeatureHandler" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <handlers xmi:id="_jK89ZfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.rank.FeatureTreeExportOntologyHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.FeatureTreeExportOntologyHandler" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <menus xsi:type="menu:PopupMenu" xmi:id="_jK89ZvysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.popupmenu.featureTreeEditor">
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89Z_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.newfeaturetree" label="%handledmenuitem.label.1" iconURI="platform:/plugin/org.eclipse.ui/icons/full/etool16/new_wiz.png" command="_AJtnsCHXEeiP8eNo0PEm1g"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_jK89aPysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.rank.5"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89afysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.addchildfeature" label="%handledmenuitem.label.2" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_aPYxsBezEeiXusClKZjycQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89avysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.addFeature" label="%handledmenuitem.label.3" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/add.gif" command="_oftL0GceEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_jK89a_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.rank.8"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89bPysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.paste" label="%handledmenuitem.label.12" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/paste_edit.png" command="_xDk5kNjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89bfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.copy" label="%handledmenuitem.label.13" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/copy_edit.png" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
- <children xsi:type="menu:MenuSeparator" xmi:id="_jK89bvysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.rank.7"/>
- <children xsi:type="menu:Menu" xmi:id="_jK89b_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menu.rank.export" label="%menu.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_jK89cPysEemPDYtIH5gauA" coreExpressionId="isFeatureTree"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89cfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.exportFeatureTreeOwl" label="%handledmenuitem.label.14" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_xyZ4oPhmEei8uPv-H2wqnw"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89c_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.exportFeatureTree" label="%handledmenuitem.label.4" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/export.gif" command="_I_yx4GcqEee0qLTtA2ZpVQ">
- <visibleWhen xsi:type="ui:CoreExpression" xmi:id="_jK89dPysEemPDYtIH5gauA" coreExpressionId="isShowExperimentalFeatures"/>
- </children>
- </children>
- <children xsi:type="menu:MenuSeparator" xmi:id="_jK89dfysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.rank.0"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89dvysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.removeFeature" label="%handledmenuitem.label.5" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_jK89d_ysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.rank.deletefeaturetree" label="%handledmenuitem.label.6" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/delete.gif" command="_3mqzkCFdEeiVXriJfxPIuA"/>
- </menus>
- </elements>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_3rW8wCXaEeex9MwMOgUeWw" featurename="children" parentElementId="eu.etaxonomy.taxeditor.menu.showView" positionInList="after:eu.etaxonomy.taxeditor.workbench.menuseparator.afterConcept">
<elements xsi:type="menu:HandledMenuItem" xmi:id="_TlufMCaGEeeTEd_pKXBflg" elementId="eu.etaxonomy.taxeditor.store.showViewMenu.supplemental" label="%command.label.1" iconURI="platform:/plugin/eu.etaxonomy.taxeditor.store/icons/applications-office.png" tooltip="%command.label.1" command="_bnVKsCZxEeeQLpuomSmVoQ">
<elements xsi:type="commands:Command" xmi:id="_WISF0H1LEem6uMX-L-maww" elementId="eu.etaxonomy.taxeditor.store.command.export.term.owl" commandName="%command.commandname.21"/>
<elements xsi:type="commands:Command" xmi:id="_sKIVINL6Eem35L6JVBxwwA" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardAdminHandler" commandName="%command.name.120"/>
<elements xsi:type="commands:Command" xmi:id="_qENOgP5VEeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.store.command.nacherweiterungensuchen" commandName="Nach Erweiterungen suchen"/>
+ <elements xsi:type="commands:Command" xmi:id="_n5NykDoqEeud_N8qGaxX2Q" elementId="eu.etaxonomy.taxeditor.store.command.OpenDefinedTermEditor" commandName="Open Defined Term Editor">
+ <parameters xmi:id="_v55EcDoqEeud_N8qGaxX2Q" elementId="eu.etaxonomy.taxeditor.store.commandparameter.termType" name="TermType" optional="false"/>
+ </elements>
+ <elements xsi:type="commands:Command" xmi:id="_8aaicD4fEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.command.OpenTermTreeEditor" commandName="Open Term Tree Editor">
+ <parameters xmi:id="_8aaicT4fEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.commandparameter.termType" name="TermType" optional="false"/>
+ </elements>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_swGH0GhvEee3K4uKJljEYg" featurename="handlers" parentElementId="xpath:/">
- <elements xsi:type="commands:Handler" xmi:id="_rVEdIGcjEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureHandler" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
- <elements xsi:type="commands:Handler" xmi:id="_tyCPYIdPEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.OpenDefinedTermEditorHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.OpenDefinedTermEditorHandlerE4" command="_qEMrsIdPEeecZ4F2Y9Z0Og"/>
+ <elements xsi:type="commands:Handler" xmi:id="_rVEdIGcjEee0qLTtA2ZpVQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.RemoveTermHandler" command="_fNBtQGcjEee0qLTtA2ZpVQ"/>
+ <elements xsi:type="commands:Handler" xmi:id="_tyCPYIdPEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.OpenDefinedTermEditorHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.OpenDefinedTermEditorHandlerE4" command="_n5NykDoqEeud_N8qGaxX2Q"/>
<elements xsi:type="commands:Handler" xmi:id="_XF8ogJMBEeeR4YRjNqCKeA" elementId="eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenTaxonNodeWizardHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenTaxonNodeWizardHandlerE4" command="_cE510JMBEeeR4YRjNqCKeA"/>
<elements xsi:type="commands:Handler" xmi:id="_8HUM8JMCEeeR4YRjNqCKeA" elementId="eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenClassificationWizardHandlerE4" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.defaultHandler.e4.DefaultOpenClassificationWizardHandlerE4" command="_zJ4-8JMCEeeR4YRjNqCKeA"/>
<elements xsi:type="commands:Handler" xmi:id="_fKcuoKjzEeejedk4mZQIGw" elementId="eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsViewHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.defaultHandler.OpenReferencingObjectsViewHandler" command="_l-AGEKjzEeejedk4mZQIGw"/>
<elements xsi:type="commands:Handler" xmi:id="_VBYX4MiQEeiKErB3UVzQug" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenDistributionStausWizardAdminHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.e4.OpenDistributionStatusWizardAdminHandler" command="_tPtdwMiIEeiKErB3UVzQug"/>
<elements xsi:type="commands:Handler" xmi:id="_jnQb8MrcEeiKErB3UVzQug" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardAdminHandler" command="_tRsg8MrcEeiKErB3UVzQug"/>
<elements xsi:type="commands:Handler" xmi:id="_H_c_EEq2EeeN-dEYnw7m3g" elementId="eu.etaxonomy.taxeditor.featuretree.handler.SaveHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.workbench/eu.etaxonomy.taxeditor.workbench.SaveHandler" command="_LlbAMEq2EeeN-dEYnw7m3g"/>
- <elements xsi:type="commands:Handler" xmi:id="_hPTxMBezEeiXusClKZjycQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.AddChildFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.AddChildFeatureHandler" command="_aPYxsBezEeiXusClKZjycQ"/>
- <elements xsi:type="commands:Handler" xmi:id="_i-FlkNjyEeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.CopyFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.CopyFeatureHandler" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
+ <elements xsi:type="commands:Handler" xmi:id="_hPTxMBezEeiXusClKZjycQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.AddChildFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.AddChildTermHandler" command="_aPYxsBezEeiXusClKZjycQ"/>
+ <elements xsi:type="commands:Handler" xmi:id="_i-FlkNjyEeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.CopyFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.CopyTermHandler" command="_cMyQ4NjyEeidDMMI9xTsbQ"/>
<elements xsi:type="commands:Handler" xmi:id="_tzQ_YNjyEeidDMMI9xTsbQ" elementId="eu.etaxonomy.taxeditor.featuretree.e4.handler.PasteFeatureHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.PasteFeatureHandler" command="_xDk5kNjyEeidDMMI9xTsbQ"/>
<elements xsi:type="commands:Handler" xmi:id="_xWlngO5vEeizn7bmbAeBkw" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenDistributionStausWizardHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.e4.OpenDistributionStatusWizardHandler" command="_Za5DYO5vEeizn7bmbAeBkw"/>
<elements xsi:type="commands:Handler" xmi:id="_i4yZAD8zEemTy7SLZkowuQ" elementId="eu.etaxonomy.taxeditor.store.handler.0" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.OpenDatabaseRepairWizardHandler" command="_qYxw8D85EemTy7SLZkowuQ"/>
<elements xsi:type="commands:Handler" xmi:id="_nhGLwH1LEem6uMX-L-maww" elementId="eu.etaxonomy.taxeditor.io.e4.out.owl.OpenOwlTermExportWizard" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.io.e4.out.owl.OpenOwlTermExportWizard" command="_WISF0H1LEem6uMX-L-maww"/>
<elements xsi:type="commands:Handler" xmi:id="_3AxAINL9Eem35L6JVBxwwA" elementId="eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardAdminHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.handler.e4.OpenCommonNameAreaWizardAdminHandler" command="_sKIVINL6Eem35L6JVBxwwA"/>
<elements xsi:type="commands:Handler" xmi:id="_wSjnIP5VEeqwiqpCwftRog" elementId="eu.etaxonomy.taxeditor.store.handler.searchForPlugin" command="_qENOgP5VEeqwiqpCwftRog"/>
+ <elements xsi:type="commands:Handler" xmi:id="_4kk8oDoqEeud_N8qGaxX2Q" elementId="eu.etaxonomy.taxeditor.store.OpenDefinedTermHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.handler.OpenDefinedTermEditorHandlerE4" command="_qEMrsIdPEeecZ4F2Y9Z0Og"/>
+ <elements xsi:type="commands:Handler" xmi:id="_4GeBAD4fEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.OpenDefinedTermHandler" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.featuretree.e4.handler.OpenTermTreeEditorHandler" command="_8aaicD4fEeuM4JU-Ch98ZA"/>
</fragments>
<fragments xsi:type="fragment:StringModelFragment" xmi:id="_qT4hgIfTEeecZ4F2Y9Z0Og" featurename="children" parentElementId="eu.etaxonomy.taxeditor.workbench.menu.window" positionInList="before:eu.etaxonomy.taxeditor.application.windowMenu.last">
<elements xsi:type="menu:Menu" xmi:id="_LT3P8IfcEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.menu.termeditor" label="%menu.label.1">
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_1xVggMTDEemAeKumL6iTpg" coreExpressionId="isCdmStoreConnected"/>
- <children xsi:type="menu:DynamicMenuContribution" xmi:id="_HIptYIfUEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.dynamicmenucontribution.0" contributionURI="bundleclass://eu.etaxonomy.taxeditor.store/eu.etaxonomy.taxeditor.editor.definedterm.e4.DefinedTermMenuE4"/>
+ <children xsi:type="menu:Menu" xmi:id="_umxYEDocEeuzzbCHEqs6jg" elementId="eu.etaxonomy.taxeditor.store.menu." label="%command.label.12">
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_46o0kDocEeuzzbCHEqs6jg" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.features" label="%handledmenuitem.label.24" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_UQRgQDouEeud_N8qGaxX2Q" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="FE"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_Sa3ZoDo1Eeud_N8qGaxX2Q" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.characters" label="%handledmenuitem.label.25" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_mglxwDo1Eeud_N8qGaxX2Q" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.characterEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="CHA"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_nsbb4Dq7EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.properties" label="%handledmenuitem.label.27" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_HIuqsDq8EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.propertyEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="PROP"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_S97XEDq8EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel30" label="%handledmenuitem.label.30" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_eu1ZUDq8EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.stateEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="STA"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_7VAvkDq8EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel26" label="%handledmenuitem.label.26" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="__0nHYDq8EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.structureEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="STRU"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_YFuh4Dq9EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel31" label="%handledmenuitem.label.31" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_Yh7VsDq9EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.structureEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="STMO"/>
+ </children>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_6DMs8Dq9EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.1"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_3HtMMDq9EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel20" label="%handledmenuitem.label.20" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_BhV5gDq-EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="NA"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_KUIk0Dq-EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel32" label="%handledmenuitem.label.32" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_NoLvgDq-EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaLevelEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="NAL"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_vEUIEDq-EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel33" label="%handledmenuitem.label.33" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_IoK80Dq_EeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="NAT"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_xpQ0QDrCEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.21" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_9aEv4DrCEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="PAT"/>
+ </children>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_lYNUcDuVEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.13"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_zlcYQFycEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel50" label="%handledmenuitem.label.50" tooltip="%handledmenuitem.label.50" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_7knOQFycEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.TaxonNodeAgentRelationTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="TART"/>
+ </children>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_udLdUDrDEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.2"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_2CLf0DrDEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.34" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_2CLf0TrDEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="ANT"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="__R2UYDrDEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.35" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="__R2UYTrDEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="IDE"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_3DFGsDrEEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.36" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_3DFGsTrEEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="MKT"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_9uU2sDrEEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.37" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_9uU2sTrEEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="EXT"/>
+ </children>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_EVzhADrFEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.11"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_FRV8MDrFEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.38" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_FRV8MTrFEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="MO"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_zFB7sDuTEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.41" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_zFB7sTuTEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="SCO"/>
+ </children>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_ifvSgDuVEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.12"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_BVf04DrJEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.39" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_BVf04TrJEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="KOU"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_noT2MDuSEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.40" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_noT2MTuSEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="DMO"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_f4xFsDuUEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.42" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_f4xFsTuUEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="SEX"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_0Btw8DuUEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.43" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_0Btw8TuUEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="STG"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_3rgiIDuUEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel3" label="%handledmenuitem.label.44" command="_n5NykDoqEeud_N8qGaxX2Q">
+ <parameters xmi:id="_3rgiITuUEeuAuPxcOe1-XA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTypeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="DMA"/>
+ </children>
+ </children>
<children xsi:type="menu:MenuSeparator" xmi:id="_yRINcIfqEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.menuseparator.3"/>
<children xsi:type="menu:Menu" xmi:id="_5wQLUMKNEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.menu.term_tree_editor" label="%handledmenuitem.label.8" tooltip="%handledmenuitem.tooltip.1">
<visibleWhen xsi:type="ui:CoreExpression" xmi:id="_4ic9QMTDEemAeKumL6iTpg" coreExpressionId="isCdmStoreConnected"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_rwfDkIftEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.24" tooltip="%handledmenuitem.label.24" command="_bnVKsCZxEeeQLpuomSmVoQ">
- <parameters xmi:id="_3acJQIftEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditor"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_rwfDkIftEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.24" tooltip="%handledmenuitem.label.24" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_3acJQIftEeecZ4F2Y9Z0Og" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="FE"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_CLrfgMKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.characterTreeEditor" label="%handledmenuitem.label.25" tooltip="%handledmenuitem.label.25" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_CLrfgcKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.characterTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="CHA"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_DosQEMKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.27" tooltip="%handledmenuitem.label.27" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_DosQEcKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.propertyTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="PROP"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_AljE8D4GEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.30" tooltip="%handledmenuitem.label.30" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_AljE8T4GEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="STA"/>
</children>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_ZdYr4PysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.20" tooltip="%handledmenuitem.label.20" command="_bnVKsCZxEeeQLpuomSmVoQ">
- <parameters xmi:id="_ZdYr4fysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTreeEditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.featuretree.e4.NamedAreaTreeEditor"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_CUh5gMKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.structureTreeEditor" label="%handledmenuitem.label.26" tooltip="%handledmenuitem.label.26" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_CUh5gcKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.structureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="STRU"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_0JJOoD4FEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.31" tooltip="%handledmenuitem.label.31" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_0JJ1sD4FEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="STMO"/>
</children>
<children xsi:type="menu:MenuSeparator" xmi:id="_AVOnkP8QEem7jP7thrJFNA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.10"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_MfMpEPyqEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.21" tooltip="%handledmenuitem.label.21" command="_bnVKsCZxEeeQLpuomSmVoQ">
- <parameters xmi:id="_MfMpEfyqEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.presenceAbsenceTreeEditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.featuretree.e4.PresenceAbsenceTreeEditor"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_ZdYr4PysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.20" tooltip="%handledmenuitem.label.20" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_ZdYr4fysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="NA"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_bHiV4D4GEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.32" tooltip="%handledmenuitem.label.32" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_bHiV4T4GEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="NAL"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_a5RQYD4GEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.33" tooltip="%handledmenuitem.label.33" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_a5RQYT4GEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="NAT"/>
</children>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_Zmin4PysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.28" tooltip="%handledmenuitem.label.28" command="_bnVKsCZxEeeQLpuomSmVoQ">
- <parameters xmi:id="_Zmin4fysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.rankTreeEditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.featuretree.e4.RankTreeEditor"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_MfMpEPyqEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.21" tooltip="%handledmenuitem.label.21" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_MfMpEfyqEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.presenceAbsenceTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="PAT"/>
</children>
<children xsi:type="menu:MenuSeparator" xmi:id="___koAP8MEem7jP7thrJFNA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.9"/>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_CLrfgMKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.characterTreeEditor" label="%handledmenuitem.label.25" tooltip="%handledmenuitem.label.25" command="_bnVKsCZxEeeQLpuomSmVoQ">
- <parameters xmi:id="_CLrfgcKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.characterTreeEditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.featuretree.e4.CharacterTreeEditor"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_Zmin4PysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.28" tooltip="%handledmenuitem.label.28" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_Zmin4fysEemPDYtIH5gauA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.rankTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="RK"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_qaWRQD4JEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.45" tooltip="%handledmenuitem.label.45" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_qaWRQT4JEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.taxonRelationshipTypeTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="NRT"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_qcpXUD4JEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.46" tooltip="%handledmenuitem.label.46" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_qcpXUT4JEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.nameTypeDesignationStatusTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="TRT"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_qei0wD4JEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.48" tooltip="%handledmenuitem.label.48" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_qei0wT4JEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.nomenclaturalStatusTypeTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="NST"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_1vdxQFzHEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.handledmenuitem.handledmenuitemlabel47" label="%handledmenuitem.label.47" tooltip="%handledmenuitem.label.47" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_H8CPYFzIEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.nameTypeDesignationStatusTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="NTD"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_qgc5QD4JEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.49" tooltip="%handledmenuitem.label.549" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_qgc5QT4JEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.specimenTypeDesignationStatusTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="STD"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_qiDbwD4JEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.50" tooltip="%handledmenuitem.label.50" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_qiDbwT4JEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.TaxonNodeAgentRelationTYpeTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="TART"/>
+ </children>
+ <children xsi:type="menu:MenuSeparator" xmi:id="__TX5ID4KEeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.14"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_Lm2iED69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.51" tooltip="%handledmenuitem.label.51" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_Lm2iET69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="LA"/>
+ </children>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_Lcr6MFydEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.21"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_UqE2ED69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.34" tooltip="%handledmenuitem.label.34" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_UqE2ET69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="ANT"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_fLp-cD69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.35" tooltip="%handledmenuitem.label.35" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_fLqlgD69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="IDE"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_k7i5cD69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.36" tooltip="%handledmenuitem.label.36" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_k7i5cT69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="MKT"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_q0IdcD69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.37" tooltip="%handledmenuitem.label.37" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_q0IdcT69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="EXT"/>
+ </children>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_wXDTcD69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.menuseparator.15"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_zPTS8D69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.38" tooltip="%handledmenuitem.label.38" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_zPTS8T69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="MO"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_Ead-cD6-EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.41" tooltip="%handledmenuitem.label.41" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_Ead-cT6-EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="SCO"/>
+ </children>
+ <children xsi:type="menu:MenuSeparator" xmi:id="_PmPwkFydEeuH0dRH_QHgrQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.22"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_6T4I8D69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.39" tooltip="%handledmenuitem.label.39" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_6T4I8T69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="KOU"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_-wEAYD69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.40" tooltip="%handledmenuitem.label.40" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_-wEAYT69EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="DMO"/>
+ </children>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_NquB0D6-EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.42" tooltip="%handledmenuitem.label.42" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_NquB0T6-EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="SEX"/>
</children>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_CUh5gMKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.structureTreeEditor" label="%handledmenuitem.label.26" tooltip="%handledmenuitem.label.26" command="_bnVKsCZxEeeQLpuomSmVoQ">
- <parameters xmi:id="_CUh5gcKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.structureTreeEditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.featuretree.e4.StructureTreeEditor"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_Xsu5UD6-EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.43" tooltip="%handledmenuitem.label.43" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_Xsu5UT6-EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="STG"/>
</children>
- <children xsi:type="menu:HandledMenuItem" xmi:id="_DosQEMKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.propertyTreeEditor" label="%handledmenuitem.label.27" tooltip="%handledmenuitem.label.27" command="_bnVKsCZxEeeQLpuomSmVoQ">
- <parameters xmi:id="_DosQEcKOEem1vZq1LletZg" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.propertyTreeEditor" name="eu.etaxonomy.taxeditor.workbench.commandparameter.partName" value="eu.etaxonomy.taxeditor.featuretree.e4.PropertyTreeEditor"/>
+ <children xsi:type="menu:HandledMenuItem" xmi:id="_dts9QD6-EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.termEditorMenu.featureTreeEditor" label="%handledmenuitem.label.44" tooltip="%handledmenuitem.label.44" command="_8aaicD4fEeuM4JU-Ch98ZA">
+ <parameters xmi:id="_dts9QT6-EeuM4JU-Ch98ZA" elementId="eu.etaxonomy.taxeditor.store.showView.parameter.featureTreeEditor" name="eu.etaxonomy.taxeditor.store.commandparameter.termType" value="DMA"/>
</children>
</children>
<children xsi:type="menu:MenuSeparator" xmi:id="_XKnM8E3IEeiplYSgvvNXRQ" elementId="eu.etaxonomy.taxeditor.store.menuseparator.6"/>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.18.2</version>
+ <version>5.19.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
import java.util.List;
import java.util.Map;
+import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
import eu.etaxonomy.taxeditor.store.CdmStore;
* @author cmathew
* @date 5 Feb 2015
*/
-public abstract class CdmEntitySessionInput implements ICdmEntitySessionEnabled {
+public abstract class CdmEntitySessionInput<T extends CdmBase> implements ICdmEntitySessionEnabled<T> {
private ICdmEntitySession cdmEntitySession;
package eu.etaxonomy.taxeditor.editor.definedterm.e4.handler;
import java.util.List;
-import java.util.UUID;
import java.util.stream.Collectors;
import org.eclipse.e4.core.di.annotations.Execute;
import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.commands.MParameter;
import org.eclipse.e4.ui.model.application.ui.basic.MPart;
import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
public void execute(EPartService partService, MHandledMenuItem menuItem, MApplication application, EModelService modelService) {
String commandId = menuItem.getCommand().getElementId();
- UUID termTypeUuid = (UUID) menuItem.getTransientData().get(commandId+".termTypeUuid");
+ List<MParameter> parameters = menuItem.getParameters();
+ TermType termType = null;
+ for (MParameter param: parameters){
+ termType = TermType.getByKey(param.getValue());
+ }
- TermType termType = TermType.getByUuid(termTypeUuid);
+// UUID termTypeUuid = (UUID) menuItem.getTransientData().get(commandId+".termTypeUuid");
+//
+// TermType termType = TermType.getByUuid(termTypeUuid);
+ if(termType != null){
+ TermType type = termType;
TermEditorInput termEditorInput = new TermEditorInput(termType);
List<MPart> alreadyOpenedEditors = partService.getParts().stream()
.filter(part->part.getObject()!=null && part.getObject() instanceof DefinedTermEditorE4)
- .filter(part->((DefinedTermEditorE4)part.getObject()).getDefinedTermEditorInput().getTermType().equals(termType))
+ .filter(part->((DefinedTermEditorE4)part.getObject()).getDefinedTermEditorInput().getTermType().equals(type))
.collect(Collectors.toList());
if(!alreadyOpenedEditors.isEmpty()){
//there should never be more than one already opened editor
DefinedTermEditorE4 termEditor = (DefinedTermEditorE4) part.getObject();
termEditor.init(termEditorInput);
}
+ }
}
}
/**\r
* @author l.morris\r
* @date 3 Jan 2012\r
- *\r
*/\r
public abstract class AbstractDefinedTermEditorInput<T extends DefinedTermBase> extends CdmEntitySessionInput {\r
\r
- /**\r
- *\r
- */\r
public AbstractDefinedTermEditorInput() {\r
super(true);\r
}\r
\r
- /**\r
- * @return\r
- */\r
public abstract List<String> getTermClasses();\r
-\r
-\r
-}
+}
\ No newline at end of file
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.TermStore;
-
-
/**
* @author n.hoffmann
* @date Jan 24, 2012
- *
*/
public class TermEditorInput extends AbstractDefinedTermEditorInput<DefinedTerm> {
public TermEditorInput(TermType termType) {
this.termType = termType;
- vocabularies = new HashSet<TermVocabularyDto>();
+ vocabularies = new HashSet<>();
initialiseVocabularies();
}
public String getName() {
// defaultNameFeatureTree = TermTree.NewInstance(nameFeatures);
}
return defaultNameFeatureTree;
-
}
public static void resetDefaultNameFeatureTree(){
defaultNameFeatureTree = null;
}
- /**
- * @return
- */
public static TermTree<?> getPreferredNameFeatureTree(boolean createNew) {
-
return PreferencesUtil.getPreferredFeatureTreeForNameDescription(createNew);
-
}
public static TermTree<?> getPreferredTaxonFeatureTree(boolean createNew) {
-
return PreferencesUtil.getPreferredFeatureTreeForTaxonDescription(createNew);
-
}
}
public static final String ADD_SAVE_CANDIDATE = "ADD/SAVE/CANDIDATE";
public static final String ADD_SAVE_CHARACTER = "ADD/SAVE/CHARACTER";
+ public static final String UPDATE_LINK_WITH_TAXON = "UPDATE/LINK_WITH_TAXON";
+
}
* @created Aug 5, 2010
* @version 1.0
*/
-public class AvailableFeaturesWizard extends Wizard {
+public class AvailableTermsWizard extends Wizard {
- private AvailableFeaturesWizardPage page;
+ private AvailableTermsWizardPage page;
private Set<DefinedTermBase> additionalFeatures;
private boolean singleSelection = false;
- public AvailableFeaturesWizard(TermType termType){
+ public AvailableTermsWizard(TermType termType){
vocabularyDtos = CdmStore.getService(IVocabularyService.class).findVocabularyDtoByTermType(termType);
}
- public AvailableFeaturesWizard(List<TermVocabularyDto> vocabularyDtos){
+ public AvailableTermsWizard(List<TermVocabularyDto> vocabularyDtos){
this.vocabularyDtos = vocabularyDtos;
}
/** {@inheritDoc} */
@Override
public void addPages() {
- page = new AvailableFeaturesWizardPage(vocabularyDtos,singleSelection);
+ page = new AvailableTermsWizardPage(vocabularyDtos,singleSelection);
addPage(page);
}
* @created Aug 5, 2010
* @version 1.0
*/
-public class AvailableFeaturesWizardPage extends WizardPage {
+public class AvailableTermsWizardPage extends WizardPage {
private CheckBoxTreeComposite treeComposite;
private List<TermVocabularyDto> vocabularies;
- protected AvailableFeaturesWizardPage(List<TermVocabularyDto> vocabularies, boolean singleSelection) {
+ protected AvailableTermsWizardPage(List<TermVocabularyDto> vocabularies, boolean singleSelection) {
super("Available Terms Wizard Page");
this.vocabularies = vocabularies;
setTitle("Available Terms");
* @author k.luther
* @since Oct 13, 2020
*/
-public class FeatureNodeDtoTransfer extends ByteArrayTransfer {
+public class TermNodeDtoTransfer extends ByteArrayTransfer {
- private static FeatureNodeDtoTransfer instance = new FeatureNodeDtoTransfer();
+ private static TermNodeDtoTransfer instance = new TermNodeDtoTransfer();
private static final String TYPE_NAME = "featureNodeDto-transfer-format";
private static final int TYPEID = registerType(TYPE_NAME);
*
* @return a {@link eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer} object.
*/
- public static synchronized FeatureNodeDtoTransfer getInstance() {
+ public static synchronized TermNodeDtoTransfer getInstance() {
return instance;
}
- private FeatureNodeDtoTransfer() {
+ private TermNodeDtoTransfer() {
}
/** {@inheritDoc} */
* @author n.hoffmann
* @created Aug 5, 2010
*/
-public class FeatureNodeTransfer extends ByteArrayTransfer {
+public class TermNodeTransfer extends ByteArrayTransfer {
- private static FeatureNodeTransfer instance = new FeatureNodeTransfer();
+ private static TermNodeTransfer instance = new TermNodeTransfer();
private static final String TYPE_NAME = "featureNode-transfer-format";
private static final int TYPEID = registerType(TYPE_NAME);
*
* @return a {@link eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer} object.
*/
- public static synchronized FeatureNodeTransfer getInstance() {
+ public static synchronized TermNodeTransfer getInstance() {
return instance;
}
- private FeatureNodeTransfer() {
+ private TermNodeTransfer() {
}
/** {@inheritDoc} */
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
/**
- * <p>FeatureTreeContentProvider class.</p>
+ * <p>TermTreeContentProvider class.</p>
*
* @author n.hoffmann
* @created Aug 5, 2010
* @version 1.0
*/
-public class FeatureTreeContentProvider<T extends DefinedTermBase> implements ITreeContentProvider {
+public class TermTreeContentProvider<T extends DefinedTermBase> implements ITreeContentProvider {
Viewer viewer;
TermNodeDto oldInput;
* @created Aug 5, 2010
* @version 1.0
*/
-public class FeatureTreeLabelProvider extends TermDtoLabelProvider{
+public class TermTreeLabelProvider extends TermDtoLabelProvider{
/** {@inheritDoc} */
@Override
* @since Jan 30, 2019
*
*/
-public class FeatureTreePropertyTester extends PropertyTester {
+public class TermTreePropertyTester extends PropertyTester {
private static final String FEATURE_TREE= "isFeatureTree"; //$NON-NLS-1$
}
if(FEATURE_TREE.equals(property)){
- return isFeatureTree(selectedElements);
+ return isTermTree(selectedElements);
}
else{
return false;
}
}
- private boolean isFeatureTree(Object[] selectedElements) {
+ private boolean isTermTree(Object[] selectedElements) {
for (Object object : selectedElements){
if(!(object instanceof TermTree)){
return false;
+++ /dev/null
-/**
-* Copyright (C) 2019 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.featuretree.e4;
-
-import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.term.TermType;
-
-/**
- * @author pplitzner
- * @since Aug 19, 2019
- *
- */
-public class CharacterTreeEditor extends AbstractTermTreeEditor<Feature> {
-
-
-
- @Override
- public TermType getTermType() {
- return TermType.Character;
- }
-
-
-
-}
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
import eu.etaxonomy.taxeditor.featuretree.CharacterNodeDtoTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
import eu.etaxonomy.taxeditor.model.ImageResources;
label_title = new Label(composite_treeTitle, SWT.NULL);
label_title.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
- label_title.setText(Messages.FeatureTreeEditorComposite_FEATURE_TREE);
+ label_title.setText(Messages.TermTreeEditorComposite_FEATURE_TREE);
text_title = new Text(composite_treeTitle, SWT.BORDER);
text_title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
btnOpenFeatureTree = new Button(composite_treeTitle, SWT.NONE);
btnOpenFeatureTree.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1));
- btnOpenFeatureTree.setToolTipText(Messages.FeatureTreeEditorComposite_OPEN_TREE);
+ btnOpenFeatureTree.setToolTipText(Messages.TermTreeEditorComposite_OPEN_TREE);
btnOpenFeatureTree.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
viewer = new TreeViewer(new Tree(this, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI));
label_title.setText(label);
}
- viewer.setContentProvider(new FeatureTreeContentProvider());
- viewer.setLabelProvider(new FeatureTreeLabelProvider());
+ viewer.setContentProvider(new TermTreeContentProvider());
+ viewer.setLabelProvider(new TermTreeLabelProvider());
int ops = DND.DROP_COPY | DND.DROP_MOVE;
if(transfers==null){
+++ /dev/null
-/**
-* Copyright (C) 2019 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.featuretree.e4;
-
-import eu.etaxonomy.cdm.model.description.Feature;
-import eu.etaxonomy.cdm.model.term.TermType;
-
-/**
- * @author pplitzner
- * @since Aug 19, 2019
- *
- */
-public class FeatureTreeEditor extends AbstractTermTreeEditor<Feature> {
-
- @Override
- public TermType getTermType() {
- return TermType.Feature;
- }
-
-
-}
* @author k.luther
* @since Oct 29, 2020
*/
-public interface ICharacterEditor extends IFeatureTreeEditor<Character> {
-
+public interface ICharacterEditor extends ITermTreeEditor<Character> {
}
* @author pplitzner
* @since Nov 22, 2018
*/
-public interface IFeatureTreeEditor<T extends DefinedTermBase> extends IPostOperationEnabled, IE4SavablePart, ICdmEntitySessionEnabled {
+public interface ITermTreeEditor<T extends DefinedTermBase>
+ extends IPostOperationEnabled, IE4SavablePart, ICdmEntitySessionEnabled {
public TermType getTermType();
public TreeViewer getViewer();
public void refresh();
-
-
-}
+}
\ No newline at end of file
+++ /dev/null
-/**
-* Copyright (C) 2019 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.featuretree.e4;
-
-import eu.etaxonomy.cdm.model.location.NamedArea;
-import eu.etaxonomy.cdm.model.term.TermType;
-
-/**
- * @author pplitzner
- * @since Aug 19, 2019
- *
- */
-public class NamedAreaTreeEditor extends AbstractTermTreeEditor<NamedArea> {
-
-
- @Override
- public TermType getTermType() {
- return TermType.NamedArea;
- }
-
-}
+++ /dev/null
-/**
-* Copyright (C) 2019 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.featuretree.e4;
-
-import eu.etaxonomy.cdm.model.term.TermType;
-
-/**
- * @author pplitzner
- * @since Aug 19, 2019
- *
- */
-public class PresenceAbsenceTreeEditor extends AbstractTermTreeEditor {
-
-
- @Override
- public TermType getTermType() {
- return TermType.PresenceAbsenceTerm;
- }
-
-}
+++ /dev/null
-/**
-* Copyright (C) 2019 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.featuretree.e4;
-
-import eu.etaxonomy.cdm.model.term.TermType;
-
-/**
- * @author pplitzner
- * @since Aug 19, 2019
- *
- */
-public class PropertyTreeEditor extends AbstractTermTreeEditor {
-
-
-
- @Override
- public TermType getTermType() {
- return TermType.Property;
- }
-
-}
+++ /dev/null
-/**
-* Copyright (C) 2019 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.featuretree.e4;
-
-import eu.etaxonomy.cdm.model.term.TermType;
-
-/**
- * @author pplitzner
- * @since Aug 19, 2019
- *
- */
-public class RankTreeEditor extends AbstractTermTreeEditor {
-
- @Override
- public TermType getTermType() {
- return TermType.Rank;
- }
-
-}
+++ /dev/null
-/**
-* Copyright (C) 2019 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.featuretree.e4;
-
-import eu.etaxonomy.cdm.model.term.TermType;
-
-/**
- * @author pplitzner
- * @since Aug 19, 2019
- *
- */
-public class StructureTreeEditor extends AbstractTermTreeEditor {
-
-
-
- @Override
- public TermType getTermType() {
- return TermType.Structure;
- }
-
-}
import org.eclipse.swt.dnd.DragSourceEvent;
import eu.etaxonomy.cdm.model.term.TermNode;
-import eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer;
+import eu.etaxonomy.taxeditor.featuretree.TermNodeTransfer;
-public class FeatureNodeDragListener extends DragSourceAdapter {
+public class TermNodeDragListener extends DragSourceAdapter {
private final TreeViewer viewer;
- public FeatureNodeDragListener(TreeViewer viewer) {
+ public TermNodeDragListener(TreeViewer viewer) {
this.viewer = viewer;
}
IStructuredSelection selection = (IStructuredSelection) viewer.getSelection();
if(selection!=null && !selection.isEmpty()){
TermNode[] featureNodes = (TermNode[]) selection.toList().toArray(new TermNode[selection.size()]);
- if (FeatureNodeTransfer.getInstance().isSupportedType(event.dataType)) {
+ if (TermNodeTransfer.getInstance().isSupportedType(event.dataType)) {
event.data = featureNodes;
}
import eu.etaxonomy.cdm.model.term.TermNode;
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.FeatureNodeDtoTransfer;
+import eu.etaxonomy.taxeditor.featuretree.TermNodeDtoTransfer;
-public class FeatureNodeDtoDragListener extends DragSourceAdapter {
+public class TermNodeDtoDragListener extends DragSourceAdapter {
private final TreeViewer viewer;
- public FeatureNodeDtoDragListener(TreeViewer viewer) {
+ public TermNodeDtoDragListener(TreeViewer viewer) {
this.viewer = viewer;
}
if(selection!=null && !selection.isEmpty()){
if (selection instanceof TreeSelection && ((TreeSelection)selection).getFirstElement() instanceof TermNodeDto){
TermNodeDto[] featureNodes = (TermNodeDto[]) selection.toList().toArray(new TermNodeDto[selection.size()]);
- if (FeatureNodeDtoTransfer.getInstance().isSupportedType(event.dataType)) {
+ if (TermNodeDtoTransfer.getInstance().isSupportedType(event.dataType)) {
event.data = featureNodes;
}
}
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
import eu.etaxonomy.taxeditor.editor.definedterm.e4.DefinedTermDropAdapterE4;
-import eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer;
+import eu.etaxonomy.taxeditor.featuretree.TermNodeTransfer;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddOntologyTermOperation;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.MoveFeatureOperation;
import eu.etaxonomy.taxeditor.ui.dialog.selection.TermVocabularySelectionDialog;
import eu.etaxonomy.taxeditor.view.webimport.termimport.wrapper.OntologyTermWrapper;
-public class FeatureTreeDropAdapter extends ViewerDropAdapter {
+public class TermTreeDropAdapter extends ViewerDropAdapter {
- protected IFeatureTreeEditor editor;
+ protected ITermTreeEditor editor;
private UISynchronize sync;
- public FeatureTreeDropAdapter(IFeatureTreeEditor editor, Viewer viewer, UISynchronize sync) {
+ public TermTreeDropAdapter(ITermTreeEditor editor, Viewer viewer, UISynchronize sync) {
super(viewer);
this.editor = editor;
this.sync = sync;
@Override
public boolean validateDrop(Object target, int operation, TransferData transferData) {
boolean
- isSupported = FeatureNodeTransfer.getInstance().isSupportedType(transferData);
+ isSupported = TermNodeTransfer.getInstance().isSupportedType(transferData);
isSupported |= TermTransfer.getInstance().isSupportedType(transferData);
isSupported |= LocalSelectionTransfer.getTransfer().isSupportedType(transferData);
isSupported &= getViewer().getInput()!=null;
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
import eu.etaxonomy.taxeditor.editor.definedterm.e4.DefinedTermDropAdapterE4;
-import eu.etaxonomy.taxeditor.featuretree.FeatureNodeDtoTransfer;
+import eu.etaxonomy.taxeditor.featuretree.TermNodeDtoTransfer;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddOntologyTermOperation;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.MoveFeatureOperation;
import eu.etaxonomy.taxeditor.ui.dialog.selection.TermVocabularySelectionDialog;
import eu.etaxonomy.taxeditor.view.webimport.termimport.wrapper.OntologyTermWrapper;
-public class FeatureTreeDtoDropAdapter extends ViewerDropAdapter {
+public class TermTreeDtoDropAdapter extends ViewerDropAdapter {
- protected IFeatureTreeEditor editor;
+ protected ITermTreeEditor editor;
private UISynchronize sync;
- public FeatureTreeDtoDropAdapter(IFeatureTreeEditor editor, Viewer viewer, UISynchronize sync) {
+ public TermTreeDtoDropAdapter(ITermTreeEditor editor, Viewer viewer, UISynchronize sync) {
super(viewer);
this.editor = editor;
this.sync = sync;
@Override
public boolean validateDrop(Object target, int operation, TransferData transferData) {
boolean
- isSupported = FeatureNodeDtoTransfer.getInstance().isSupportedType(transferData);
+ isSupported = TermNodeDtoTransfer.getInstance().isSupportedType(transferData);
isSupported |= TermTransfer.getInstance().isSupportedType(transferData);
isSupported |= LocalSelectionTransfer.getTransfer().isSupportedType(transferData);
isSupported &= getViewer().getInput()!=null;
import eu.etaxonomy.cdm.api.service.ITermTreeService;
import eu.etaxonomy.cdm.model.term.DefinedTermBase;
import eu.etaxonomy.cdm.model.term.TermNode;
+import eu.etaxonomy.cdm.model.term.TermType;
import eu.etaxonomy.cdm.persistence.dto.TermDto;
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
import eu.etaxonomy.taxeditor.editor.definedterm.FeatureTreeViewerComparator;
import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
-import eu.etaxonomy.taxeditor.featuretree.FeatureNodeDtoTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermNodeDtoTransfer;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
+import eu.etaxonomy.taxeditor.featuretree.e4.operation.CreateFeatureTreeOperation;
+import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.IContextListener;
import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
import eu.etaxonomy.taxeditor.model.IPartContentHasDetails;
import eu.etaxonomy.taxeditor.model.IPartContentHasSupplementalData;
+import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
import eu.etaxonomy.taxeditor.session.ICdmEntitySession;
import eu.etaxonomy.taxeditor.store.AppModelId;
* @date 06.06.2017
*
*/
-public abstract class AbstractTermTreeEditor<T extends DefinedTermBase> implements IFeatureTreeEditor, ISelectionChangedListener,
- IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData,
- IContextListener, IConversationEnabled, IDirtyMarkable {
+public class TermTreeEditor<T extends DefinedTermBase>
+ implements ITermTreeEditor, ISelectionChangedListener,
+ IE4ViewerPart, IPartContentHasDetails, IPartContentHasSupplementalData,
+ IContextListener, IConversationEnabled, IDirtyMarkable {
public static final List<String> TREE_PROPERTY_PATH = Arrays.asList(new String[] {
"root", //$NON-NLS-1$
Map<UUID,TermTreeDto> trees;
Map<UUID, TermNodeDto> uuidTermMap = new HashMap<>();
+ List<AbstractPostOperation<TermNode>> createOperationList = new ArrayList<>();
List<AbstractPostOperation<TermNode>> operationList = new ArrayList<>();
List<TermNodeDto> listToUpdate = new ArrayList<>();
+ TermType termType;
+
@Inject
- public AbstractTermTreeEditor() {
+ public TermTreeEditor() {
CdmStore.getContextManager().addContextListener(this);
}
}
parent.setLayout(new FillLayout());
viewer = new TreeViewer(parent);
- FeatureTreeContentProvider contentProvider = new FeatureTreeContentProvider();
+ TermTreeContentProvider contentProvider = new TermTreeContentProvider();
viewer.setContentProvider(contentProvider);
- viewer.setLabelProvider(new FeatureTreeLabelProvider());
+ viewer.setLabelProvider(new TermTreeLabelProvider());
int ops = DND.DROP_COPY | DND.DROP_MOVE;
Transfer[] transfers = new Transfer[] {
- FeatureNodeDtoTransfer.getInstance(),
+ TermNodeDtoTransfer.getInstance(),
TermTransfer.getInstance(),
LocalSelectionTransfer.getTransfer()};
- viewer.addDragSupport(ops, transfers, new FeatureNodeDtoDragListener(viewer));
- viewer.addDropSupport(ops, transfers, new FeatureTreeDtoDropAdapter(this, viewer, sync));
+ viewer.addDragSupport(ops, transfers, new TermNodeDtoDragListener(viewer));
+ viewer.addDropSupport(ops, transfers, new TermTreeDtoDropAdapter(this, viewer, sync));
viewer.addSelectionChangedListener(this);
viewer.getTree().addKeyListener(new KeyAdapter() {
@Override
menuService.registerContextMenu(viewer.getControl(), AppModelId.POPUPMENU_EU_ETAXONOMY_TAXEDITOR_STORE_POPUPMENU_FEATURETREEEDITOR);
}
+ public void init(TermType type, String label){
+ this.termType = type;
+ updateTrees();
+ viewer.setComparator(new FeatureTreeViewerComparator());
+ viewer.setInput(getTrees());
+ ((TermTreeContentProvider)viewer.getContentProvider()).setUuidTermMap(uuidTermMap);
+ thisPart.setLabel(label);
+ }
+
// protected abstract List<TermTreeDto> getTrees();
public void paste(IStructuredSelection selection) {
parentNode = ((TermTreeDto)firstElement).getRoot();
}
if(parentNode!=null){
- TermNodeDto copiedNode = (TermNodeDto) ((IStructuredSelection)clipBoardSelection).getFirstElement();
- AddFeatureOperation operation = new AddFeatureOperation(copiedNode.getUuid(), parentNode, this, this);
+ TermNodeDto copiedNode = (TermNodeDto) ((IStructuredSelection)clipBoardSelection).getFirstElement();
+ boolean isDuplicate = this.checkDuplicates(copiedNode.getTerm().getUuid(), parentNode.getTree().getUuid());
+ if (isDuplicate && !parentNode.getTree().isAllowDuplicate()){
+ MessagingUtils.informationDialog(Messages.AddFeatureHandler_Duplicates_not_allowed, Messages.AddFeatureHandler_Duplicates_not_allowed_message + "\n"+copiedNode.getTerm().getTitleCache());
+ return;
+ }
+ TermNodeDto newDto = new TermNodeDto(copiedNode.getTerm(), parentNode, 0, parentNode.getTree(), null, null, null);
+ this.refresh();
+ this.setDirty();
+ AddFeatureOperation operation = new AddFeatureOperation(copiedNode.getTerm().getUuid(), parentNode, this, this);
// AbstractUtility.executeOperation(operation, sync);
this.addOperation(operation);
}
// commit the conversation and start a new transaction immediately
Object[] expandedElements = this.viewer.getExpandedElements();
conversation.commit(true);
+ if (createOperationList != null && !createOperationList.isEmpty()){
+ for (AbstractPostOperation<TermNode> operation: createOperationList){
+ AbstractUtility.executeOperation(operation, sync);
+ }
+ createOperationList.clear();
+ }
+
if (operationList != null && !operationList.isEmpty()){
for (AbstractPostOperation<TermNode> operation: operationList){
AbstractUtility.executeOperation(operation, sync);
updateTrees();
viewer.setInput(getTrees());
viewer.setExpandedElements(expandedElements);
+
}
@PreDestroy
for (TermTreeDto tree: trees.values()){
addAllNodesToMap(tree.getRoot());
}
- ((FeatureTreeContentProvider<T>)viewer.getContentProvider()).setUuidTermMap(uuidTermMap);
+ ((TermTreeContentProvider<T>)viewer.getContentProvider()).setUuidTermMap(uuidTermMap);
// viewer.refresh();
}
@Override
public void addOperation(AbstractPostOperation operation) {
- operationList.add(operation);
+ if (operation instanceof CreateFeatureTreeOperation){
+ createOperationList.add(operation);
+ }else{
+ operationList.add(operation);
+ }
}
@Inject
}
}
+ @Override
+ public TermType getTermType() {
+ return termType;
+ }
+
+
}
import eu.etaxonomy.cdm.model.term.TermTree;
import eu.etaxonomy.cdm.model.term.TermType;
import eu.etaxonomy.taxeditor.editor.definedterm.TermTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureNodeTransfer;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermNodeTransfer;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.IDirtyMarkable;
import eu.etaxonomy.taxeditor.model.ImageResources;
* @author pplitzner
* @since Jun 19, 2017
*/
-public class FeatureTreeEditorComposite <T extends DefinedTermBase> extends Composite{
+public class TermTreeEditorComposite <T extends DefinedTermBase> extends Composite{
private TermTree<T> featureTree;
private Button btnOpenFeatureTree;
private TreeViewer viewer;
- public FeatureTreeEditorComposite(Composite parent, int style) {
+ public TermTreeEditorComposite(Composite parent, int style) {
super(parent, style);
setLayout(new GridLayout(1, false));
label_title = new Label(composite_treeTitle, SWT.NULL);
label_title.setLayoutData(new GridData(SWT.RIGHT, SWT.CENTER, false, false, 1, 1));
- label_title.setText(Messages.FeatureTreeEditorComposite_FEATURE_TREE);
+ label_title.setText(Messages.TermTreeEditorComposite_FEATURE_TREE);
text_title = new Text(composite_treeTitle, SWT.BORDER);
text_title.setLayoutData(new GridData(SWT.FILL, SWT.CENTER, true, false, 1, 1));
btnOpenFeatureTree = new Button(composite_treeTitle, SWT.NONE);
btnOpenFeatureTree.setLayoutData(new GridData(SWT.CENTER, SWT.CENTER, false, false, 1, 1));
- btnOpenFeatureTree.setToolTipText(Messages.FeatureTreeEditorComposite_OPEN_TREE);
+ btnOpenFeatureTree.setToolTipText(Messages.TermTreeEditorComposite_OPEN_TREE);
btnOpenFeatureTree.setImage(ImageResources.getImage(ImageResources.BROWSE_ICON));
viewer = new TreeViewer(new Tree(this, SWT.H_SCROLL | SWT.V_SCROLL | SWT.MULTI));
label_title.setText(label);
}
- viewer.setContentProvider(new FeatureTreeContentProvider());
- viewer.setLabelProvider(new FeatureTreeLabelProvider());
+ viewer.setContentProvider(new TermTreeContentProvider());
+ viewer.setLabelProvider(new TermTreeLabelProvider());
int ops = DND.DROP_COPY | DND.DROP_MOVE;
if(transfers==null){
transfers = new Transfer[] {
- FeatureNodeTransfer.getInstance(),
+ TermNodeTransfer.getInstance(),
TermTransfer.getInstance(),
};
}
import eu.etaxonomy.cdm.persistence.dto.CharacterNodeDto;
import eu.etaxonomy.cdm.persistence.dto.TermDto;
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.AvailableFeaturesWizard;
-import eu.etaxonomy.taxeditor.featuretree.e4.AbstractTermTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.AvailableTermsWizard;
import eu.etaxonomy.taxeditor.featuretree.e4.ICharacterEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.AddFeatureOperation;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
* @author k.luther
* @since Nov 10, 2020
*/
-public abstract class AbstractAddFeatureHandler {
+public abstract class AbstractAddTermHandler {
@Execute
public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
@Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
UISynchronize sync) {
- IFeatureTreeEditor editor = ((IFeatureTreeEditor) thisPart.getObject());
+ ITermTreeEditor editor = ((ITermTreeEditor) thisPart.getObject());
TermNodeDto parent = getParent(selection);
TermType type = null;
}else{
type = parent.getTerm().getTermType();
}
- AvailableFeaturesWizard wizard = new AvailableFeaturesWizard(type);
+ AvailableTermsWizard wizard = new AvailableTermsWizard(type);
WizardDialog dialog = new WizardDialog(shell, wizard);
if (dialog.open() == IStatus.OK) {
if (editor instanceof ICharacterEditor){
editor.refresh();
}else{
- Object[] expandedElements = ((AbstractTermTreeEditor)editor).getViewer().getExpandedElements();
- ((AbstractTermTreeEditor)editor).getViewer().setInput(((AbstractTermTreeEditor)editor).getTrees());
- ((AbstractTermTreeEditor)editor).getViewer().setExpandedElements(expandedElements);
+ Object[] expandedElements = ((TermTreeEditor)editor).getViewer().getExpandedElements();
+ ((TermTreeEditor)editor).getViewer().setInput(((TermTreeEditor)editor).getTrees());
+ ((TermTreeEditor)editor).getViewer().setExpandedElements(expandedElements);
}
}
if (!duplicates.isEmpty()){
import org.eclipse.jface.viewers.IStructuredSelection;
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
/**
* @author pplitzner
* @since Jul 12, 2017
*/
-public class AddChildFeatureHandler extends AbstractAddFeatureHandler{
+public class AddChildTermHandler extends AbstractAddTermHandler{
@CanExecute
public boolean canExecute(
@Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
MHandledMenuItem menuItem) {
boolean canExecute = false;
- canExecute = thisPart.getObject() instanceof IFeatureTreeEditor
+ canExecute = thisPart.getObject() instanceof ITermTreeEditor
&& selection!=null
&& selection.size()==1
&& selection.getFirstElement() instanceof TermNodeDto;
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
/**
* @author pplitzner
* @since Jul 12, 2017
*
*/
-public class AddFeatureHandler extends AbstractAddFeatureHandler{
+public class AddTermHandler extends AbstractAddTermHandler{
@Execute
public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
@Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
MHandledMenuItem menuItem) {
boolean canExecute = false;
- canExecute = thisPart.getObject() instanceof IFeatureTreeEditor
+ canExecute = thisPart.getObject() instanceof ITermTreeEditor
&& selection!=null
&& selection.size()==1
&& selection.getFirstElement() instanceof TermTreeDto;
import org.eclipse.jface.viewers.IStructuredSelection;
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.AbstractTermTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
-public class CopyFeatureHandler {
+public class CopyTermHandler {
@Execute
public void execute(@Named(IServiceConstants.ACTIVE_PART) MPart part,
@Named(IServiceConstants.ACTIVE_SELECTION) IStructuredSelection selection){
- ((AbstractTermTreeEditor) part.getObject()).copy(selection);
+ ((TermTreeEditor) part.getObject()).copy(selection);
}
@CanExecute
@Named(IServiceConstants.ACTIVE_PART) MPart part,
MHandledMenuItem menuItem){
boolean canExecute = false;
- canExecute =part.getObject() instanceof AbstractTermTreeEditor
+ canExecute =part.getObject() instanceof TermTreeEditor
&& selection!=null
&& selection.size()==1
&& selection.getFirstElement() instanceof TermNodeDto;
import eu.etaxonomy.cdm.model.term.TermTree;
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.AbstractTermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.CreateFeatureTreeOperation;
import eu.etaxonomy.taxeditor.store.StoreUtil;
* @author pplitzner
* @since Jul 12, 2017
*/
-public class CreateFeatureTreeHandler {
+public class CreateTermTreeHandler {
@Execute
public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart thisPart, UISynchronize sync){
- IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+ ITermTreeEditor editor = (ITermTreeEditor) thisPart.getObject();
if (StoreUtil.promptCheckIsDirty(editor)) {
return;
}
- Object[] expandedElements = ((AbstractTermTreeEditor)editor).getViewer().getExpandedElements();
+ Object[] expandedElements = ((TermTreeEditor)editor).getViewer().getExpandedElements();
TermTree<?> newTree = TermTree.NewInstance(editor.getTermType());
newTree.setAllowDuplicates(false);
newTree.setFlat(false);
editor.setDirty();
// AbstractUtility.executeOperation(operation, sync);
editor.addOperation(operation);
- ((AbstractTermTreeEditor)editor).putTree(newDto);
- ((AbstractTermTreeEditor)editor).getViewer().setInput(((AbstractTermTreeEditor)editor).getTrees());
+ ((TermTreeEditor)editor).putTree(newDto);
+ ((TermTreeEditor)editor).getViewer().setInput(((TermTreeEditor)editor).getTrees());
- ((AbstractTermTreeEditor)editor).getViewer().setExpandedElements(expandedElements);
+ ((TermTreeEditor)editor).getViewer().setExpandedElements(expandedElements);
}
@Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
MHandledMenuItem menuItem) {
boolean canExecute = false;
- canExecute = thisPart.getObject() instanceof IFeatureTreeEditor;
+ canExecute = thisPart.getObject() instanceof ITermTreeEditor;
menuItem.setVisible(canExecute);
return canExecute;
}
--- /dev/null
+/**
+* Copyright (C) 2020 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.featuretree.e4.handler;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+import org.eclipse.e4.core.di.annotations.Execute;
+import org.eclipse.e4.ui.model.application.MApplication;
+import org.eclipse.e4.ui.model.application.commands.MParameter;
+import org.eclipse.e4.ui.model.application.ui.basic.MPart;
+import org.eclipse.e4.ui.model.application.ui.basic.MPartStack;
+import org.eclipse.e4.ui.model.application.ui.menu.MHandledMenuItem;
+import org.eclipse.e4.ui.workbench.modeling.EModelService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
+
+import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
+import eu.etaxonomy.taxeditor.workbench.WorkbenchUtility;
+
+/**
+ * @author k.luther
+ * @since Dec 11, 2020
+ */
+public class OpenTermTreeEditorHandler {
+ @Execute
+ public void execute(EPartService partService, MHandledMenuItem menuItem, MApplication application, EModelService modelService) {
+
+ String commandId = menuItem.getCommand().getElementId();
+ List<MParameter> parameters = menuItem.getParameters();
+ TermType termType = null;
+ for (MParameter param: parameters){
+ termType = TermType.getByKey(param.getValue());
+ }
+
+ if(termType != null){
+ TermType type = termType;
+
+ List<MPart> alreadyOpenedEditors = partService.getParts().stream()
+ .filter(part->part.getObject()!=null && part.getObject() instanceof TermTreeEditor)
+ .filter(part->((TermTreeEditor)part.getObject()).getTermType().equals(type))
+ .collect(Collectors.toList());
+ if(!alreadyOpenedEditors.isEmpty()){
+ //there should never be more than one already opened editor
+ //so we just open the first
+ partService.activate(alreadyOpenedEditors.iterator().next());
+ }
+ else{
+ MPart part = partService.createPart(eu.etaxonomy.taxeditor.store.AppModelId.PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_TERMTREE);
+ MPartStack editorAreaPartStack = WorkbenchUtility.getEditorAreaPartStack(application, modelService);
+ if(editorAreaPartStack!=null){
+ editorAreaPartStack.getChildren().add(part);
+ }
+ part = partService.showPart(part, PartState.ACTIVATE);
+ TermTreeEditor termEditor = (TermTreeEditor) part.getObject();
+ termEditor.init(termType, menuItem.getLocalizedLabel());
+ }
+ }
+ }
+
+}
import org.eclipse.jface.viewers.IStructuredSelection;
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.AbstractTermTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
public class PasteFeatureHandler {
@Execute
public void execute(@Named(IServiceConstants.ACTIVE_PART) MPart part,
@Named(IServiceConstants.ACTIVE_SELECTION) IStructuredSelection selection){
- AbstractTermTreeEditor editor = (AbstractTermTreeEditor)part.getObject();
+ TermTreeEditor editor = (TermTreeEditor)part.getObject();
editor.paste(selection);
}
MHandledMenuItem menuItem){
boolean canExecute = false;
ISelection transferSelection = LocalSelectionTransfer.getTransfer().getSelection();
- canExecute = part.getObject() instanceof AbstractTermTreeEditor
+ canExecute = part.getObject() instanceof TermTreeEditor
&& selection!=null
&& selection.size()==1
&& transferSelection instanceof IStructuredSelection
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.AbstractTermTreeEditor;
import eu.etaxonomy.taxeditor.featuretree.e4.ICharacterEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.RemoveFeatureOperation;
import eu.etaxonomy.taxeditor.store.StoreUtil;
* @since Jul 12, 2017
*
*/
-public class RemoveFeatureHandler {
+public class RemoveTermHandler {
@Execute
public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection, UISynchronize sync){
- IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+ ITermTreeEditor editor = (ITermTreeEditor) thisPart.getObject();
// if (StoreUtil.promptCheckIsDirty(editor)) {
// return;
// }
//
// }
- if (editor instanceof AbstractTermTreeEditor){
- Object[] expandedElements = ((AbstractTermTreeEditor)editor).getViewer().getExpandedElements();
- ((AbstractTermTreeEditor)editor).getViewer().setInput(((AbstractTermTreeEditor)editor).getTrees());
- ((AbstractTermTreeEditor)editor).getViewer().setExpandedElements(expandedElements);
+ if (editor instanceof TermTreeEditor){
+ Object[] expandedElements = ((TermTreeEditor)editor).getViewer().getExpandedElements();
+ ((TermTreeEditor)editor).getViewer().setInput(((TermTreeEditor)editor).getTrees());
+ ((TermTreeEditor)editor).getViewer().setExpandedElements(expandedElements);
}else{
((ICharacterEditor)editor).getViewer().setInput(tree);
}
canExecute &= object instanceof TermNodeDto;
}
}
- canExecute &= thisPart.getObject() instanceof IFeatureTreeEditor;
+ canExecute &= thisPart.getObject() instanceof ITermTreeEditor;
menuItem.setVisible(canExecute);
return canExecute;
}
import org.eclipse.jface.viewers.IStructuredSelection;
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.AbstractTermTreeEditor;
-import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.TermTreeEditor;
import eu.etaxonomy.taxeditor.featuretree.e4.operation.RemoveFeatureTreeOperation;
import eu.etaxonomy.taxeditor.store.StoreUtil;
* @since Jul 12, 2017
*
*/
-public class RemoveFeatureTreeHandler {
+public class RemoveTermTreeHandler {
@Execute
public void execute(@Named(IServiceConstants.ACTIVE_PART)MPart thisPart,
@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection, UISynchronize sync){
- IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+ ITermTreeEditor editor = (ITermTreeEditor) thisPart.getObject();
if (StoreUtil.promptCheckIsDirty(editor)) {
return;
for (Object selectedObject : selection.toArray()) {
TermTreeDto featureTree = (TermTreeDto) selectedObject;
- ((AbstractTermTreeEditor)editor).removeTree(featureTree);
- ((AbstractTermTreeEditor)editor).getViewer().setInput(((AbstractTermTreeEditor)editor).getTrees());
+ ((TermTreeEditor)editor).removeTree(featureTree);
+ ((TermTreeEditor)editor).getViewer().setInput(((TermTreeEditor)editor).getTrees());
RemoveFeatureTreeOperation operation = new RemoveFeatureTreeOperation(featureTree.getUuid(), editor, editor);
// AbstractUtility.executeOperation(operation, sync);
editor.addOperation(operation);
canExecute &= object instanceof TermTreeDto;
}
}
- canExecute &= thisPart.getObject() instanceof IFeatureTreeEditor;
+ canExecute &= thisPart.getObject() instanceof ITermTreeEditor;
menuItem.setVisible(canExecute);
return canExecute;
}
import eu.etaxonomy.cdm.io.descriptive.owl.out.StructureTreeOwlExportConfigurator;
import eu.etaxonomy.cdm.model.term.TermTree;
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.StoreUtil;
* @since Jul 12, 2017
*
*/
-public class FeatureTreeExportOntologyHandler {
+public class TermTreeExportOntologyHandler {
@Execute
public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
@Named(IServiceConstants.ACTIVE_PART)MPart thisPart){
- IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+ ITermTreeEditor editor = (ITermTreeEditor) thisPart.getObject();
if(StoreUtil.promptCheckIsDirty(editor)){
return;
import eu.etaxonomy.cdm.io.descriptive.word.out.WordExportConfigurator;
import eu.etaxonomy.cdm.model.term.TermTree;
import eu.etaxonomy.cdm.persistence.dto.TermTreeDto;
-import eu.etaxonomy.taxeditor.featuretree.e4.IFeatureTreeEditor;
+import eu.etaxonomy.taxeditor.featuretree.e4.ITermTreeEditor;
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
* @since Jul 12, 2017
*
*/
-public class FeatureTreeExportWordHandler {
+public class TermTreeExportWordHandler {
@Execute
public void execute(@Named(IServiceConstants.ACTIVE_SHELL) Shell shell,
@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
@Named(IServiceConstants.ACTIVE_PART)MPart thisPart){
- IFeatureTreeEditor editor = (IFeatureTreeEditor) thisPart.getObject();
+ ITermTreeEditor editor = (ITermTreeEditor) thisPart.getObject();
if(StoreUtil.promptCheckIsDirty(editor)){
return;
/**
* @author pplitzner
* @since Apr 30, 2018
- *
*/
public class AddFeatureOperation extends AbstractPostOperation<Feature> {
private UUID featureUuid;
public AddFeatureOperation(UUID featureUuid, TermNodeDto node,
- IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled<Feature> cdmEntitySessionEnabled) {
this(featureUuid, node.getUuid(), 0, postOperationEnabled, cdmEntitySessionEnabled);
}
public AddFeatureOperation(UUID featureUuid, UUID nodeUuid, int position,
- IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled<Feature> cdmEntitySessionEnabled) {
super("Add Feature", StoreUtil.getUndoContext(), null, postOperationEnabled, cdmEntitySessionEnabled);
this.nodeUuid = nodeUuid;
public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
return null;
}
-
-}
+}
\ No newline at end of file
*/
package eu.etaxonomy.taxeditor.featuretree.e4.operation;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
import java.util.UUID;
import org.eclipse.core.commands.ExecutionException;
/**
* @author pplitzner
* @since Apr 30, 2018
- *
*/
public class AddOntologyTermOperation extends AbstractPostOperation<TermNode> {
private TermVocabulary vocabulary;
public AddOntologyTermOperation(OntologyTermWrapper wrapper, UUID targetUuid, TermVocabulary vocabulary,
- IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled<TermNode> cdmEntitySessionEnabled) {
super("Add ontology term", StoreUtil.getUndoContext(), null, postOperationEnabled, cdmEntitySessionEnabled);
this.wrapper = wrapper;
this.targetUuid = targetUuid;
/**
* @author pplitzner
* @since Apr 30, 2018
- *
*/
public class CreateFeatureTreeOperation extends AbstractPostOperation<TermTree>{
public CreateFeatureTreeOperation(TermTree element,
- IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled<TermTree> cdmEntitySessionEnabled) {
super("Create Feature Tree", StoreUtil.getUndoContext(), element, postOperationEnabled, cdmEntitySessionEnabled);
}
public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
return null;
}
-
-}
+}
\ No newline at end of file
import eu.etaxonomy.taxeditor.store.StoreUtil;
/**
- *
* @author pplitzner
* @date 21.01.2019
- *
*/
public class MoveFeatureOperation extends AbstractPostOperation<TermNode>{
private int currentOperation;
private int position;
-// protected IPostOperationEnabled postOperationEnabled;
-
- private ICdmEntitySessionEnabled cdmEntitySessionEnabled;
-
-
public MoveFeatureOperation(UUID droppedNodeUuid, UUID termUuid, UUID targetUuid, int position,
int currentOperation,
- IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled<TermNode> cdmEntitySessionEnabled) {
super(currentOperation == DND.DROP_MOVE ? "Move Feature" : "Copy Feature",StoreUtil.getUndoContext(),null, postOperationEnabled, cdmEntitySessionEnabled);
this.droppedNodeUuid = droppedNodeUuid;
this.targetUuid = targetUuid;
* This class is a utility class for updating the editor from a p2 update site,
* greatly inspired by the links given below.
*
- *
* To Do :
* - Allow configurable update sites
*
* Notes :
*
- *
* @see http://wiki.eclipse.org/Equinox/p2/Adding_Self-Update_to_an_RCP_Application
* @see http://bugs.eclipse.org/281226
* @see http://www.vogella.com/tutorials/EclipseP2Update/article.html
}
public static String getP2UpdateRepositoryName(){
- return ApplicationUtil.isStable()?EDIT_STABLE_UPDATE_SITE_NAME:EDIT_NIGHTLY_UPDATE_SITE_NAME;
+ return ApplicationUtil.isStable()? EDIT_STABLE_UPDATE_SITE_NAME : EDIT_NIGHTLY_UPDATE_SITE_NAME;
}
public static URI getP2UpdateRepository(){
try {
- return ApplicationUtil.isStable()?new URI(EDIT_STABLE_UPDATE_SITE):new URI(EDIT_NIGHTLY_UPDATE_SITE);
+ return ApplicationUtil.isStable()? new URI(EDIT_STABLE_UPDATE_SITE) : new URI(EDIT_NIGHTLY_UPDATE_SITE);
} catch (URISyntaxException e) {
MessagingUtils.error(P2Util.class, e);
}
super.done(event);
}
});
-
}
private void showMessage(final Shell parent, final UISynchronize sync) {
import org.eclipse.swt.widgets.Text;
/**
- *
* @author pplitzner
* @since Oct 5, 2017
- *
*/
public class ImportFromFileDataSourceWithReferenceWizardPage extends ImportFromFileDataSourceWizardPage {
super();
}
- /** {@inheritDoc} */
@Override
public void createControl(Composite parent) {
super.createControl(parent);
public void setTextReferenceString(Text textReferenceString) {
this.textReferenceString = textReferenceString;
}
-
-}
+}
\ No newline at end of file
* 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.io.e4.in;
import java.io.File;
-import java.net.URI;
import javax.inject.Inject;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.common.CdmUtils;
/**
- *
* @author pplitzner
* @since Oct 5, 2017
- *
*/
public class ImportFromFileDataSourceWizardPage extends WizardPage {
this.extensions = extensions;
}
- /** {@inheritDoc} */
@Override
public void createControl(Composite parent) {
composite = new Composite(parent, SWT.NULL);
setPageComplete(isPageComplete());
}
}
-
});
-
setControl(composite);
}
}
public URI getUri() {
- return getFile().toURI();
+ return URI.fromFile(getFile());
}
@Override
public boolean isPageComplete() {
return CdmUtils.isNotBlank(text_source.getText());
}
-
-}
+}
\ No newline at end of file
* 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.io.e4.in.abcd;
-import java.io.File;
-import java.net.URI;
-
import javax.inject.Inject;
import org.eclipse.e4.core.contexts.ContextInjectionFactory;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- *
* @author pplitzner
* @since Oct 5, 2017
- *
*/
public class AbcdImportWizardE4 extends AbstractImportWizardE4<Abcd206ImportConfigurator> {
super(context, partService);
}
- /** {@inheritDoc} */
@Override
public Abcd206ImportConfigurator getConfigurator() {
return configurator;
}
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
configurator.setClassificationUuid(classificationChooserWizardPage.getClassification().getUuid());
}
- CdmStore.getImportManager().runMoniteredOperation(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM);
+ CdmStore.getImportManager().runMoniteredOperation(configurator, source.toFile(), SOURCE_TYPE.INPUTSTREAM);
return true;
-
}
- /** {@inheritDoc} */
@Override
public void init() {
configurator = PreferencesUtil.getLocalAbcdImportConfigurator(false);
addPage(configuratorWizardPage);
}
- /** {@inheritDoc} */
@Override
public void addPages() {
addPage(dataSourcePage);
addConfiguratorPage();
//super.addPages();
-
}
-}
+}
\ No newline at end of file
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.distribution.excelupdate.ExcelDistributionUpdateConfigurator;
import eu.etaxonomy.taxeditor.io.e4.in.AbstractImportWizardE4;
/**
* @author k.luther
* @date 03.05.2017
- *
*/
public class ExcelDistributionUpdateWizardE4 extends AbstractImportWizardE4<ExcelDistributionUpdateConfigurator> {
super(context, partService);
}
- /** {@inheritDoc} */
@Override
public ExcelDistributionUpdateConfigurator getConfigurator() {
return configurator;
}
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
// configurator.setSource(source);
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
- File file = new File(source);
+ File file = new File(source.getJavaUri());
FileInputStream fis = null;
try {
return true;
}
- /** {@inheritDoc} */
@Override
public void init() {
configurator = CdmStore.getImportManager().ExcelDistributionUpdateConfigurator();
}
- /** {@inheritDoc} */
@Override
public void addPages() {
addDataSourcePage();
dataSourcePage = ContextInjectionFactory.make(ImportFromFileAndChooseVocIdWizardPageE4.class, context);
addPage(dataSourcePage);
}
-
-
-}
+}
\ No newline at end of file
*/
package eu.etaxonomy.taxeditor.io.e4.in.excel.specimen;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
import java.util.ArrayList;
import java.util.List;
* 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.io.e4.in.excel.taxa;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
import java.util.ArrayList;
import java.util.List;
/**
- *
* @author pplitzner
* @since Oct 5, 2017
- *
*/
public class ExcelNormalExplicitTaxaImportWizardE4 extends AbstractImportWizardE4<NormalExplicitImportConfigurator>{
super(context, partService, selection);
}
- /** {@inheritDoc} */
@Override
public NormalExplicitImportConfigurator getConfigurator() {
return configurator;
}
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
configurator.setSource(source);
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
configurator.setSourceReferenceTitle(dataSourcePage.getTextReferenceString().getText());
- File file = new File(source);
+ File file = new File(source.getJavaUri());
FileInputStream fis = null;
try {
return true;
}
- /** {@inheritDoc} */
@Override
public void init() {
configurator = CdmStore.getImportManager().NormalExplicitConfigurator();
}
}
- /** {@inheritDoc} */
@Override
public void addPages() {
dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWithReferenceWizardPage.class, context);
dataSourcePage.setDescription("Please choose an xls file in the NormalExplicit format.");
dataSourcePage.setExtensions(new String[]{"*.xlsx", "*.xls", "*.*"});
addPage(dataSourcePage);
- super.addPages();
-
+ super.addPages();
}
- @Override
- protected void addConfiguratorPage(){
+
+ @Override
+ protected void addConfiguratorPage(){
List<String> ignoreMethods = new ArrayList<>();
ignoreMethods.add("setIgnoreNull");
ignoreMethods.add("setInteractWithUser");
pageConfiguration.initImport(getConfigurator(), ignoreMethods, Messages.ExcelTaxonUpdateWizard_ConfiguratorWizard_label);
addPage(pageConfiguration);
}
-}
+}
\ No newline at end of file
* 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.io.e4.in.owl;
import java.io.File;
-import java.net.URI;
import javax.inject.Inject;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
import eu.etaxonomy.cdm.io.descriptive.owl.in.StructureTreeOwlImportConfigurator;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- *
* @author pplitzner
* @since Apr 25, 2019
- *
*/
public class OwlImportWizard extends AbstractImportWizardE4<StructureTreeOwlImportConfigurator> {
reference.setTitle("StructureTree import from "+source);
configurator.setSourceReference(reference);
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
- Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.URI);
+ Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source.getJavaUri()), SOURCE_TYPE.URI);
CdmStore.getImportManager().run(job);
return true;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
import java.util.ArrayList;
import java.util.List;
/**
* @author k.luther
* @date 12.05.2017
- *
*/
public class RISImportWizardE4 extends AbstractImportWizardE4<RisReferenceImportConfigurator>{
super(context, partService);
}
- /** {@inheritDoc} */
@Override
public RisReferenceImportConfigurator getConfigurator() {
return configurator;
}
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
- File file = new File(source);
+ File file = new File(source.getJavaUri());
FileInputStream fis;
try {
return true;
}
- /** {@inheritDoc} */
@Override
public void init() {
configurator = RisReferenceImportConfigurator.NewInstance();
}
- /** {@inheritDoc} */
@Override
public void addPages() {
addDataSourcePage();
package eu.etaxonomy.taxeditor.io.e4.in.sdd;
import java.io.File;
-import java.net.URI;
import javax.inject.Inject;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
import eu.etaxonomy.cdm.io.sdd.in.SDDImportConfigurator;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- *
* @author pplitzner
* @since Oct 5, 2017
- *
*/
public class SddImportWizardE4 extends AbstractImportWizardE4<SDDImportConfigurator> {
-
private SDDImportConfigurator configurator;
private ImportFromFileDataSourceWithReferenceWizardPage dataSourcePage;
super(context, partService);
}
- /** {@inheritDoc} */
@Override
public SDDImportConfigurator getConfigurator() {
return configurator;
super.addPages();
}
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
configurator.setSource(source);
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
- Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.URI);
+ Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source.getJavaUri()), SOURCE_TYPE.URI);
CdmStore.getImportManager().run(job);
return true;
}
- /** {@inheritDoc} */
@Override
public void init() {
configurator = CdmStore.getImportManager().SddConfigurator();
}
-}
+}
\ No newline at end of file
* 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.io.e4.in.tcs;
import java.io.File;
-import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.e4.core.contexts.IEclipseContext;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
import eu.etaxonomy.cdm.io.tcsxml.in.TcsXmlImportConfigurator;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- *
* @author pplitzner
* @since Oct 5, 2017
- *
*/
public class TcsImportWizardE4 extends AbstractImportWizardE4<TcsXmlImportConfigurator> {
-
private TcsXmlImportConfigurator configurator;
private ImportFromFileDataSourceWithReferenceWizardPage dataSourcePage;
super(context, partService);
}
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
configurator.setSource(source);
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
- Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.URI);
+ Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source.getJavaUri()), SOURCE_TYPE.URI);
CdmStore.getImportManager().run(job);
return true;
}
- /** {@inheritDoc} */
@Override
public void init() {
configurator = CdmStore.getImportManager().TcsConfigurator();
}
- /** {@inheritDoc} */
@Override
public TcsXmlImportConfigurator getConfigurator() {
return configurator;
addPage(pageConfiguration);
}
-
-
- /** {@inheritDoc} */
@Override
public void addPages() {
dataSourcePage = ContextInjectionFactory.make(ImportFromFileDataSourceWithReferenceWizardPage.class, context);
addPage(dataSourcePage);
super.addPages();
}
-}
+}
\ No newline at end of file
import eu.etaxonomy.taxeditor.editor.definedterm.FeatureTreeViewerComparator;
import eu.etaxonomy.taxeditor.editor.definedterm.RootElementsOnlyTreeContentProvider;
import eu.etaxonomy.taxeditor.editor.definedterm.TermDtoLabelProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
import eu.etaxonomy.taxeditor.model.ImageResources;
import eu.etaxonomy.taxeditor.preference.wizard.CheckBoxTreeComposite;
selectVocabularyComposite.getViewer().setComparator(new DefinedTermSorter());
selectVocabularyComposite.setLayoutData(layoutData);
- selectFeatureTreeComposite = new CheckBoxTreeComposite(this, new RootElementsOnlyTreeContentProvider(), new FeatureTreeLabelProvider(), SWT.NONE);
+ selectFeatureTreeComposite = new CheckBoxTreeComposite(this, new RootElementsOnlyTreeContentProvider(), new TermTreeLabelProvider(), SWT.NONE);
selectFeatureTreeComposite.setAllowTopLevelSelection(true);
selectFeatureTreeComposite.getViewer().setComparator(new FeatureTreeViewerComparator());
selectFeatureTreeComposite.setLayoutData(layoutData);
* 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.io.wizard;
-import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.swt.widgets.Text;
import org.eclipse.wb.swt.ResourceManager;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.api.service.IReferenceService;
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory;
/**
- *
* @author pplitzner
- *
*/
public class AbcdImportConfiguratorWizardPage extends AbstractPreferenceWizard implements SelectionListener {
"Tooltips will explain parameters in more detail", configurator, true, false);
}
-
-
- /** {@inheritDoc} */
@Override
public void createControl(Composite parent) {
Composite composite = new Composite(parent, SWT.NULL);
}
});
-
-
Button checkBoxMoveToDefaultClassification = new Button(composite, SWT.CHECK);
gridData = new GridData();
gridData.horizontalAlignment = GridData.FILL_HORIZONTAL;
abcdImportConfigurator.setDnaSoure(null);
}
}
-
-
}
- public void saveConfigToPrefernceStore() {
+ public void saveConfigToPrefernceStore() {
try{
abcdImportConfigurator.setDnaSoure(URI.create(textDNAProviderString.getText()));
}catch(IllegalArgumentException e){
abcdImportConfigurator.setDnaSoure(null);
}
-
PreferencesUtil.setStringValue(IPreferenceKeys.LAST_USED_ABCD_CONFIG, abcdImportConfigurator.toString());
-
-
}
public String createConfigString(){
}
-
-
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
- */
@Override
public void widgetDefaultSelected(SelectionEvent e) {
// TODO Auto-generated method stub
-
}
public void createAbcdImportConfig() {
this.abcdImportConfigurator = PreferencesUtil.getLocalAbcdImportConfigurator(false);
-
}
}
package eu.etaxonomy.taxeditor.io.wizard;
-import java.io.File;
-import java.net.URI;
-
import org.apache.commons.lang3.StringUtils;
import org.apache.log4j.Logger;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
private AbcdSourceSelectionPage dataSourcePage;
private ClassificationChooserWizardPage classificationChooserWizardPage;
- /** {@inheritDoc} */
@Override
public Abcd206ImportConfigurator getConfigurator() {
return configurator;
}
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
configurator.setClassificationUuid(classificationChooserWizardPage.getClassification().getUuid());
}
- CdmStore.getImportManager().runMoniteredOperation(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM);
+ CdmStore.getImportManager().runMoniteredOperation(configurator, source.toFile(), SOURCE_TYPE.INPUTSTREAM);
return true;
-
}
@Override
addPage(configuratorWizardPage);
}
- /** {@inheritDoc} */
@Override
public void addPages() {
super.addPages();
addPage(classificationChooserWizardPage);
addPage(dataSourcePage);
}
-}
+}
\ No newline at end of file
*/
package eu.etaxonomy.taxeditor.io.wizard;
-import java.net.URI;
-
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.widgets.Text;
+import eu.etaxonomy.cdm.common.URI;
+
/**
* @author k.luther
* @date 29.03.2016
- *
*/
public abstract class AbcdSourceSelectionPage extends WizardPage {
*/
protected AbcdSourceSelectionPage(String pageName) {
super(pageName);
-
}
public abstract URI getUri();
-
-
-
-
-
-
-
-}
+}
\ No newline at end of file
import org.eclipse.ui.IImportWizard;
import org.eclipse.ui.IWorkbench;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.io.reference.endnote.in.EndnoteImportConfigurator;
import eu.etaxonomy.taxeditor.store.CdmStore;
*
* @author n.hoffmann
* @created Sep 18, 2009
- * @version 1.0
*/
public class EndnoteImportWizard extends AbstractImportWizard<EndnoteImportConfigurator> implements IImportWizard {
private ImportFromFileDataSourceWizardPage dataSourcePage;
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
File file = dataSourcePage.getFile();
- configurator.setSource(file.toURI());
+ configurator.setSource(URI.fromFile(file));
CdmStore.getImportManager().run(configurator);
return true;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#addPages()
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
super.addPages();
addPage(dataSourcePage);
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
- /** {@inheritDoc} */
public void init(IWorkbench workbench, IStructuredSelection selection) {
super.init(workbench, selection);
configurator = CdmStore.getImportManager().EndnoteConfigurator();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#getConfigurator()
- */
- /** {@inheritDoc} */
@Override
public EndnoteImportConfigurator getConfigurator() {
return configurator;
}
-}
+}
\ No newline at end of file
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.distribution.excelupdate.ExcelDistributionUpdateConfigurator;
import eu.etaxonomy.taxeditor.l10n.Messages;
/**
* @author k.luther
* @date 03.05.2017
- *
*/
public class ExcelDistributionUpdateWizard extends AbstractImportWizard<ExcelDistributionUpdateConfigurator> {
private ExcelDistributionUpdateConfigurator configurator;
- private ImportFromFileAndChooseVocIdWizardPage dataSourcePage;
-
private static final Logger logger = Logger.getLogger(ExcelDistributionUpdateWizard.class);
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#getConfigurator()
- */
- /** {@inheritDoc} */
+ private ImportFromFileAndChooseVocIdWizardPage dataSourcePage;
+
@Override
public ExcelDistributionUpdateConfigurator getConfigurator() {
return configurator;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
// configurator.setSource(source);
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
- File file = new File(source);
+ File file = source.toFile();
FileInputStream fis = null;
try {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
- /** {@inheritDoc} */
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
super.init(workbench, selection);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#addPages()
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
addConfiguratorPage();
addDataSourcePage();
-
-
}
+
@Override
protected void addConfiguratorPage(){
List<String> ignoreMethods = new ArrayList<>();
"Please choose an xls file in the Distribution Update format.", new String[]{"*.xlsx", "*.xls", "*.*"});
addPage(dataSourcePage);
}
-
-
-}
+}
\ No newline at end of file
* 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.io.wizard;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.URI;
import org.apache.commons.io.IOUtils;
import org.apache.log4j.Logger;
import org.eclipse.jface.viewers.TreeSelection;
import org.eclipse.ui.IWorkbench;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
import eu.etaxonomy.cdm.io.excel.taxa.NormalExplicitImportConfigurator;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.taxeditor.store.CdmStore;
-
/**
* <p>ExcelNormalExplicitTaxaImportWizard class.</p>
*
* @author n.hoffmann
* @created Sep 22, 2009
- * @version 1.0
*/
public class ExcelNormalExplicitTaxaImportWizard extends AbstractImportWizard<NormalExplicitImportConfigurator>{
private ImportFromFileDataSourceWizardPage dataSourcePage;
private static final Logger logger = Logger.getLogger(ExcelNormalExplicitTaxaImportWizard.class);
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#getConfigurator()
- */
- /** {@inheritDoc} */
@Override
public NormalExplicitImportConfigurator getConfigurator() {
return configurator;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
configurator.setSource(source);
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
configurator.setSourceReferenceTitle(dataSourcePage.getTextReferenceString().getText());
- File file = new File(source);
+ File file = new File(source.getJavaUri());
FileInputStream fis = null;
try {
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
- /** {@inheritDoc} */
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
super.init(workbench, selection);
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#addPages()
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
super.addPages();
"Please choose an xls file in the NormalExplicit format.", new String[]{"*.xlsx", "*.xls", "*.*"});
addPage(dataSourcePage);
}
-}
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.io.wizard;
import java.io.File;
-import java.net.URI;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.SelectionAdapter;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.common.CdmUtils;
/**
- *
* @author n.hoffmann
* @created 04.08.2009
- * @version 1.0
*/
public class ImportFromFileDataSourceWizardPage extends AbcdSourceSelectionPage {
this.textReferenceString = textReferenceString;
}
-
@Override
public URI getUri() {
- return getFile().toURI();
+ return URI.fromFile(getFile());
}
@Override
public boolean isPageComplete() {
return CdmUtils.isNotBlank(text_source.getText());
}
-
-}
+}
\ No newline at end of file
* 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.io.wizard;
import java.io.File;
-import java.net.URI;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.IStructuredSelection;
*
* @author n.hoffmann
* @created 15.06.2009
- * @version 1.0
*/
public class JaxbExportWizard extends AbstractExportWizard<JaxbExportConfigurator> {
private JaxbExportConfigurator configurator;
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
- /** {@inheritDoc} */
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
this.setWindowTitle("JAXB Export");
this.configurator = CdmStore.getExportManager().JaxbConfigurator();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
boolean performFinish = false;
return performFinish;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
super.addPages();
addPage(page);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.AbstractExportWizard#getConfigurator()
- */
- /** {@inheritDoc} */
@Override
public JaxbExportConfigurator getConfigurator() {
return configurator;
}
-
-
-}
+}
\ No newline at end of file
* 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.io.wizard;
-import java.net.URI;
-
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.jaxb.JaxbImportConfigurator;
import eu.etaxonomy.taxeditor.store.CdmStore;
*
* @author n.hoffmann
* @created 15.06.2009
- * @version 1.0
*/
public class JaxbImportWizard extends AbstractImportWizard<JaxbImportConfigurator> {
private ImportFromFileDataSourceWizardPage dataSourcePage;
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#getConfigurator()
- */
- /** {@inheritDoc} */
@Override
public JaxbImportConfigurator getConfigurator() {
return configurator;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
- /** {@inheritDoc} */
public void init(IWorkbench workbench, IStructuredSelection selection) {
super.init(workbench, selection);
configurator = CdmStore.getImportManager().JaxbConfigurator();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#addPages()
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
super.addPages();
"Please choose an XML file in the cdm JAXB format.", new String[]{"*.xml"});
addPage(dataSourcePage);
}
-}
+}
\ No newline at end of file
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
-import java.net.URI;
import java.util.ArrayList;
import java.util.List;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
import eu.etaxonomy.cdm.io.reference.ris.in.RisReferenceImportConfigurator;
/**
* @author k.luther
* @date 12.05.2017
- *
*/
public class RISImportWizard extends AbstractImportWizard<RisReferenceImportConfigurator>{
private RisReferenceImportConfigurator configurator;
private static final Logger logger = Logger.getLogger(ExcelDistributionUpdateWizard.class);
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#getConfigurator()
- */
- /** {@inheritDoc} */
@Override
public RisReferenceImportConfigurator getConfigurator() {
return configurator;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
// e1.printStackTrace();
// }
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
- File file = new File(source);
+ File file = source.toFile();
FileInputStream fis;
try {
//CdmStore.getImportManager().runMoniteredOperation(configurator, new File(source), SOURCE_TYPE.INPUTSTREAM);
-
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
- /** {@inheritDoc} */
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
super.init(workbench, selection);
configurator = RisReferenceImportConfigurator.NewInstance();
-
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#addPages()
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
//addConfiguratorPage();
addDataSourcePage();
-
-
}
+
@Override
protected void addConfiguratorPage(){
List<String> ignoreMethods = new ArrayList<>();
"Please choose an xls file in the Distribution Update format.", new String[]{"*.txt"});
addPage(dataSourcePage);
}
-
-}
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.io.wizard;
import java.io.File;
-import java.net.URI;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
import eu.etaxonomy.cdm.io.sdd.in.SDDImportConfigurator;
*
* @author n.hoffmann
* @created Jun 16, 2010
- * @version 1.0
*/
public class SddImportWizard extends AbstractImportWizard<SDDImportConfigurator> {
private ImportFromFileDataSourceWizardPage dataSourcePage;
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#getConfigurator()
- */
- /** {@inheritDoc} */
@Override
public SDDImportConfigurator getConfigurator() {
return configurator;
}
- /*
- * (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPage(org.eclipse.jface.wizard.IWizardPage)
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
super.addPages();
addPage(dataSourcePage);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
configurator.setSource(source);
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
- Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.URI);
+ Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source.getJavaUri()), SOURCE_TYPE.URI);
CdmStore.getImportManager().run(job);
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
- /** {@inheritDoc} */
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
super.init(workbench, selection);
configurator = CdmStore.getImportManager().SddConfigurator();
}
-}
+}
\ No newline at end of file
/**
- *
+ * 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.io.wizard;
-import java.net.URI;
-
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.specimen.excel.in.SpecimenCdmExcelImportConfigurator;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
* @author n.hoffmann
- *
*/
public class SpecimenCdmExcelImportWizard extends AbstractImportWizard<SpecimenCdmExcelImportConfigurator> {
private ImportFromFileDataSourceWizardPage dataSourcePage;
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#getConfigurator()
- */
@Override
public SpecimenCdmExcelImportConfigurator getConfigurator() {
return configurator;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
- /** {@inheritDoc} */
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
super.init(workbench, selection);
configurator = CdmStore.getImportManager().SpecimenCdmExcelImportConfigurator();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
return true;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.wizard.AbstractImportWizard#addPages()
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
super.addPages();
"Please choose an xls file in the SpecimenCdmExcel format.", new String[]{"*.xlsx", "*.xls", "*.*"});
addPage(dataSourcePage);
}
-
-}
+}
\ No newline at end of file
* 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.io.wizard;
import java.io.File;
*
* @author n.hoffmann
* @created 15.06.2009
- * @version 1.0
*/
public class TcsExportWizard extends
AbstractExportWizard<TcsXmlExportConfigurator> {
package eu.etaxonomy.taxeditor.io.wizard;
-import java.io.File;
-import java.net.URI;
-
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IWorkbench;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.database.DbSchemaValidation;
import eu.etaxonomy.cdm.io.common.IImportConfigurator.SOURCE_TYPE;
import eu.etaxonomy.cdm.io.tcsxml.in.TcsXmlImportConfigurator;
*
* @author n.hoffmann
* @created 15.06.2009
- * @version 1.0
*/
public class TcsImportWizard extends AbstractImportWizard<TcsXmlImportConfigurator> {
private ImportFromFileDataSourceWizardPage dataSourcePage;
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
URI source = dataSourcePage.getUri();
configurator.setSource(source);
configurator.setDbSchemaValidation(DbSchemaValidation.CREATE);
- Job job = CdmStore.getImportManager().createIOServiceJob(configurator, new File(source), SOURCE_TYPE.URI);
+ Job job = CdmStore.getImportManager().createIOServiceJob(configurator, source.toFile(), SOURCE_TYPE.URI);
CdmStore.getImportManager().run(job);
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IWorkbenchWizard#init(org.eclipse.ui.IWorkbench, org.eclipse.jface.viewers.IStructuredSelection)
- */
- /** {@inheritDoc} */
@Override
public void init(IWorkbench workbench, IStructuredSelection selection) {
super.init(workbench, selection);
configurator = CdmStore.getImportManager().TcsConfigurator();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#getConfigurator()
- */
- /** {@inheritDoc} */
@Override
public TcsXmlImportConfigurator getConfigurator() {
return configurator;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.io.AbstractImportWizard#addPages()
- */
- /** {@inheritDoc} */
@Override
public void addPages() {
super.addPages();
public static String FeatureTreeDropAdapter_ONLY_MOVE_FEATURES;
public static String FeatureTreeDropAdapter_ORDER_VOC_NOT_POSSIBLE;
- public static String FeatureTreeEditorComposite_ADD_FEATURE;
- public static String FeatureTreeEditorComposite_FEATURE_TREE;
- public static String FeatureTreeEditorComposite_OPEN_TREE;
- public static String FeatureTreeEditorComposite_REMOVE_FEATURE;
+ public static String TermTreeEditorComposite_ADD_FEATURE;
+ public static String TermTreeEditorComposite_FEATURE_TREE;
+ public static String TermTreeEditorComposite_OPEN_TREE;
+ public static String TermTreeEditorComposite_REMOVE_FEATURE;
public static String FeatureTreeSelectionDialog_CHOOSE_TREE;
public static String FeatureTreeSelectionDialog_ENTER_LABEL;
public static String CdmLightPreference_distributionString_tooltip;
public static String SecundumPreference_description;
+ public static String Tree;
TaxonSearchPreferences_0=Open search results in separate windows
TCSImportWizard_ConfiguratorWizard_label=Configure the TCS import
FeatureMenuPreferences_display=Choose available features
-FeatureTreeEditorComposite_ADD_FEATURE=Add a term to this term tree.
-FeatureTreeEditorComposite_FEATURE_TREE=Term Tree
-FeatureTreeEditorComposite_OPEN_TREE=Open Tree
-FeatureTreeEditorComposite_REMOVE_FEATURE=Remove a term from this term tree.
+TermTreeEditorComposite_ADD_FEATURE=Add a term to this term tree.
+TermTreeEditorComposite_FEATURE_TREE=Term Tree
+TermTreeEditorComposite_OPEN_TREE=Open Tree
+TermTreeEditorComposite_REMOVE_FEATURE=Remove a term from this term tree.
FeatureTreeSelectionDialog_CHOOSE_TREE=Choose a term tree
FeatureTreeSelectionDialog_ENTER_LABEL=Enter label for term tree
FeatureTreeSelectionDialog_NEW_TREE=New Term tree
CdmLightPreference_distributionString=Export of condensed distribution string
CdmLightPreference_distributionString_tooltip=Distributions of a taxon are exported as condensed string, created by the selected algorithm.
-SecundumPreference_description=Default settings of secundum reference handling for move synonym to accepted taxon.
\ No newline at end of file
+SecundumPreference_description=Default settings of secundum reference handling for move synonym to accepted taxon.
+Tree= Tree
\ No newline at end of file
TaxonSearchPreferences_0=Öffne Suchergebnisse in eigenem Fenster
TCSImportWizard_ConfiguratorWizard_label=Konfiguration des TCS Imports
FeatureMenuPreferences_display=Auswahl der zur Verf\u00FCgung stehenden Features
-FeatureTreeEditorComposite_ADD_FEATURE=Term zum Termbaum hinzufügen
-FeatureTreeEditorComposite_FEATURE_TREE=Termbaum
-FeatureTreeEditorComposite_OPEN_TREE=Termbaum öffnen
-FeatureTreeEditorComposite_REMOVE_FEATURE=Term vom Termbaum entfernen
+TermTreeEditorComposite_ADD_FEATURE=Term zum Termbaum hinzufügen
+TermTreeEditorComposite_FEATURE_TREE=Termbaum
+TermTreeEditorComposite_OPEN_TREE=Termbaum öffnen
+TermTreeEditorComposite_REMOVE_FEATURE=Term vom Termbaum entfernen
FeatureTreeSelectionDialog_CHOOSE_TREE=Termbaum auswählen
FeatureTreeSelectionDialog_ENTER_LABEL=Namen für Termbaum eingeben
FeatureTreeSelectionDialog_NEW_TREE=Neuer Termbaum
CdmLightPreference_distributionString=Export eines Condensed Distribution Strings
CdmLightPreference_distributionString_tooltip=Für jedes Taxon wird aus den Verbreitungsdaten ein kompakter String exportiert, der entsprechend dem ausgewählten Algorithmus erzeugt wird.
-SecundumPreference_description=Default Einstellungen für das Setzen der Secundum Referenz beim Verschieben eines Synonyms zu einem akzeptierten Taxon.
\ No newline at end of file
+SecundumPreference_description=Default Einstellungen für das Setzen der Secundum Referenz beim Verschieben eines Synonyms zu einem akzeptierten Taxon.
+Tree=-Baum
\ No newline at end of file
* 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.model;
import java.io.BufferedWriter;
import eu.etaxonomy.cdm.io.common.ExportResult;
import eu.etaxonomy.cdm.io.common.ExportResultType;
import eu.etaxonomy.cdm.io.common.ExportType;
-import eu.etaxonomy.cdm.io.common.ImportResult;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
/**
- *
* @author n.hoffmann
* @created 11.05.2009
- * @version 1.0
*/
public abstract class AbstractUtility {
return TaxeditorStorePlugin.getDefault().getWorkbench();
}
+ @SuppressWarnings("unchecked")
public static Object getService(Class api) {
return TaxeditorStorePlugin.getDefault().getWorkbench().getService(api);
}
feedbackGenerator,
subMonitor);
} catch (Exception ex) {
- return new Status(Status.ERROR, TaxeditorStorePlugin.PLUGIN_ID, "Operation Interrupted", ex);
+ return new Status(IStatus.ERROR, TaxeditorStorePlugin.PLUGIN_ID, "Operation Interrupted", ex);
}
createExportResult(label, urlString, createZip, remotingMonitor);
}
Job job = new Job(label) {
-
-
@Override
public IStatus run(IProgressMonitor monitor) {
// run the monitor until the operation is finished
feedbackGenerator,
subMonitor);
} catch (Exception ex) {
- return new Status(Status.ERROR, TaxeditorStorePlugin.PLUGIN_ID, "Operation Interrupted", ex);
+ return new Status(IStatus.ERROR, TaxeditorStorePlugin.PLUGIN_ID, "Operation Interrupted", ex);
}
-
// collect reports
// for(String report : remotingMonitor.getResult()) {
createResult(label, showResult, remotingMonitor);
return Status.OK_STATUS;
}
-
-
-
-
-
-
private void refreshNavigator() {
EventUtility.postEvent(WorkbenchEventConstants.REFRESH_NAVIGATOR, true);
-
}
-
-
@Override
protected void canceling() {
CdmStore.getCurrentApplicationConfiguration().getProgressMonitorService().cancel(uuid);
}
return Status.OK_STATUS;
- }
+ }
private static Set<Taxon> getTaxaToUpdate(IRemotingProgressMonitor remotingMonitor) {
Set<Taxon> taxaToUpdate = new HashSet<>();
if (object instanceof Taxon){
taxon = HibernateProxyHelper.deproxy(object, Taxon.class);
-
-
}else if (object instanceof Synonym){
Synonym syn = HibernateProxyHelper.deproxy(object, Synonym.class);
taxon = syn.getAcceptedTaxon();
taxaToUpdate.add(taxon);
}
}
- }else if (remotingMonitor.getResult() instanceof ImportResult){
- Map<String, Integer> result = ((ImportResult)remotingMonitor.getResult()).getUpdatedRecords();
- for (Map.Entry<String, Integer> object: result.entrySet()){
- Taxon taxon = null;
- if (object instanceof Taxon){
- taxon = HibernateProxyHelper.deproxy(object, Taxon.class);
- }else if (object instanceof Synonym){
- Synonym syn = HibernateProxyHelper.deproxy(object, Synonym.class);
- taxon = syn.getAcceptedTaxon();
- }
- taxaToUpdate.add(taxon);
- }
-
}
return taxaToUpdate;
}
reportSb.append(o);
}
}
-// }
if(showResult && !StringUtils.isBlank(reportSb.toString()) && reportSb.length() != 0) {
Display.getDefault().asyncExec(new Runnable() {
@Override
}
if (urlString != null){
- ExportDataWrapper data = result.getExportData();
+ ExportDataWrapper<?> data = result.getExportData();
try{
if (result.getExportData().getType().equals(ExportResultType.BYTE_ARRAY)){
byte[] exportData = (byte[])data.getExportData();
}
}
}
-
-
-}
+}
\ No newline at end of file
* 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.model;
import org.eclipse.jface.resource.ColorRegistry;
import eu.etaxonomy.taxeditor.preference.Resources;
/**
- *
* @author pplitzner
* @since Nov 1, 2017
- *
*/
public class ColorResources {
registerColor(registry, Resources.COLOR_CONTROL_BACKGROUND, 220, 220, 220);
registerColor(registry, Resources.COLOR_CONTROL_SELECTED, 210, 210, 210);
registerColor(registry, Resources.COLOR_CONTROL_SELECTED_FOCUS, 232,242,254);
- registerColor(registry, Resources.COLOR_COMPOSITE_IRRELEVANT, 241,139,18);
- registerColor(registry, Resources.SEARCH_VIEW_FOREGROUND, 192, 192, 192);
+
+ //colors1 and 2 are computed as next neutral color from the combined color
+ //light colors are computed as second last color tints
+ //see https://htmlcolorcodes.com/color-picker/
+ registerColor(registry, Resources.COLOR_COMPOSITE_IRRELEVANT1, 241,146,18);
+ registerColor(registry, Resources.COLOR_COMPOSITE_IRRELEVANT1_LIGHT, 251, 228, 196);
+ registerColor(registry, Resources.COLOR_COMPOSITE_IRRELEVANT2, 241, 202, 18);
+ registerColor(registry, Resources.COLOR_COMPOSITE_IRRELEVANT2_LIGHT, 251, 242, 196);
+ registerColor(registry, Resources.COLOR_COMPOSITE_IRRELEVANT1_2, 241, 90, 18);
+ registerColor(registry, Resources.COLOR_COMPOSITE_IRRELEVANT1_2_LIGHT, 251, 214, 196);
+
+ registerColor(registry, Resources.SEARCH_VIEW_FOREGROUND, 192, 192, 192);
registerColor(registry, Resources.SEARCH_VIEW_FOCUS, 0, 0, 0);
registerColor(registry, Resources.BLACK, 0, 0, 0);
registerColor(registry, Resources.COLOR_LIST_BACKGROUND, 150,150,150);
* 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.model;
import java.lang.reflect.InvocationTargetException;
import eu.etaxonomy.cdm.model.name.HybridRelationship;
import eu.etaxonomy.cdm.model.name.NameRelationship;
import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
+import eu.etaxonomy.cdm.model.name.NomenclaturalSource;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.name.TextualTypeDesignation;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- * <p>DescriptionHelper class.</p>
+ * DescriptionHelper class.
*
* @author p.ciardelli
* @author n.hoffmann
String resultString = null;
if (element instanceof IdentifiableEntity) {
try{
- resultString = ((IdentifiableEntity) element).getTitleCache();
+ resultString = ((IdentifiableEntity<?>) element).getTitleCache();
}catch(LazyInitializationException e){
String result = "No Session to initialize title cache for IdentifiableEntity";
MessagingUtils.error(DescriptionHelper.class, result, e);
OriginalSourceBase<?> originalSource = (OriginalSourceBase<?>) element;
// ISourceable sourcedObject = originalSource.getSourcedObj();
//due to #5743 the bidirectionality for sourced object had to be removed
+
String sourceObjectTitle = "sourced object data not available (#5743)";
-// if(sourcedObject instanceof IIdentifiableEntity){
-// sourceObjectTitle = ((IdentifiableEntity) sourcedObject).getTitleCache();
-// }else if(sourcedObject instanceof DescriptionElementBase){
-// sourceObjectTitle = "Element for description: " + ((DescriptionElementBase) sourcedObject).getInDescription().getTitleCache();
-// }else{
-// throw new IllegalStateException("Unknown ISourceable object for given OriginalSourceBase");
-// }
+
+ //it is now possible for NomenclaturalSource as they link to the sourced name
+ if (originalSource instanceof NomenclaturalSource){
+ TaxonName sourcedName = ((NomenclaturalSource)originalSource).getSourcedName();
+ sourceObjectTitle = sourcedName == null ? "Source not attached to a name" :
+ "Nom. source for " + sourcedName.getTitleCache();
+ }
+
resultString = CdmUtils.concat("; ", new String[]{originalSource.getIdNamespace(), originalSource.getIdInSource(), sourceObjectTitle});
}catch(LazyInitializationException e){
private static boolean isBlank(String str){
return StringUtils.isBlank(str);
}
-}
+}
\ No newline at end of file
* 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.newWizard;
import org.eclipse.e4.ui.workbench.IWorkbench;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
/**
- *
* @author n.hoffmann
* @created Jun 1, 2010
- * @version 1.0
*/
-public abstract class AbstractNewEntityWizard<T> extends Wizard implements
- IConversationEnabled {
+public abstract class AbstractNewEntityWizard<T>
+ extends Wizard
+ implements IConversationEnabled {
protected ConversationHolder conversation;
/**
* FIXME there might be a smarter way to do this,
- *
- * @return
*/
protected abstract String getEntityName();
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
saveEntity();
*/
protected abstract void saveEntity();
- /** {@inheritDoc} */
public void init(IWorkbench workbench, IStructuredSelection selection) {
formFactory = new CdmFormFactory(Display.getCurrent(), null);
conversation = CdmStore.createConversation();
return conversation;
}
- /** {@inheritDoc} */
@Override
public void update(CdmDataChangeMap changeEvents) {}
public IStructuredSelection getSelection() {
return selection;
}
-}
+}
\ No newline at end of file
/**
- *
- */
+* 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.newWizard;
import java.util.Map;
import eu.etaxonomy.taxeditor.ui.section.classification.TaxonNodeWizardPage;
/**
- * <p>NewTaxonNodeWizard class.</p>
+ * NewTaxonNodeWizard class.
*
* @author n.hoffmann
* @created Sep 15, 2009
if (status == null){
notes = null;
}
- result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, source, parent.getMicroReference(),
+
+ result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, source, parent.getMicroReference(),
status, notes);
+
if (result.isOk()){
this.setEntity((TaxonNode)result.getCdmEntity());
- this.getEntity().getTaxon().setPublish(taxon.isPublish());
- MergeResult<TaxonNode> mergeResult = CdmStore.getService(ITaxonNodeService.class).merge(this.getEntity(), true);
- this.setEntity(mergeResult.getMergedEntity());
CdmApplicationState.getCurrentDataChangeService()
.fireChangeEvent(new CdmChangeEvent(Action.Create, result.getUpdatedObjects(), NewTaxonNodeWizard.class), true);
- CdmApplicationState.getCurrentDataChangeService()
- .fireChangeEvent(new CdmChangeEvent(Action.Create, mergeResult.getMergedEntity(), NewTaxonNodeWizard.class), true);
}else{
setSuccess(false);
}
}
-// @Override
-// protected TaxonNode createNewEntity() {
-// if(getSelection() != null){
-// Object selectedObject = getSelection().getFirstElement();
-// if(selectedObject instanceof TaxonNodeDto){
-// TaxonNodeDto taxonNodeDto = (TaxonNodeDto) selectedObject;
-// TaxonNode node = CdmStore.getService(ITaxonNodeService.class).load(taxonNodeDto.getUuid());
-// Reference sec = node.getTaxon() != null? node.getTaxon().getSec():null;
-// Taxon newTaxon = Taxon.NewInstance(TaxonNameFactory.NewNameInstance(PreferencesUtil.getPreferredNomenclaturalCode(), null), sec);
-// TaxonNode child = node.addChildTaxon(newTaxon, null, null);
-//
-// return child;
-//
-// }
-// }
-//
-// return null;
-// }
-
public boolean openInEditor() {
return isOpenInEditor ;
}
}
}
}
-}
+}
\ No newline at end of file
/**
* @author pplitzner
* @date 04.12.2013
- *
*/
-public abstract class AbstractDescriptionPostOperation<T extends IDescribable, D extends DescriptionBase> extends AbstractPostOperation<T> {
+public abstract class AbstractDescriptionPostOperation<T extends IDescribable, D extends DescriptionBase>
+ extends AbstractPostOperation<T> {
protected D description;
protected IdentifiableSource source;
/**
* @author pplitzner
* @date 03.12.2013
- *
*/
public abstract class AbstractPostOperation<T extends ICdmBase> extends AbstractOperation {
-
/**
* A reference to the {@link ICdmBase} element the concrete operation is working on
*/
protected IPostOperationEnabled postOperationEnabled;
- private ICdmEntitySessionEnabled cdmEntitySessionEnabled;
-
+ private ICdmEntitySessionEnabled<T> cdmEntitySessionEnabled;
- /**
- * @param label
- * @param element
- * @param postOperationEnabled
- */
public AbstractPostOperation(String label, IUndoContext undoContext,
T element, IPostOperationEnabled postOperationEnabled) {
this(label, undoContext, element, postOperationEnabled, null);
public AbstractPostOperation(String label, IUndoContext undoContext,
T element, IPostOperationEnabled postOperationEnabled,
- ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ ICdmEntitySessionEnabled<T> cdmEntitySessionEnabled) {
super(label);
addContext(undoContext);
this.element = element;
// return Status.OK_STATUS;
// }
- public ICdmEntitySessionEnabled getCdmEntitySessionEnabled() {
+ public ICdmEntitySessionEnabled<T> getCdmEntitySessionEnabled() {
return cdmEntitySessionEnabled;
}
* 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.operation;
import java.util.UUID;
* @author p.ciardelli
* @author n.hoffmann
* @created 14.01.2009
- * @version 1.0
*/
public abstract class AbstractPostTaxonOperation extends AbstractPostOperation<Taxon> {
this(label, undoContext, taxon, postOperationEnabled, null, null);
}
public AbstractPostTaxonOperation(String label, IUndoContext undoContext,
- Taxon taxon, IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled cdmEntitySessionEnabled, UISynchronize sync) {
+ Taxon taxon, IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled<Taxon> cdmEntitySessionEnabled, UISynchronize sync) {
super(label, undoContext, taxon, postOperationEnabled, cdmEntitySessionEnabled);
this.sync = sync;
}
public AbstractPostTaxonOperation(String label, IUndoContext undoContext,
- Taxon taxon, IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ Taxon taxon, IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled<Taxon> cdmEntitySessionEnabled) {
super(label, undoContext, taxon, postOperationEnabled, cdmEntitySessionEnabled);
}
}
public AbstractPostTaxonOperation(String label, IUndoContext undoContext, TaxonNodeDto taxonNode,
- IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled<Taxon> cdmEntitySessionEnabled) {
this(label, undoContext, (Taxon) CdmStore.getService(ITaxonService.class).find(taxonNode.getTaxonUuid()), postOperationEnabled, cdmEntitySessionEnabled, null);
this.taxonNode = taxonNode;
}
}
public AbstractPostTaxonOperation(String label, IUndoContext undoContext,
- IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ IPostOperationEnabled postOperationEnabled, ICdmEntitySessionEnabled<Taxon> cdmEntitySessionEnabled) {
super(label, undoContext, null, postOperationEnabled, cdmEntitySessionEnabled);
}
this(label, undoContext, taxonUuid, null);
}
-
public UISynchronize getSync() {
return sync;
}
public void setSync(UISynchronize sync) {
this.sync = sync;
}
-
-}
+}
\ No newline at end of file
*/
package eu.etaxonomy.taxeditor.preference;
-import java.net.URI;
-
import org.eclipse.jface.layout.GridLayoutFactory;
import org.eclipse.swt.SWT;
import org.eclipse.swt.custom.CLabel;
import org.eclipse.swt.widgets.Label;
import eu.etaxonomy.cdm.api.application.ICdmRepository;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
import eu.etaxonomy.cdm.model.metadata.CdmPreference;
import eu.etaxonomy.cdm.model.metadata.CdmPreference.PrefKey;
/**
* @author k.luther
* @since 23.03.2018
- *
*/
public class AbcdImportPreference extends CdmPreferencePage implements IE4PreferencePage, SelectionListener {
}
this.setApply(true);
-
// PreferencesUtil.recursiveSetEnabled(composite, override);
setApply(true);
PreferencesUtil.setBooleanValue( PreferencesUtil.prefOverrideKey(PreferencePredicate.AbcdImportConfig.getKey()), override);
}
PreferencesUtil.setStringValue(PreferencePredicate.AbcdImportConfig.getKey(), "");
-
-
}
return true;
}
- /**
- * {@inheritDoc}
- */
@Override
public void widgetDefaultSelected(SelectionEvent e) {
// TODO Auto-generated method stub
}
index++;
}
-
}
-
}
-
-}
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.preference;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
}
}
- List<DefinedTermBase> definedTermBases = termService.load(uuidList, null);
- List<TermDto> dtos = new ArrayList<>();
- for (DefinedTermBase<?> term: definedTermBases){
- dtos.add(TermDto.fromTerm(term));
- }
+ Collection<TermDto> dtos = termService.findByUUIDsAsDto(uuidList);
+// List<TermDto> dtos = new ArrayList<>();
+// for (DefinedTermBase<?> term: definedTermBases){
+// dtos.add(TermDto.fromTerm(term));
+// }
CdmStore.getTermManager().setPreferredTermsByType(dtos, TermType.PresenceAbsenceTerm);
}
}
import eu.etaxonomy.cdm.api.service.ITermTreeService;
import eu.etaxonomy.cdm.model.term.TermTree;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeContentProvider;
-import eu.etaxonomy.taxeditor.featuretree.FeatureTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeContentProvider;
+import eu.etaxonomy.taxeditor.featuretree.TermTreeLabelProvider;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.preference.menu.CdmPreferencePage;
final ListViewer viewer = new ListViewer(parent);
viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- viewer.setContentProvider(new FeatureTreeContentProvider());
- viewer.setLabelProvider(new FeatureTreeLabelProvider());
+ viewer.setContentProvider(new TermTreeContentProvider());
+ viewer.setLabelProvider(new TermTreeLabelProvider());
viewer.addSelectionChangedListener(new ISelectionChangedListener() {
final ListViewer viewer = new ListViewer(parent);
viewer.getControl().setLayoutData(new GridData(SWT.FILL, SWT.FILL, true, true));
- viewer.setContentProvider(new FeatureTreeContentProvider());
- viewer.setLabelProvider(new FeatureTreeLabelProvider());
+ viewer.setContentProvider(new TermTreeContentProvider());
+ viewer.setLabelProvider(new TermTreeLabelProvider());
viewer.addSelectionChangedListener(new ISelectionChangedListener() {
/**
* @author n.hoffmann
* @created Dec 3, 2010
- * @version 1.0
*/
public class LanguageEditorPreferencePage extends CdmPreferencePage {
}
return super.performOk();
}
-
-}
+}
\ No newline at end of file
import java.io.FileOutputStream;
import java.io.IOException;
import java.lang.reflect.Field;
-import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
import eu.etaxonomy.cdm.api.service.config.FindTaxaAndNamesConfiguratorImpl;
import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;
import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator;
import eu.etaxonomy.cdm.model.common.ICdmBase;
continue;
}
boolean enabled = Boolean.parseBoolean(p2ReposStrST.nextToken());
- MetadataRepositoryElement mre = new MetadataRepositoryElement(null, uri, true);
+ MetadataRepositoryElement mre = new MetadataRepositoryElement(null, uri.getJavaUri(), true);
mre.setNickname(nickname);
mre.setEnabled(enabled);
p2Repos.add(mre);
}else{
logger.debug("This key of the abcd configurator needs to be added to the transformer: " + keyString);
}
-
-
}
}
}
/** Constant <code>COLOR_COMPOSITE_BACKGROUND="eu.etaxonomy.taxeditor.preferences.colo"{trunked}</code> */
public static final String COLOR_COMPOSITE_BACKGROUND = "eu.etaxonomy.taxeditor.preferences.colorDefinition.colorCompositeBackground";
/** Constant <code>COLOR_COMPOSITE_IRRELEVANT="eu.etaxonomy.taxeditor.preferences.colo"{trunked}</code> */
- public static final String COLOR_COMPOSITE_IRRELEVANT = "eu.etaxonomy.taxeditor.preferences.colorDefinition.colorCompositeIrrelevant";
+ public static final String COLOR_COMPOSITE_IRRELEVANT1 = "eu.etaxonomy.taxeditor.preferences.colorDefinition.colorCompositeIrrelevant1";
+ public static final String COLOR_COMPOSITE_IRRELEVANT1_LIGHT = "eu.etaxonomy.taxeditor.preferences.colorDefinition.colorCompositeIrrelevant1_light";
+ public static final String COLOR_COMPOSITE_IRRELEVANT2 = "eu.etaxonomy.taxeditor.preferences.colorDefinition.colorCompositeIrrelevant2";
+ public static final String COLOR_COMPOSITE_IRRELEVANT2_LIGHT = "eu.etaxonomy.taxeditor.preferences.colorDefinition.colorCompositeIrrelevant2_light";
+ public static final String COLOR_COMPOSITE_IRRELEVANT1_2 = "eu.etaxonomy.taxeditor.preferences.colorDefinition.colorCompositeIrrelevant1_2";
+ public static final String COLOR_COMPOSITE_IRRELEVANT1_2_LIGHT = "eu.etaxonomy.taxeditor.preferences.colorDefinition.colorCompositeIrrelevant1_2_light";
/** Constant <code>SEARCH_VIEW_FOREGROUND="eu.etaxonomy.taxeditor.preferences.colo"{trunked}</code> */
public static final String SEARCH_VIEW_FOREGROUND = "eu.etaxonomy.taxeditor.preferences.colorDefinition.searchView.foreground";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_NAMEDAREATREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.namedAreaTreeEditor";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_OCCURRENCESEARCH = "eu.etaxonomy.taxeditor.store.showView.parameter.occurrencesearch";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_PRESENCEABSENCETREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.presenceAbsenceTreeEditor";
+ public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_NAMERELATIONSHIPTYPETREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.nameRelationshipTypeTreeEditor";
+ public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_NOMENCLATURALSTATUSTYPETREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.nomenclaturalStatusTypeTreeEditor";
+// public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_PRESENCEABSENCETREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.presenceAbsenceTreeEditor";
+// public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_PRESENCEABSENCETREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.presenceAbsenceTreeEditor";
+// public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_PRESENCEABSENCETREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.presenceAbsenceTreeEditor";
+// public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_PRESENCEABSENCETREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.presenceAbsenceTreeEditor";
+// public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_PRESENCEABSENCETREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.presenceAbsenceTreeEditor";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_PROPERTYTREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.propertyTreeEditor";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_RANKTREEEDITOR = "eu.etaxonomy.taxeditor.store.showView.parameter.rankTreeEditor";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_SESSIONVIEW = "eu.etaxonomy.taxeditor.store.showView.parameter.sessionView";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_SUPPLEMENTALDATAVIEW = "eu.etaxonomy.taxeditor.store.showView.parameter.supplementalDataView";
public static final String PARAMETER_EU_ETAXONOMY_TAXEDITOR_STORE_SHOWVIEW_PARAMETER_TERMSEARCH = "eu.etaxonomy.taxeditor.store.showView.parameter.termsearch";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_DEFINEDTERM = "eu.etaxonomy.taxeditor.editor.definedTerm";
+ public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_EDITOR_TERMTREE = "eu.etaxonomy.taxeditor.featuretree.e4.termTreeEditor";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_CHARACTERTREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.CharacterTreeEditor";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_FEATURETREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.FeatureTreeEditor";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_NAMEDAREATREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.NamedAreaTreeEditor";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_PRESENCEABSENCETREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.PresenceAbsenceTreeEditor";
+ public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_NOMENCLATURALSTATUSTYPETREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.nomenclaturalStatusTypeTreeEditor";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_PROPERTYTREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.PropertyTreeEditor";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_RANKTREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.RankTreeEditor";
public static final String PARTDESCRIPTOR_EU_ETAXONOMY_TAXEDITOR_FEATURETREE_E4_STRUCTURETREEEDITOR = "eu.etaxonomy.taxeditor.featuretree.e4.StructureTreeEditor";
*/\r
package eu.etaxonomy.taxeditor.store;\r
\r
-import java.net.URI;\r
import java.net.URISyntaxException;\r
\r
import org.eclipse.core.runtime.IProgressMonitor;\r
import org.eclipse.core.runtime.NullProgressMonitor;\r
\r
+import eu.etaxonomy.cdm.common.URI;\r
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;\r
import eu.etaxonomy.cdm.api.service.ITermService;\r
import eu.etaxonomy.cdm.api.service.IVocabularyService;\r
private static Feature useSummaryFeature;\r
private static Feature useRecordFeature;\r
\r
-\r
public static void reset() {\r
isInitialized = false;\r
useMarkerType = null;\r
conversation.close();\r
}\r
\r
-\r
private static void createHumanGroupVocabulary(IProgressMonitor monitor,ConversationHolder conversation) {\r
TermVocabulary<DefinedTerm> humanGroupVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidHumanGroupVocabulary);\r
if (humanGroupVocabulary == null){\r
}\r
}\r
\r
-\r
private static void createPlantVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {\r
TermVocabulary<DefinedTerm> plantPartVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidPlantPartVocabulary);\r
if (plantPartVocabulary == null){\r
}\r
}\r
\r
-\r
private static void createCountryVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {\r
TermVocabulary<DefinedTerm> countryVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidCountryVocabulary);\r
if (countryVocabulary == null){\r
}\r
}\r
\r
-\r
private static void createStateVocabulary(IProgressMonitor monitor, ConversationHolder conversation) {\r
TermVocabulary<State> stateVocabulary = CdmStore.getService(IVocabularyService.class).find(UsageTermCollection.uuidUseCategoryVocabulary);\r
if (stateVocabulary == null){\r
}\r
}\r
\r
-\r
private static void createUseMarkerType(ConversationHolder conversation) {\r
useMarkerType = (MarkerType) CdmStore.getService(ITermService.class).find(UsageTermCollection.uuidUseMarkerType);\r
if (useMarkerType == null){\r
conversation.commit(true);\r
}\r
}\r
-\r
-\r
-}\r
+}
\ No newline at end of file
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.forms.widgets.TableWrapData;
-import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
-import eu.etaxonomy.taxeditor.preference.Resources;
-import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.AbstractRelevanceFormElement;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
/**
* @author pplitzner
* @date Aug 11, 2016
- *
*/
-public abstract class AbstractComboElement<T> extends
-AbstractCdmFormElement implements SelectionListener,
-IEnableableFormElement, ISelectable,
-DisposeListener {
+public abstract class AbstractComboElement<T>
+ extends AbstractRelevanceFormElement
+ implements SelectionListener, IEnableableFormElement,
+ ISelectable, DisposeListener {
protected static final int DEFAULT_VISIBLE_ITEMS = 10;
public boolean hasNullValue;
-
-
-
public AbstractComboElement(CdmFormFactory formFactory, ICdmFormElement formElement, boolean hasNullValue) {
super(formFactory, formElement);
//disable mouse-wheel selection
combo.addListener(SWT.MouseWheel, e->e.doit=false);
this.hasNullValue = hasNullValue;
-
-
}
public AbstractComboElement(CdmFormFactory formFactory, ICdmFormElement formElement){
this(formFactory, formElement, false);
}
-
-
- /** {@inheritDoc} */
@Override
public void setBackground(Color color) {
if (label != null) {
}
}
- /** {@inheritDoc} */
@Override
- public void setIrrelevant(boolean irrelevant) {
- String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT
- : Resources.COLOR_COMPOSITE_BACKGROUND;
-
- Color color = AbstractUtility.getColor(colorId);
+ public void updateCacheRelevance() {
+ Color color = cacheRelevance().getColor();
combo.setBackground(color);
- if (label != null) {
- label.setBackground(color);
- }
-
}
public void setVisibleItemCount(int count){
combo.setVisibleItemCount(count);
}
- /** {@inheritDoc} */
@Override
public void setSelected(boolean selected) {
setBackground(selected ? SELECTED : getPersistentBackground());
combo.removeSelectionListener(listener);
}
- /** {@inheritDoc} */
@Override
public void widgetDisposed(DisposeEvent e) {
PreferencesUtil.getPreferenceStore().removePropertyChangeListener(this);
return combo.isEnabled();
}
- /** {@inheritDoc} */
@Override
public void setEnabled(boolean enabled) {
combo.setEnabled(enabled);
public abstract void setSelection(T selection);
-
-
private AbstractComboElement<T> getComboElement(){
return this;
}
-
protected void addContentProposalAdapter() {
ContentProposalAdapter adapter;
return new IContentProposal[0];
}
StringMatcher matcher = new StringMatcher("*" + contents + "*", true, false); //$NON-NLS-1$ //$NON-NLS-2$
- ArrayList<String> matches = new ArrayList<String>();
+ ArrayList<String> matches = new ArrayList<>();
for (int i = 0; i < items.length; i++) {
if (matcher.match(items[i])) {
matches.add(items[i]);
};
}
-}
+ @Override
+ public String toString() {
+ if (label != null){
+ return CdmUtils.concat("", "ComboElement[", label.getText(),"]");
+ }else{
+ return super.toString();
+ }
+ }
+}
\ No newline at end of file
* 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.combo;
import java.util.ArrayList;
* @author n.hoffmann
* @created Mar 16, 2010
*/
-public class EnumComboElement<T extends IEnumTerm<T>> extends
- AbstractComboElement<T> {
+public class EnumComboElement<T extends IEnumTerm<T>>
+ extends AbstractComboElement<T> {
//TODO RL
public void setVisible(boolean b){
combo.setVisible(b);
}
-
- private static CdmEnumDataHolder[] cdmEnumDataHolders = {
+ private static CdmEnumDataHolder[] cdmEnumDataHolders = {
new CdmEnumDataHolder<NomenclaturalCode>(){
@Override
@Override
public Collection<ReferenceType> getElements() {
- return Arrays.asList(ReferenceType.values());
+ List<ReferenceType> list = Arrays.asList(ReferenceType.values());
+ Collections.sort(list, new Comparator<ReferenceType>() {
+ @Override
+ public int compare(ReferenceType rt1, ReferenceType rt2){
+ return rt1.getLabel().compareTo(rt2.getLabel());
+ }
+ });
+ return list;
}
@Override
}
}
-
};
protected List<T> elementTypeList = new ArrayList<>();
return combo;
}
-
private String getDefaultLabelString() {
if(enumType.equals(ReferenceType.class)){
return "Reference Type";
}
combo.select(index);
}
- /** {@inheritDoc} */
+
@Override
public void widgetSelected(SelectionEvent e) {
String getName();
Collection<T> getElements();
}
-
-
-}
+}
\ No newline at end of file
/**
- *
- */
+* Copyright (C) 2016 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.combo;
import java.util.ArrayList;
/**
* @author n.hoffmann
* @created Nov 5, 2009
- * @version 1.0
- * @param <VOC>
*/
public class VocabularyComboElement<TERM extends DefinedTermBase<TERM>, VOC extends TermVocabulary<TERM>>
extends AbstractComboElement<VOC> {
private final TermType termType;
public VocabularyComboElement(CdmFormFactory formFactory,
- ICdmFormElement parentElement, TermType termType, String labelString, VOC selection,
- int style) {
+ ICdmFormElement parentElement, TermType termType, String labelString,
+ VOC selection, int style) {
super(formFactory, parentElement);
this.termType = termType;
}
public VocabularyComboElement(CdmFormFactory formFactory,
- ICdmFormElement parentElement, TermType termType, String labelString, TermVocabularyDto selection,
- int style) {
+ ICdmFormElement parentElement, TermType termType, String labelString,
+ TermVocabularyDto selection, int style) {
super(formFactory, parentElement);
this.termType = termType;
}
}
-
-
-
/**
* <p>Sets the selection of the combo to the given T object.</p>
* <p>Passing <code>null</code> to this method will set the selection to
// }
}
-
public void setSelectionDto(TermVocabularyDto selection) {
Listener[] listeners = combo.getListeners(SWT.Selection);
populateTerms(preferredTerms);
}
- /** {@inheritDoc} */
@Override
public void widgetSelected(SelectionEvent e) {
int i = combo.getSelectionIndex();
firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e));
}
- /** {@inheritDoc} */
@Override
public void propertyChange(PropertyChangeEvent event) {
super.propertyChange(event);
terms.remove(emptyElement);
combo.remove(EMPTY_ELEMENT_LABEL);
}
-
-}
+}
\ No newline at end of file
* 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.dialog;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
import java.net.URISyntaxException;
import org.eclipse.jface.dialogs.IInputValidator;
*
* @author p.ciardelli
* @created 31.03.2009
- * @version 1.0
*
* TODO make this extend TitleAreaDialog
*/
new URI(text);
} catch (URISyntaxException e) {
return "URL not correctly formed.";
- }
-
+ }
if (text.length() <= "http://".length()) {
return "";
* @param shell a {@link org.eclipse.swt.widgets.Shell} object.
* @param dialogTitle a {@link java.lang.String} object.
* @param dialogMessage a {@link java.lang.String} object.
- * @return a {@link java.net.URI} object.
+ * @return a {@link eu.etaxonomy.cdm.common.URI} object.
*/
public static URI getUri(Shell shell, String dialogTitle,
String dialogMessage) {
import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
/**
- * <p>Abstract AbstractFilteredCdmResourceSelectionDialog class.</p>
+ * Abstract AbstractFilteredCdmResourceSelectionDialog class.
*
* @author n.hoffmann
* @created 04.06.2009
*/
-public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmBase> extends SearchDialog<T> {
+public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmBase>
+ extends SearchDialog<T> {
protected List<UuidAndTitleCache<T>> model;
private final Set<T> transientCdmObjects = new HashSet<>();
protected Job searchJob;
- protected AbstractFilteredCdmResourceSelectionDialog(Shell shell, //ConversationHolder conversation,
+ protected AbstractFilteredCdmResourceSelectionDialog(Shell shell,
String title, boolean multi, String settings, Set<T> objectsToBeFiltered) {
super(shell, title);
}
- protected AbstractFilteredCdmResourceSelectionDialog(Shell shell, //ConversationHolder conversation,
+ protected AbstractFilteredCdmResourceSelectionDialog(Shell shell,
String title, boolean multi, String settings) {
this(shell, title, multi, settings, (Set<T>)null);
}
- protected AbstractFilteredCdmResourceSelectionDialog(Shell shell, //ConversationHolder conversation,
+ protected AbstractFilteredCdmResourceSelectionDialog(Shell shell,
String title, boolean multi, String settings, T objectToBeFiltered) {
this(shell, title, multi, settings, objectToBeFiltered!=null?Collections.singleton(objectToBeFiltered):null);
}
}
/**
- * <p>getSelectionFromDialog</p>
- *
- * @param dialog a {@link eu.etaxonomy.taxeditor.ui.dialog.selection.AbstractFilteredCdmResourceSelectionDialog} object.
- * @param <TYPE> a TYPE object.
- * @return a TYPE object.
+ * getSelectionFromDialog
*/
- protected static UuidAndTitleCache getUuidAndTitleCacheSelectionFromDialog(AbstractFilteredCdmResourceSelectionDialog dialog) {
+ protected static <S extends ICdmBase> UuidAndTitleCache<S> getUuidAndTitleCacheSelectionFromDialog(
+ AbstractFilteredCdmResourceSelectionDialog<S> dialog) {
if (dialog == null){
return null;
}
return null;
}
- UuidAndTitleCache uuid = dialog.getSelectedUuidAndTitleCache();
+ UuidAndTitleCache<S> uuid = dialog.getSelectedUuidAndTitleCache();
return uuid;
}
/**
* Check if object was created during the life of this dialog. If not,
* retrieve it from the CdmStore.
- *
- * @param cdmUuid a {@link java.util.UUID} object.
- * @return a T object.
*/
protected T getCdmObjectByUuid(UUID cdmUuid) {
for (T cdmObject : transientCdmObjects) {
return settings;
}
- public String getElementName(Object item) {
- return ((UuidAndTitleCache<T>) item).getTitleCache();
- }
-
@Override
protected Comparator<UuidAndTitleCache<T>> getItemsComparator() {
return new Comparator<UuidAndTitleCache<T>>() {
Collator collator = Collator.getInstance();
if (entity1 == entity2){
return 0;
- }
-
- if (entity1 == null && entity2 != null){
+ }else if (entity1 == null){
return -1;
- }
- if (entity2 == null && entity1 != null){
+ }else if (entity2 == null){
return 1;
- }
- if (entity1.getUuid().equals(entity2.getUuid())){
+ }else if (entity1.getUuid().equals(entity2.getUuid())){
return 0;
- }
- if (entity1.getTitleCache() == null && entity2.getTitleCache() != null){
+ }else if (entity1.getTitleCache() == null && entity2.getTitleCache() != null){
return -1;
- }
- if (entity2.getTitleCache() == null){
+ }else if (entity2.getTitleCache() == null){
return 1;
}
int result = collator.compare(entity1.getTitleCache(), entity2.getTitleCache());
}
/**
- * <p>getSelectedUuidAndTitleCache</p>
- *
- * @return a {@link eu.etaxonomy.cdm.model.common.UuidAndTitleCache} object.
+ * getSelectedUuidAndTitleCache
*/
protected UuidAndTitleCache<T> getSelectedUuidAndTitleCache() {
Object result = getResult();
};
}
- /**
- * <p>getConversationHolder</p>
- *
- * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
-// */
-// @Override
-// public ConversationHolder getConversationHolder() {
-// return conversation;
-// }
-
- /** {@inheritDoc} */
-// @Override
-// public void update(CdmDataChangeMap changeEvents) {}
-
/**
* Don't want to add for example a taxon or synonym to itself
* so filter the list to remove the taxon in question
model.remove(uuidAndTitleCacheToRemove);
}
}
+
@Override
void createFilterButton(Composite searchAndFilter){
//as default no filter button available
// }
}
- abstract void callService(String pattern);
+ protected abstract void callService(String pattern);
}
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
-public abstract class AbstractFilteredIdentifierSelectionDialog<T extends ICdmBase> extends AbstractFilteredCdmResourceSelectionDialog {
+public abstract class AbstractFilteredIdentifierSelectionDialog<T extends ICdmBase>
+ extends AbstractFilteredCdmResourceSelectionDialog<T> {
- DefinedTerm identifierType;
- MatchMode matchMode;
- Class<T> type;
+ private DefinedTerm identifierType;
+ private MatchMode matchMode;
+ private Class<T> type;
-
- /**
- * @param shell
- * @param title
- * @param multi
- * @param settings
- * @param cdmObject
- */
- protected AbstractFilteredIdentifierSelectionDialog(Shell shell, String title, boolean multi, String settings,
- ICdmBase cdmObject) {
+ protected AbstractFilteredIdentifierSelectionDialog(Shell shell, String title, boolean multi,
+ String settings, T cdmObject) {
super(shell, title, multi, settings, cdmObject);
-
}
- public class FilteredIdentifiedEntityLabelProvider extends LabelProvider {
- @Override
- public String getText(Object element) {
- if (element == null) {
- return null;
- }
- IdentifiedEntityDTO identifiedEntity = (IdentifiedEntityDTO) element;
- String titleCache = identifiedEntity.getCdmEntity().getTitleCache();
- if(PreferencesUtil.getBooleanValue(PreferencePredicate.ShowIdInSelectionDialog.getKey())){
- titleCache += " ["+identifiedEntity.getCdmEntity().getUuid()+"]";
- }
- // add identifier
- titleCache += " ["+identifiedEntity.getIdentifier().getIdentifier()+"]";
- return titleCache;
- }
- };
-
+ public class FilteredIdentifiedEntityLabelProvider extends LabelProvider {
@Override
- void callService(String pattern){
-
- model = CdmStore.getService(IIdentifiableEntityService.class).listByIdentifier(type, pattern, identifierType, matchMode, true, null, limitOfInitialElements);
+ public String getText(Object element) {
+ if (element == null) {
+ return null;
+ }
+ IdentifiedEntityDTO identifiedEntity = (IdentifiedEntityDTO) element;
+ String titleCache = identifiedEntity.getCdmEntity().getTitleCache();
+ if(PreferencesUtil.getBooleanValue(PreferencePredicate.ShowIdInSelectionDialog.getKey())){
+ titleCache += " ["+identifiedEntity.getCdmEntity().getUuid()+"]";
+ }
+ // add identifier
+ titleCache += " ["+identifiedEntity.getIdentifier().getIdentifier()+"]";
+ return titleCache;
}
+ }
-
-
-
-
-
-}
+ @Override
+ protected void callService(String pattern){
+ model = CdmStore.getService(IIdentifiableEntityService.class).listByIdentifier(type, pattern, identifierType, matchMode, true, null, limitOfInitialElements);
+ }
+}
\ No newline at end of file
* 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.dialog.selection;
import java.util.UUID;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- * <p>FilteredAgentSelectionDialog class.</p>
+ * FilteredAgentSelectionDialog class.
*
* @author n.hoffmann
* @created Sep 10, 2009
- * @version 1.0
*/
-public class AgentSelectionDialog<T extends AgentBase> extends
- AbstractFilteredCdmResourceSelectionDialog {
+public class AgentSelectionDialog<T extends AgentBase>
+ extends AbstractFilteredCdmResourceSelectionDialog<T> {
- /**
- *
- */
protected static final String PERSON = "New Person";
- /**
- *
- */
protected static final String TEAM = "New Team";
protected static boolean selectTeamMember;
/**
- * <p>select</p>
+ * select
*
* @param shell a {@link org.eclipse.swt.widgets.Shell} object.
* @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object.
* @param entity a {@link eu.etaxonomy.cdm.model.agent.AgentBase} object.
* @return a {@link eu.etaxonomy.cdm.model.agent.AgentBase} object.
*/
- public static AgentBase select(Shell shell, //ConversationHolder conversation,
- AgentBase entity, boolean selectTeamMember) {
- AgentSelectionDialog dialog = new AgentSelectionDialog(shell, //conversation,
+ public static <S extends AgentBase> S select(Shell shell,
+ S entity, boolean selectTeamMember) {
+ AgentSelectionDialog<S> dialog = new AgentSelectionDialog<>(shell,
"Choose Agent", false, AgentSelectionDialog.class.getCanonicalName(), entity, selectTeamMember);
- return (AgentBase) getSelectionFromDialog(dialog);
+ return getSelectionFromDialog(dialog);
}
/**
* @param multi a boolean.
* @param settings a {@link java.lang.String} object.
*/
- protected AgentSelectionDialog(Shell shell, //ConversationHolder conversation,
- String title, boolean multi, String settings, AgentBase agent, boolean selectTeamMember) {
- super(shell, //conversation,
- title, multi, settings, agent);
+ protected AgentSelectionDialog(Shell shell,
+ String title, boolean multi, String settings, T agent, boolean selectTeamMember) {
+ super(shell, title, multi, settings, agent);
this.selectTeamMember = selectTeamMember;
}
-
- /**
- * @author p.ciardelli
- * @created 18.09.2009
- * @version 1.0
- */
public class DetailsLabelProvider extends LabelProvider {
- /* (non-Javadoc)
- * @see org.eclipse.jface.viewers.ILabelProvider#getText(java.lang.Object)
- */
@Override
public String getText(Object element) {
-
AgentBase agent = (AgentBase) getCdmObjectByUuid(((UuidAndTitleCache<AgentBase>) element).getUuid());
+
T agent = getCdmObjectByUuid(((UuidAndTitleCache<AgentBase>) element).getUuid());
if (agent instanceof INomenclaturalAuthor) {
return "Nomenclatural title: '" + ((INomenclaturalAuthor) agent).getNomenclaturalTitle() + "'";
} else {
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.dialogs.AbstractFilteredCdmResourceSelectionDialog#getPersistentObect(java.util.UUID)
- */
- /** {@inheritDoc} */
@Override
- protected AgentBase getPersistentObject(UUID cdmUuid) {
- return CdmStore.getService(IAgentService.class).load(cdmUuid);
+ protected T getPersistentObject(UUID cdmUuid) {
+ return (T)CdmStore.getService(IAgentService.class).load(cdmUuid);
}
- /** {@inheritDoc} */
@Override
protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
if(TEAM.equals(parameter)){
}
}
- /** {@inheritDoc} */
@Override
protected String[] getNewWizardText() {
String[] result;
if (this.selectTeamMember){
result = new String[1];
result[0] = PERSON;
-
}else{
result = new String[2];
result[0] = PERSON;
return result;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getNewWizardLinkSelectionListener()
- */
@Override
protected SelectionListener getNewWizardButtonSelectionListener() {
return super.getNewWizardButtonSelectionListener();
}
-// /** {@inheritDoc} */
// @Override
// protected void search() {
// Control control = getSearchField();
// if (control != null){
// pattern = ((Text)control).getText();
// }
-//
// }
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.dialog.selection.AbstractFilteredCdmResourceSelectionDialog#callService(java.lang.String)
- */
@Override
- void callService(String pattern) {
- model = CdmStore.getService(IAgentService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
+ protected void callService(String pattern) {
+ Class<T> clazz = (Class)AgentBase.class;
+ model = CdmStore.getService(IAgentService.class).getUuidAndTitleCache(clazz, limitOfInitialElements, pattern);
}
-
-
-}
+}
\ No newline at end of file
* 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.dialog.selection;
import java.util.UUID;
*/
public class NameSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonName> {
- public static TaxonName select(Shell shell, //ConversationHolder conversation,
+ public static TaxonName select(Shell shell,
TaxonName name) {
- NameSelectionDialog dialog = new NameSelectionDialog(shell, //conversation,
+ NameSelectionDialog dialog = new NameSelectionDialog(shell,
"Choose a name", false, name);
return getSelectionFromDialog(dialog);
}
- protected NameSelectionDialog(Shell shell, //ConversationHolder conversation,
+ protected NameSelectionDialog(Shell shell,
String title, boolean multi, TaxonName name) {
- super(shell, //conversation,
+ super(shell,
title, multi, NameSelectionDialog.class.getCanonicalName(), name);
}
- /** {@inheritDoc} */
@Override
protected TaxonName getPersistentObject(UUID cdmUuid) {
return CdmStore.getService(INameService.class).load(cdmUuid);
}
- /** {@inheritDoc} */
-// @Override
-// protected void search() {
-// Control control =getSearchField();
-// String pattern = null;
-// if (control != null){
-// pattern = ((Text)control).getText();
-// }
-//
-// if (pattern.equals("?")){
-// model = CdmStore.getService(INameService.class).getUuidAndTitleCache(null, null);
-// }else if (pattern != null){
-// model = CdmStore.getService(INameService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
-// }
-// }
-
- /** {@inheritDoc} */
@Override
protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
return new NewNonViralNameWizard();
}
- /** {@inheritDoc} */
@Override
protected String[] getNewWizardText() {
return new String[]{"New Name"};
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.dialog.selection.AbstractFilteredCdmResourceSelectionDialog#callService(java.lang.String)
- */
@Override
- void callService(String pattern) {
+ protected void callService(String pattern) {
model = CdmStore.getService(INameService.class).getUuidAndTitleCache(limitOfInitialElements, pattern);
}
-}
+}
\ No newline at end of file
* The contents of this file are subject to the Mozilla Public License Version 1.1\r
* See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
-\r
package eu.etaxonomy.taxeditor.ui.dialog.selection;\r
\r
import java.util.ArrayList;\r
import java.util.UUID;\r
\r
import org.apache.commons.lang3.StringUtils;\r
-import org.eclipse.jface.action.Action;\r
-import org.eclipse.jface.action.IAction;\r
import org.eclipse.jface.dialogs.Dialog;\r
import org.eclipse.swt.SWT;\r
import org.eclipse.swt.events.SelectionEvent;\r
/**\r
* @author n.hoffmann\r
* @created May 11, 2010\r
- * @version 1.0\r
*/\r
public class NamedAreaSelectionDialog extends\r
AbstractFilteredCdmResourceSelectionDialog<NamedArea> {\r
\r
- private class IncludeNamedAreaVocabulary extends Action {\r
- private final TermVocabulary<NamedArea> vocabulary;\r
-\r
- /**\r
- * Creates a new instance of the class.\r
- */\r
- public IncludeNamedAreaVocabulary(TermVocabulary<NamedArea> vocabulary) {\r
- super(vocabulary.getTitleCache(), IAction.AS_CHECK_BOX);\r
- this.vocabulary = vocabulary;\r
- }\r
+// private class IncludeNamedAreaVocabulary extends Action {\r
+// private final TermVocabulary<NamedArea> vocabulary;\r
+//\r
+// /**\r
+// * Creates a new instance of the class.\r
+// */\r
+// public IncludeNamedAreaVocabulary(TermVocabulary<NamedArea> vocabulary) {\r
+// super(vocabulary.getTitleCache(), IAction.AS_CHECK_BOX);\r
+// this.vocabulary = vocabulary;\r
+// }\r
+//\r
+// @Override\r
+// public void run(){\r
+// if(isChecked()){\r
+// selectedVocabularies.add(vocabulary);\r
+// }else{\r
+// selectedVocabularies.remove(vocabulary);\r
+// }\r
+// PreferencesUtil.setBooleanValue(getPrefKey(vocabulary), !isChecked());\r
+// search();\r
+// }\r
+// }\r
\r
- @Override\r
- public void run(){\r
- if(isChecked()){\r
- selectedVocabularies.add(vocabulary);\r
- }else{\r
- selectedVocabularies.remove(vocabulary);\r
- }\r
- PreferencesUtil.setBooleanValue(getPrefKey(vocabulary), !isChecked());\r
- search();\r
- }\r
- }\r
protected List<NamedArea> selectedAreas;\r
protected List<TermVocabulary> selectedVocabularies;\r
protected List<TermVocabulary> vocabularies;\r
\r
-\r
-\r
/**\r
* Creates a filtered selection dialog to select a named area.\r
*\r
* @param preselectedVocabularyUuids the {@link UUID}s of the pre-selected vocabularies\r
* @return a {@link eu.etaxonomy.cdm.model.location.NamedArea} object.\r
*/\r
- public static NamedArea select(Shell shell, //ConversationHolder conversation,\r
+ public static NamedArea select(Shell shell,\r
NamedArea namedArea, String preferenceId, UUID... preselectedVocabularyUuids) {\r
- NamedAreaSelectionDialog dialog = new NamedAreaSelectionDialog(shell, //conversation,\r
+ NamedAreaSelectionDialog dialog = new NamedAreaSelectionDialog(shell,\r
"Choose an area", false, namedArea, preferenceId, preselectedVocabularyUuids);\r
return getSelectionFromDialog(dialog);\r
}\r
\r
- protected NamedAreaSelectionDialog(Shell shell, //ConversationHolder conversation,\r
+ protected NamedAreaSelectionDialog(Shell shell,\r
String title, boolean multi, NamedArea namedArea, Object preferenceId, UUID... preselectedVocabularyUuids) {\r
- super(shell, //conversation,\r
+ super(shell,\r
title, multi, NamedAreaSelectionDialog.class.getCanonicalName(), namedArea);\r
\r
selectedVocabularies = new ArrayList<TermVocabulary>();\r
}else{\r
selectedVocabularies = createSelectedVocabularies();\r
}\r
-\r
}\r
\r
protected List<TermVocabulary> createSelectedVocabularies() {\r
// return uuidList;\r
// }\r
\r
-\r
private String getPrefKey(TermVocabulary vocabulary){\r
return "hide_"+NamedAreaSelectionDialog.class.getCanonicalName()+vocabulary.getUuid()+preferenceID;\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
protected NamedArea getPersistentObject(UUID uuid) {\r
\r
return null;\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
protected void init() {\r
vocabularies = getAvailableVocabularies();\r
}\r
\r
private List<TermVocabulary> getAvailableVocabularies(){\r
- vocabularies = new ArrayList();\r
+ vocabularies = new ArrayList<>();\r
CdmPreferenceCache cache = CdmPreferenceCache.instance();\r
vocabularies = CdmStore.getService(IVocabularyService.class).listByTermType(TermType.NamedArea, true, null, null, null, null);\r
return vocabularies;\r
}\r
\r
-\r
-\r
- /** {@inheritDoc} */\r
@Override\r
protected String getTitle(NamedArea namedArea) {\r
try {\r
}\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {\r
return null;\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
protected String[] getNewWizardText() {\r
return null;\r
}\r
\r
@Override\r
- void createFilterButton(Composite searchAndFilter)\r
- {\r
- filterButton = new Button(searchAndFilter, SWT.NONE);\r
+ void createFilterButton(Composite searchAndFilter){\r
+ filterButton = new Button(searchAndFilter, SWT.NONE);\r
// filterButton.setText("Filter");\r
- filterButton.setImage(ImageResources.getImage(ImageResources.FUNNEL_ICON));\r
+ filterButton.setImage(ImageResources.getImage(ImageResources.FUNNEL_ICON));\r
// SelectionListener filterSelectionListener = new FilterSelectionListener(preferenceID, this);\r
- filterButton.addSelectionListener(new SelectionListener(){\r
- @Override\r
- public void widgetSelected(SelectionEvent e) {\r
-\r
- Object source = e.getSource();\r
- String text = null;\r
- if (source instanceof Button){\r
- Shell shell = ((Button)source).getShell();\r
- Dialog dialog = new FilterDialog(getShell(), preferenceID, selectedVocabularies, vocabularies);\r
- if(dialog!=null){\r
- dialog.open();\r
- }\r
- createSelectedVocabularies();\r
- search();\r
- }\r
-\r
-\r
-\r
-\r
- }\r
-\r
- @Override\r
- public void widgetDefaultSelected(SelectionEvent e) {\r
- // TODO Auto-generated method stub\r
-\r
+ filterButton.addSelectionListener(new SelectionListener(){\r
+ @Override\r
+ public void widgetSelected(SelectionEvent e) {\r
+ Object source = e.getSource();\r
+ if (source instanceof Button){\r
+ Dialog dialog = new FilterDialog(getShell(), preferenceID, selectedVocabularies, vocabularies);\r
+ dialog.open();\r
+ createSelectedVocabularies();\r
+ search();\r
}\r
+ }\r
\r
+ @Override\r
+ public void widgetDefaultSelected(SelectionEvent e) {\r
+ // TODO Auto-generated method stub\r
+ }\r
+ });\r
+ }\r
\r
- });\r
-\r
- }\r
-\r
-\r
-\r
- /* (non-Javadoc)\r
- * @see eu.etaxonomy.taxeditor.ui.dialog.selection.AbstractFilteredCdmResourceSelectionDialog#callService(java.lang.String)\r
- */\r
@Override\r
- void callService(String pattern) {\r
+ protected void callService(String pattern) {\r
String abbrevTypeString = PreferencesUtil.getStringValue(PreferencePredicate.NamedAreaSearchForAbbrev.getKey());\r
NamedAreaSearchField abbrevType;\r
try{\r
}else{\r
model = CdmStore.getService(ITermService.class).getUuidAndTitleCacheNamedArea(selectedVocabularies, limitOfInitialElements, pattern, PreferencesUtil.getGlobalLanguage());\r
}\r
-\r
}\r
}\r
-\r
-}\r
+}
\ No newline at end of file
*/
package eu.etaxonomy.taxeditor.ui.dialog.selection;
-
-
import java.text.Collator;
import java.util.Comparator;
+import java.util.List;
import org.eclipse.jface.viewers.ILabelProvider;
import org.eclipse.jface.viewers.LabelProvider;
import eu.etaxonomy.cdm.api.service.IAgentService;
import eu.etaxonomy.cdm.model.agent.INomenclaturalAuthor;
-import eu.etaxonomy.cdm.model.agent.Person;
-import eu.etaxonomy.cdm.model.agent.Team;
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
import eu.etaxonomy.cdm.model.metadata.PreferencePredicate;
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
/**
* @author k.luther
* @date 25.05.2016
- *
*/
public class NomenclaturalAuthorSelectionDialog extends TeamOrPersonBaseSelectionDialog {
-
- /**
- * @param shell
- * @param conversation
- * @param title
- * @param multi
- * @param settings
- * @param agent
- */
- protected NomenclaturalAuthorSelectionDialog(Shell shell, //ConversationHolder conversation,
+ protected NomenclaturalAuthorSelectionDialog(Shell shell,
String title,
- boolean multi, String settings, TeamOrPersonBase agent, boolean teamMemberSelection) {
+ boolean multi, String settings, TeamOrPersonBase<?> agent, boolean teamMemberSelection) {
super(shell, title, multi, settings, agent, teamMemberSelection);
}
@Override
protected void callService(String pattern) {
- model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(Team.class, limitOfInitialElements, pattern);
- model.addAll(CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(Person.class, limitOfInitialElements, pattern));
+ model = (List)CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(TeamOrPersonBase.class, limitOfInitialElements, pattern);
}
- /** {@inheritDoc} */
@Override
- protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
+ protected AbstractNewEntityWizard<? extends TeamOrPersonBase<?>> getNewEntityWizard(String parameter) {
if(TEAM.equals(parameter)){
return new NewTeamWizard(true);
}
throw new IllegalArgumentException("Could not determine the desired wizard.");
}
}
- /**
- *
- * @return
- */
+
@Override
protected ILabelProvider createListLabelProvider() {
return new FilteredCdmResourceAbbrevLabelProvider();
* @param entity a {@link eu.etaxonomy.cdm.model.agent.AgentBase} object.
* @return a {@link eu.etaxonomy.cdm.model.agent.AgentBase} object.
*/
- public static TeamOrPersonBase select(Shell shell, //ConversationHolder conversation,
- TeamOrPersonBase entity, boolean teamMemberSelection) {
+ public static TeamOrPersonBase<?> select(Shell shell,
+ TeamOrPersonBase<?> entity, boolean teamMemberSelection) {
NomenclaturalAuthorSelectionDialog dialog = new NomenclaturalAuthorSelectionDialog(shell, //conversation,
"Choose Agent", false, NomenclaturalAuthorSelectionDialog.class.getCanonicalName(), entity, teamMemberSelection);
- return (TeamOrPersonBase)getSelectionFromDialog(dialog);
+ return getSelectionFromDialog(dialog);
}
- /**
- * <p>getTitle</p>
- *
- * @param cdmObject a T object.
- * @return a {@link java.lang.String} object.
- */
@Override
- protected String getTitle(TeamOrPersonBase cdmObject) {
+ protected String getTitle(TeamOrPersonBase<?> cdmObject) {
if(cdmObject == null){
return "";
}
- if (cdmObject instanceof INomenclaturalAuthor) {
- return ((INomenclaturalAuthor)cdmObject).getNomenclaturalTitle();
- }
- throw new IllegalArgumentException("Generic method only" +
- " supports cdmObject of type IIdentifiableEntity." +
- " Please implement specific method in subclass.");
+ return ((INomenclaturalAuthor)cdmObject).getNomenclaturalTitle();
}
-
-
public class FilteredCdmResourceAbbrevLabelProvider extends LabelProvider {
@Override
public String getText(Object element) {
if (element == null) {
return null;
}
- UuidAndTitleCache uuidAndTitleCache = (UuidAndTitleCache) element;
+ UuidAndTitleCache<?> uuidAndTitleCache = (UuidAndTitleCache<?>) element;
String titleCache = uuidAndTitleCache.getTitleCache();
String abbrevTitleCache = uuidAndTitleCache.getAbbrevTitleCache();
if(titleCache!=null && abbrevTitleCache!=null){
}
}
- /** {@inheritDoc} */
-// @Override
-// protected ItemsFilter createFilter() {
-// return new ItemsFilter() {
-//
-// /**
-// * Always returns false to enforce refiltering even if the pattern is equal
-// */
-// @Override
-// public boolean equalsFilter(ItemsFilter filter) {
-// return false;
-// }
-//
-// @Override
-// public boolean isConsistentItem(Object item) {
-// return false;
-// }
-//
-// @Override
-// public boolean matchItem(Object item) {
-// String textTitleCache = null;
-// String abbrevTitleCache = null;
-// if(item instanceof UuidAndTitleCache){
-// if (((UuidAndTitleCache) item).getAbbrevTitleCache() != null){
-// abbrevTitleCache = ((UuidAndTitleCache) item).getAbbrevTitleCache();
-// }
-// if (((UuidAndTitleCache) item).getTitleCache() != null ){
-// textTitleCache = ((UuidAndTitleCache) item).getTitleCache();
-// }
-// }else if(item instanceof String){
-// textTitleCache = (String) item;
-// }
-//
-// return (matches(textTitleCache) || matches(abbrevTitleCache)) ;
-//
-// }
-//
-// };
-// }
-
@Override
- protected Comparator getItemsComparator() {
- return new Comparator<UuidAndTitleCache>() {
+ protected Comparator<UuidAndTitleCache<TeamOrPersonBase<?>>> getItemsComparator() {
+ return new Comparator<UuidAndTitleCache<TeamOrPersonBase<?>>>() {
@Override
- public int compare(UuidAndTitleCache entity1,
- UuidAndTitleCache entity2) {
+ public int compare(UuidAndTitleCache<TeamOrPersonBase<?>> entity1,
+ UuidAndTitleCache<TeamOrPersonBase<?>> entity2) {
if (entity1.getUuid().equals(entity2.getUuid())){
return 0;
compareString1 += entity1.getTitleCache();
}
-
String compareString2 = "";
if (entity2.getAbbrevTitleCache() != null){
compareString2 = entity2.getAbbrevTitleCache();
* 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.dialog.selection;
import java.util.UUID;
import org.eclipse.swt.widgets.Shell;
import eu.etaxonomy.cdm.api.service.IAgentService;
-import eu.etaxonomy.cdm.model.agent.AgentBase;
import eu.etaxonomy.cdm.model.agent.Team;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- * <p>FilteredNomenclaturalAuthorTeamSelectionDialog class.</p>
+ * FilteredNomenclaturalAuthorTeamSelectionDialog class.
*
* @author n.hoffmann
* @created Jun 22, 2010
- * @version 1.0
*/
-public class NomenclaturalAuthorTeamSelectionDialog extends
- AbstractFilteredCdmResourceSelectionDialog<AgentBase> {
+public class NomenclaturalAuthorTeamSelectionDialog
+ extends AbstractFilteredCdmResourceSelectionDialog<Team> {
/**
* <p>select</p>
* @param team a {@link eu.etaxonomy.cdm.model.agent.Team} object.
* @return a {@link eu.etaxonomy.cdm.model.agent.Team} object.
*/
- public static Team select(Shell shell, //ConversationHolder conversation,
+ public static Team select(Shell shell,
Team team){
NomenclaturalAuthorTeamSelectionDialog dialog = new NomenclaturalAuthorTeamSelectionDialog(shell, //conversation,
"Choose Author Team", false, NomenclaturalAuthorTeamSelectionDialog.class.getCanonicalName(), team);
- return (Team)getSelectionFromDialog(dialog);
+ return getSelectionFromDialog(dialog);
}
/**
* @param settings a {@link java.lang.String} object.
* @param agent a {@link eu.etaxonomy.cdm.model.agent.Team} object.
*/
- protected NomenclaturalAuthorTeamSelectionDialog(Shell shell, //ConversationHolder conversation,
+ protected NomenclaturalAuthorTeamSelectionDialog(Shell shell,
String title,
boolean multi, String settings, Team agent) {
- super(shell, //conversation,
+ super(shell,
title, multi, settings, agent);
}
- /** {@inheritDoc} */
@Override
protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
return new NewTeamWizard(true);
}
- /** {@inheritDoc} */
@Override
protected String[] getNewWizardText() {
return new String[]{"new Team"};
}
-// /** {@inheritDoc} */
// @Override
// protected void search() {
// Control control =getSearchField();
// model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(limitOfInitialElements, pattern, Team.class);
// }
- /** {@inheritDoc} */
@Override
protected Team getPersistentObject(UUID uuid) {
return CdmBase.deproxy(CdmStore.getService(IAgentService.class).load(uuid), Team.class) ;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.dialog.selection.AbstractFilteredCdmResourceSelectionDialog#callService(java.lang.String)
- */
@Override
- void callService(String pattern) {
+ protected void callService(String pattern) {
model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(Team.class, limitOfInitialElements, pattern);
}
-}
+}
\ No newline at end of file
*/
package eu.etaxonomy.taxeditor.ui.dialog.selection;
+import java.util.List;
+
import org.eclipse.swt.widgets.Shell;
import eu.etaxonomy.cdm.api.service.IAgentService;
TeamOrPersonBase entity, boolean teamMemberSelection) {
NomenclaturalPersonAuthorSelectionDialog dialog = new NomenclaturalPersonAuthorSelectionDialog(shell, //conversation,
"Choose Agent", false, NomenclaturalAuthorSelectionDialog.class.getCanonicalName(), entity,teamMemberSelection);
- return (TeamOrPersonBase)getSelectionFromDialog(dialog);
+ return getSelectionFromDialog(dialog);
}
@Override
protected void callService(String pattern) {
- model = CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(Person.class, limitOfInitialElements, pattern);
+ model = (List)CdmStore.getService(IAgentService.class).getUuidAndAbbrevTitleCache(Person.class, limitOfInitialElements, pattern);
}
}
*/
package eu.etaxonomy.taxeditor.ui.dialog.selection;
+import java.util.List;
+
import org.eclipse.swt.widgets.Shell;
import eu.etaxonomy.cdm.api.service.IAgentService;
/**
* @author k.luther
* @since 18.03.2019
- *
*/
-public class TeamOrPersonBaseSelectionDialog extends AgentSelectionDialog<TeamOrPersonBase> {
+public class TeamOrPersonBaseSelectionDialog
+ extends AgentSelectionDialog<TeamOrPersonBase<?>> {
- /**
- * @param shell
- * @param title
- * @param multi
- * @param settings
- * @param agent
- * @param selectTeamMember
- */
protected TeamOrPersonBaseSelectionDialog(Shell shell, String title, boolean multi, String settings,
- TeamOrPersonBase agent, boolean selectTeamMember) {
+ TeamOrPersonBase<?> agent, boolean selectTeamMember) {
super(shell, title, multi, settings, agent, selectTeamMember);
- // TODO Auto-generated constructor stub
}
-
-
/**
* <p>select</p>
*
* @param entity a {@link eu.etaxonomy.cdm.model.agent.AgentBase} object.
* @return a {@link eu.etaxonomy.cdm.model.agent.AgentBase} object.
*/
- public static TeamOrPersonBase select(Shell shell, //ConversationHolder conversation,
- TeamOrPersonBase entity, boolean selectTeamMember) {
- TeamOrPersonBaseSelectionDialog dialog = new TeamOrPersonBaseSelectionDialog(shell, //conversation,
+ public static TeamOrPersonBase<?> select(Shell shell,
+ TeamOrPersonBase<?> entity, boolean selectTeamMember) {
+ TeamOrPersonBaseSelectionDialog dialog = new TeamOrPersonBaseSelectionDialog(shell,
"Choose Team or Person", false, TeamOrPersonBaseSelectionDialog.class.getCanonicalName(), entity, selectTeamMember);
- return (TeamOrPersonBase)getSelectionFromDialog(dialog);
+ return getSelectionFromDialog(dialog);
}
@Override
- void callService(String pattern) {
- model = CdmStore.getService(IAgentService.class).getUuidAndTitleCache(Team.class,limitOfInitialElements, pattern);
- model.addAll( CdmStore.getService(IAgentService.class).getUuidAndTitleCache(Person.class,limitOfInitialElements, pattern));
+ protected void callService(String pattern) {
+ model = (List)CdmStore.getService(IAgentService.class).getUuidAndTitleCache(Team.class, limitOfInitialElements, pattern);
+ model.addAll((List)CdmStore.getService(IAgentService.class).getUuidAndTitleCache(Person.class,limitOfInitialElements, pattern));
}
-
-
- /**
- * @param cdmObject
- * @return
- */
- protected String getTitle(TeamOrPersonBase cdmObject) {
+ @Override
+ protected String getTitle(TeamOrPersonBase<?> cdmObject) {
if(cdmObject == null){
return "";
}
return cdmObject.getTitleCache();
}
-}
+}
\ No newline at end of file
/**\r
- *\r
- */\r
+* Copyright (C) 2015 EDIT\r
+* European Distributed Institute of Taxonomy\r
+* http://www.e-taxonomy.eu\r
+*\r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
package eu.etaxonomy.taxeditor.ui.element;\r
\r
import java.util.ConcurrentModificationException;\r
\r
private Color persistentBackgroundColor;\r
\r
-\r
protected AbstractCdmFormElement(CdmFormFactory formFactory, Composite layoutComposite){\r
this.layoutComposite = layoutComposite;\r
this.formFactory = formFactory;\r
\r
/**\r
* Returns all Controls that are managed by this element\r
- *\r
- * @return a {@link java.util.Set} object.\r
*/\r
@Override\r
public Set<Control> getControls(){\r
}\r
\r
/**\r
- * adds the control to the set of controls that are managed by this element\r
- *\r
- * @param child a {@link org.eclipse.swt.widgets.Control} object.\r
+ * Adds the control to the set of controls that are managed by this element\r
*/\r
protected void addControl(Control child){\r
controls.add(child);\r
return elements;\r
}\r
\r
- /**\r
- * <p>Getter for the field <code>parentElement</code>.</p>\r
- *\r
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.\r
- */\r
@Override\r
public ICdmFormElement getParentElement(){\r
return parentElement;\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
public void addElement(ICdmFormElement element){\r
elements.add(element);\r
}\r
}\r
\r
- /**\r
- * <p>Getter for the field <code>layoutComposite</code>.</p>\r
- *\r
- * @return a {@link org.eclipse.swt.widgets.Composite} object.\r
- */\r
@Override\r
public Composite getLayoutComposite() {\r
return layoutComposite;\r
}\r
-\r
- /**\r
- * <p>Setter for the field <code>layoutComposite</code>.</p>\r
- *\r
- * @param layoutComposite a {@link org.eclipse.swt.widgets.Composite} object.\r
- */\r
public void setLayoutComposite(Composite layoutComposite){\r
this.layoutComposite = layoutComposite;\r
}\r
GridData gridData = new GridData();\r
gridData.verticalIndent = indent;\r
this.layoutComposite.setLayoutData(gridData);\r
-\r
}\r
}\r
- /**\r
- * <p>Getter for the field <code>propertyChangeListeners</code>.</p>\r
- *\r
- * @return a {@link java.util.Set} object.\r
- */\r
+\r
@Override\r
public List<IPropertyChangeListener> getPropertyChangeListeners() {\r
return propertyChangeListeners;\r
}\r
-\r
- /** {@inheritDoc} */\r
@Override\r
public void setPropertyChangeListeners(List<IPropertyChangeListener> propertyChangeListeners){\r
this.propertyChangeListeners = propertyChangeListeners;\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
public void firePropertyChangeEvent(CdmPropertyChangeEvent event) {\r
//TODO: replace propertyChangeListeners with formFactory.getPropertyChangeListeners() and remove member propertyChangeListeners from AbstractCdmFormElement\r
firePropertyChangeEvent(new CdmPropertyChangeEvent(object, originatingEvent));\r
}\r
\r
-\r
/**\r
* {@inheritDoc}\r
*\r
// implement in subclasses\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
public boolean containsFormElement(ICdmFormElement formElement){\r
if(formElement == this){\r
// empty default implementation\r
}\r
\r
-\r
- /** {@inheritDoc} */\r
@Override\r
public void setBackground(Color color) {\r
for(ICdmFormElement element : getElements()){\r
/**
+ * 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.element;
*
* @author n.hoffmann
* @created Feb 22, 2010
- * @param <T>
*/
//TODO shouldn't ENTITY be bound with super class ICdmBase for example (AbstractFormSection<ENTITY extends ICdmBase>)?
-public abstract class AbstractFormSection<ENTITY> extends Section implements ISelectionChangedListener, IEntityElement<ENTITY>, IConversationEnabled {
+public abstract class AbstractFormSection<ENTITY>
+ extends Section
+ implements ISelectionChangedListener, IEntityElement<ENTITY>, IConversationEnabled {
/**
* The default number of columns in detail sections
private Color persistentBackgroundColor;
/**
- * <p>
* Constructor for AbstractFormSection.
- * </p>
- *
- * @param conversation
- * TODO
- * @param style
- * a int.
- * @param formFactory
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
- * object.
- * @param parentElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param <ENTITY>
- * a ENTITY object.
*/
protected AbstractFormSection(CdmFormFactory formFactory, ICdmFormElement parentElement, int style) {
super(parentElement.getLayoutComposite(), style);
client.setLayout(layout);
this.setClient(client);
-
}
- /**
- * <p>
+ /**
* Constructor for AbstractFormSection.
- * </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 selectionProvider
- * a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
- * @param style
- * a int.
*/
protected AbstractFormSection(CdmFormFactory formFactory, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) {
this(formFactory, parentElement, style);
}
/**
- * <p>
* Getter for the field <code>propertyChangeListeners</code>.
- * </p>
- *
- * @return a {@link java.util.Set} object.
*/
@Override
public List<IPropertyChangeListener> getPropertyChangeListeners() {
return propertyChangeListeners;
}
- /** {@inheritDoc} */
@Override
public void setPropertyChangeListeners(
List<IPropertyChangeListener> propertyChangeListeners) {
}
/**
- * <p>
* Setter for the field <code>entity</code>.
- * </p>
- *
- * @param entity
- * a ENTITY object.
*/
public void setEntity(ENTITY entity) {
this.entity = entity;
}
/**
- * <p>
* Getter for the field <code>entity</code>.
- * </p>
- *
- * @return a ENTITY object.
*/
@Override
public ENTITY getEntity() {
}
/**
- * <p>
* getToggle
- * </p>
- *
- * @return a {@link org.eclipse.ui.forms.widgets.ToggleHyperlink} object.
*/
public ToggleHyperlink getToggle() {
return this.toggle;
}
/**
- * <p>
* getSection
- * </p>
- *
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection}
- * object.
*/
public AbstractFormSection<ENTITY> getSection() {
return this;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.forms.IPropertyChangeEmitter#firePropertyChangeEvent
- * ()
- */
- /** {@inheritDoc} */
@Override
public void firePropertyChangeEvent(CdmPropertyChangeEvent event) {
Assert.isNotNull(propertyChangeListeners, "No property change listeners.");
originatingEvent));
}
- /*
- * (non-Javadoc)
- *
- * @see org.eclipse.swt.widgets.Composite#setFocus()
- */
- /** {@inheritDoc} */
@Override
public boolean setFocus() {
return getClient().setFocus();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse
- * .jface.util.PropertyChangeEvent)
- */
- /** {@inheritDoc} */
@Override
public void propertyChange(PropertyChangeEvent event) {
firePropertyChangeEvent(new CdmPropertyChangeEvent(this, event));
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.swt.widgets.Control#setBackground(org.eclipse.swt.graphics
- * .Color)
- */
- /** {@inheritDoc} */
@Override
public void setBackground(Color color) {
for (ICdmFormElement element : getElements()) {
return persistentBackgroundColor;
}
-
- /**
- * <p>
- * widgetSelected
- * </p>
- *
- * @param e
- * a {@link org.eclipse.swt.events.SelectionEvent} object.
- */
public void widgetSelected(SelectionEvent e) {
Widget widget = e.widget;
}
}
- /** {@inheritDoc} */
@Override
public void setSelected(boolean selected) {
if (selected) {
}
}
- /** {@inheritDoc} */
@Override
public void selectionChanged(SelectionChangedEvent event) {
if (event.getSelection() == CdmFormFactory.EMPTY_SELECTION) {
}
}
- /**
- * <p>
- * addSelectionListener
- * </p>
- *
- * @param listener
- * a {@link org.eclipse.swt.events.SelectionListener} object.
- */
public void addSelectionListener(SelectionListener listener) {
addListener(SWT.Selection, new TypedListener(listener));
}
- /**
- * <p>
- * removeSelectionListener
- * </p>
- *
- * @param listener
- * a {@link org.eclipse.swt.events.SelectionListener} object.
- */
public void removeSelectionListener(SelectionListener listener) {
removeListener(SWT.Selection, listener);
}
- /** {@inheritDoc} */
@Override
public void addElement(ICdmFormElement element) {
elements.add(element);
}
- /**
- * <p>
- * removeElement
- * </p>
- *
- * @param element
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- */
protected void removeElement(ICdmFormElement element) {
elements.remove(element);
}
- /**
- * <p>
- * removeElements
- * </p>
- */
@Override
public void removeElements() {
for (Iterator<ICdmFormElement> formElementIterator = getElements().iterator();formElementIterator.hasNext();) {
}
/**
- * <p>
* Getter for the field <code>parentElement</code>.
- * </p>
- *
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
*/
@Override
public ICdmFormElement getParentElement() {
}
/**
- * <p>
* Getter for the field <code>elements</code>.
- * </p>
- *
- * @return a {@link java.util.Set} object.
*/
@Override
public Set<ICdmFormElement> getElements() {
return elements;
}
- /**
- * <p>
- * getControls
- * </p>
- *
- * @return a {@link java.util.Set} object.
- */
@Override
public Set<Control> getControls() {
Set<Control> controls = new HashSet<>();
return controls;
}
- /** {@inheritDoc} */
@Override
public void dispose() {
removeElements();
super.dispose();
}
- /**
- * <p>
- * getLayoutComposite
- * </p>
- *
- * @return a {@link org.eclipse.swt.widgets.Composite} object.
- */
@Override
public Composite getLayoutComposite() {
return (Composite) getClient();
}
- /** {@inheritDoc} */
@Override
public boolean containsFormElement(ICdmFormElement formElement) {
if (formElement == this) {
}
/**
- * <p>
* Getter for the field <code>formFactory</code>.
- * </p>
- *
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
*/
@Override
public CdmFormFactory getFormFactory() {
return formFactory;
}
- /*
- * (non-Javadoc)
- *
- * @see eu.etaxonomy.taxeditor.forms.ICdmFormElement#refresh()
- */
@Override
public void refresh() {
// empty default implementation
-
}
- /**
- * <p>
- * getConversationHolder
- * </p>
- *
- * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}
- * object.
- */
@Override
public ConversationHolder getConversationHolder() {
if(AbstractUtility.getActivePart() instanceof IConversationEnabled){
}
- /** {@inheritDoc} */
@Override
public void update(CdmDataChangeMap changeEvents) {
--- /dev/null
+/**
+* Copyright (C) 2021 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.element;
+
+import org.eclipse.swt.widgets.Composite;
+
+/**
+ * @author a.mueller
+ * @since 19.01.2021
+ */
+public abstract class AbstractRelevanceFormElement
+ extends AbstractCdmFormElement
+ implements ICacheRelevantFormElement {
+
+ protected CacheRelevanceHelper cacheRelevanceHelper = new CacheRelevanceHelper();
+
+ protected AbstractRelevanceFormElement(CdmFormFactory formFactory, Composite layoutComposite) {
+ super(formFactory, layoutComposite);
+ }
+
+ public AbstractRelevanceFormElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
+ super(formFactory, formElement);
+ }
+
+ @Override
+ public void addDependsOnCache(ToggleableTextElement toggleElement) {
+ cacheRelevanceHelper.addDependsOnCache(toggleElement);
+ }
+
+ @Override
+ public CacheRelevance cacheRelevance() {
+ return cacheRelevanceHelper.cacheRelevance();
+ }
+}
*/
public class BigDecimalWithLabelElement extends NumberWithLabelElement {
-
public BigDecimalWithLabelElement(CdmFormFactory toolkit, ICdmFormElement parentElement, String labelString,
Number initialNumber, int style) {
super(toolkit, parentElement, labelString, initialNumber, style);
/**
- *
- */
+* 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.element;
-import java.net.URI;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.browser.Browser;
import org.eclipse.swt.events.ControlEvent;
import org.eclipse.swt.graphics.Rectangle;
import org.eclipse.ui.forms.widgets.TableWrapData;
-
+import eu.etaxonomy.cdm.common.URI;
/**
* <p>BrowserElement class.</p>
* @param style a int.
* @param formFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
* @param parentElement a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
- * @param imageUri a {@link java.net.URI} object.
+ * @param imageUri a {@link eu.etaxonomy.cdm.common.URI} object.
*/
protected BrowserElement(CdmFormFactory formFactory, ICdmFormElement parentElement, URI imageUri, int style) {
super(formFactory, parentElement);
--- /dev/null
+/**
+* Copyright (C) 2021 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.element;
+
+import org.eclipse.swt.graphics.Color;
+
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
+import eu.etaxonomy.taxeditor.preference.Resources;
+
+/**
+ * @author a.mueller
+ * @since 20.01.2021
+ */
+public enum CacheRelevance{
+ CACHE1(Resources.COLOR_COMPOSITE_IRRELEVANT1, null),
+ CACHE2(Resources.COLOR_COMPOSITE_IRRELEVANT2, null),
+
+ CACHE1_2(Resources.COLOR_COMPOSITE_IRRELEVANT1_2, null),
+ CACHE1_LIGHT(Resources.COLOR_COMPOSITE_IRRELEVANT1_LIGHT, CACHE1),
+ CACHE2_LIGHT(Resources.COLOR_COMPOSITE_IRRELEVANT2_LIGHT, CACHE2),
+ CACHE1_2_LIGHT(Resources.COLOR_COMPOSITE_IRRELEVANT1_2_LIGHT, CACHE1_2),
+ NONE(Resources.COLOR_COMPOSITE_BACKGROUND, null),
+ ;
+
+ private final Color color;
+ private CacheRelevance light;
+
+
+ private CacheRelevance(String colorStr, CacheRelevance main){
+ this.color = AbstractUtility.getColor(colorStr);
+ light = this;
+ if (main != null){
+ main.light = this;
+ }
+ }
+
+ public Color getColor() {
+ return color;
+ }
+ public Color getColorLight() {
+ return color;
+ }
+
+ public Color getColor(String alternativeColorForNone) {
+ if (this == NONE){
+ return AbstractUtility.getColor(alternativeColorForNone);
+ }else{
+ return color;
+ }
+ }
+
+ public CacheRelevance addCacheRelevance(CacheRelevance that){
+ if (this == CACHE1 && that == CACHE2 || this == CACHE2 && that == CACHE1){
+ return CACHE1_2;
+ } else if (this == CACHE1_LIGHT && that == CACHE2_LIGHT || this == CACHE2_LIGHT && that == CACHE1_LIGHT){
+ return CACHE1_2_LIGHT;
+ }else {
+ return CacheRelevance.values()[Math.min(this.ordinal(), that.ordinal())];
+ }
+ }
+
+ public CacheRelevance getLight(){
+ return light;
+ }
+
+}
\ No newline at end of file
--- /dev/null
+/**
+* Copyright (C) 2021 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.element;
+
+import java.util.HashSet;
+import java.util.Set;
+
+/**
+ * @author a.mueller
+ * @date 22.01.2021
+ */
+public class CacheRelevanceHelper {
+
+ protected Set<ToggleableTextElement> cacheDependencies = new HashSet<>();
+
+ public CacheRelevance cacheRelevance() {
+ CacheRelevance result = CacheRelevance.NONE;
+ for (ToggleableTextElement cache : this.cacheDependencies){
+ if (cache != null){ //null should not happen anymore but just in case
+ if (cache.getState()){
+ result = result.addCacheRelevance(cache.getRelevance());
+ }
+ //add recursion for light dependencies
+ result = result.addCacheRelevance(cache.cacheRelevance().getLight());
+ }
+ }
+ return result;
+ }
+
+ public void addDependsOnCache(ToggleableTextElement toggleElement) {
+ if (toggleElement != null){
+ cacheDependencies.add(toggleElement);
+ }
+ }
+
+ /**
+ * For hierarchical caching
+ */
+ public ToggleableTextElement[] getDependenciesArray() {
+ return this.cacheDependencies.toArray(new ToggleableTextElement[0]);
+ }
+
+ public static void addDependsOnCacheForSubElements(AbstractFormSection<?> section,
+ ToggleableTextElement toggleElement) {
+ section.getElements().stream()
+ .filter(x -> x instanceof ICacheRelevantFormElement)
+ .forEach(
+ x->((ICacheRelevantFormElement)x).addDependsOnCache(toggleElement));
+ }
+
+ public static void updateCacheRelevanceForSubelements(AbstractFormSection<?> section) {
+ updateCacheRelevanceForSubelements(section.getElements());
+ }
+
+ public static void updateCacheRelevanceForSubelements(Set<ICdmFormElement> elements) {
+// System.out.print("setIrrelevant: " + this.getClass().getName());
+// System.out.println("");
+ elements.stream()
+ .filter(x -> x instanceof ICacheRelevantFormElement)
+ .forEach(
+ x->((ICacheRelevantFormElement)x).updateCacheRelevance());
+
+ }
+
+
+}
/**
- *
- */
+* 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.element;
-import java.net.URI;
import java.util.ArrayList;
import java.util.Comparator;
import java.util.HashSet;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
import eu.etaxonomy.cdm.common.DOI;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.agent.ORCID;
import eu.etaxonomy.cdm.model.agent.Person;
parentElement.addElement(element);
return element;
}
+
/**
* @deprecated Use {@link #createDefinedTermComboElement(TermType, ICdmFormElement, String, DefinedTermBase, int)} instead
*/
int style) {
return this.createDefinedTermComboElement(null, null, terms, parentElement, labelString, selection, true, style, false, null);
}
+
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
List<T> terms,
ICdmFormElement parentElement,
int style) {
return this.createDefinedTermComboElement(null, null, terms, parentElement, labelString, selection, addEmptyElement, style, false, null);
}
+
public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
TermType termType,
ICdmFormElement parentElement,
int style,
boolean useAbbrevLabel,
Comparator<T> comparator) {
+
if(termType!=null){
TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
adapt(element);
* </p>
*
* @param imageUri
- * a {@link java.net.URI} object.
+ * a {@link eu.etaxonomy.cdm.common.URI} object.
* @param style
* a int.
* @param parentElement
* a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
* object.
* @param imageUri
- * a {@link java.net.URI} object.
+ * a {@link eu.etaxonomy.cdm.common.URI} object.
* @param style
* a int.
* @return a {@link eu.etaxonomy.taxeditor.ui.element.ImageElement} object.
}
/**
- * <p>
- * createToggleableTextField
- * </p>
- *
- * @param parentElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param labelString
- * a {@link java.lang.String} object.
- * @param initialText
- * a {@link java.lang.String} object.
- * @param initialState
- * a boolean.
- * @param style
- * a int.
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement}
- * object.
+ * createToggleableTextField with relevance
*/
public ToggleableTextElement createToggleableTextField(ICdmFormElement parentElement, String labelString,
- String initialText, boolean initialState, int style) {
+ String initialText, boolean initialState, CacheRelevance relevance, int style) {
ToggleableTextElement element = new ToggleableTextElement(this, parentElement, labelString, initialText,
- initialState, style | orientation);
+ initialState, relevance, style | orientation);
adapt(element);
parentElement.addElement(element);
}
/**
- * <p>
+ * like {@link #createToggleableTextField(ICdmFormElement, String, String, boolean, CacheRelevance, int)}
+ * but with predefined cache relevance == 1
+ */
+ public ToggleableTextElement createToggleableTextField(ICdmFormElement parentElement, String labelString,
+ String initialText, boolean initialState, int style) {
+ return createToggleableTextField(parentElement, labelString, initialText, initialState, CacheRelevance.CACHE1, style);
+ }
+
+
+ /**
* createTimePeriodElement
- * </p>
- *
- * @param parentElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param labelString
- * a {@link java.lang.String} object.
- * @param timePeriod
- * a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
- * @param style
- * a int.
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.TimePeriodElement}
- * object.
*/
public TimePeriodElement createTimePeriodElement(ICdmFormElement parentElement, String labelString,
TimePeriod timePeriod, int style) {
}
/**
- * <p>
* createVerbatimTimePeriodElement
- * </p>
- *
- * @param parentElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param labelString
- * a {@link java.lang.String} object.
- * @param timePeriod
- * a {@link eu.etaxonomy.cdm.model.common.VerbatimTimePeriod} object.
- * @param style
- * a int.
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.VerbatimTimePeriodElement}
- * object.
*/
public VerbatimTimePeriodElement createVerbatimTimePeriodElement(ICdmFormElement parentElement, String labelString,
VerbatimTimePeriod timePeriod, int style) {
return element;
}
-
-
/**
- * <p>
* createGatheringEventUnitElement
- * </p>
- *
- * @param parentElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param labelString
- * a {@link java.lang.String} object.
- * @param timePeriod
- * a {@link eu.etaxonomy.cdm.model.common.GatheringEvent} object.
- * @param style
- * a int.
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement}
- * object.
*/
public GatheringEventUnitElement createGatheringEventUnitElement(
ICdmFormElement parentElement,
}
/**
- * <p>
* createPointElement
- * </p>
- *
- * @param style
- * a int.
- * @param parentElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param point
- * a {@link eu.etaxonomy.cdm.model.location.Point} object.
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.PointElement} object.
*/
public PointElement createPointElement(ICdmFormElement parentElement, Point point, int style) {
PointElement element = new PointElement(this, parentElement, point, style);
return element;
}
- public ReferenceDetailElement createReferenceDetailElement(ICdmFormElement parentElement, int style, boolean isWizard){
- ReferenceDetailElement element = new ReferenceDetailElement(this, parentElement, style, isWizard);
+ public ReferenceDetailElement createReferenceDetailElement(ICdmFormElement parentElement, int style){
+ ReferenceDetailElement element = new ReferenceDetailElement(this, parentElement, style);
addAndAdaptElement(parentElement, element);
return element;
}
return section;
}
-
public AbstractEntityCollectionElement createEntityCollectionElement(AbstractFormSection parentElement,
Object versionableEntity, SelectionListener removeListener, Color backgroundColor, int style) {
AbstractEntityCollectionElement<?> element = null;
* 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.element;
import org.eclipse.jface.util.PropertyChangeEvent;
* 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.element;
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.forms.widgets.TableWrapData;
-import eu.etaxonomy.taxeditor.preference.Resources;
-
/**
* <p>CheckboxElement class.</p>
*
* @author n.hoffmann
* @created Nov 5, 2009
- * @version 1.0
*/
-public class CheckboxElement extends AbstractCdmFormElement implements SelectionListener, IEnableableFormElement, ISelectable {
+public class CheckboxElement
+ extends AbstractRelevanceFormElement
+ implements SelectionListener, IEnableableFormElement, ISelectable {
private final Button checkbox;
/**
* <p>setSelection</p>
- *
- * @param selected a boolean.
*/
public void setSelection(boolean selected){
checkbox.removeSelectionListener(this);
checkbox.setSelection(selected);
checkbox.addSelectionListener(this);
}
-
/**
* <p>getSelection</p>
- *
- * @return a boolean.
*/
public boolean getSelection(){
return checkbox.getSelection();
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
- /** {@inheritDoc} */
@Override
public void widgetSelected(SelectionEvent e) {
firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e));
return checkbox;
}
- /** {@inheritDoc} */
@Override
public void widgetDefaultSelected(SelectionEvent e) {}
- /** {@inheritDoc} */
@Override
public void setSelected(boolean selected) {
- setBackground(selected ? SELECTED : getPersistentBackground());
+ setBackground(selected ? SELECTED : getPersistentBackground());
}
- /** {@inheritDoc} */
@Override
public void setEnabled(boolean enabled) {
checkbox.setEnabled(enabled);
label.setEnabled(enabled);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#isEnabled()
- */
@Override
public boolean isEnabled() {
return checkbox.isEnabled();
}
- /** {@inheritDoc} */
@Override
- public void setIrrelevant(boolean irrelevant) {
- String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
-
- Color color = getColor(colorId);
- setBackground(color);
+ public void updateCacheRelevance() {
+ Color color = cacheRelevance().getColor();
+ setCheckboxBackgroundOnly(color);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement#setBackground(org.eclipse.swt.graphics.Color)
- */
- /** {@inheritDoc} */
+ public void setCheckboxBackgroundOnly(Color color) {
+ if (checkbox.isDisposed()){
+ return;
+ }
+ checkbox.setBackground(color);
+ }
+
@Override
public void setBackground(Color color) {
- if (checkbox.isDisposed()){
- return;
- }
- checkbox.setBackground(color);
- if (label != null) {
+ setCheckboxBackgroundOnly(color);
+ if (label != null && !label.isDisposed()) {
label.setBackground(color);
}
}
- public void setIndent(int indent){
+
+ public void setIndent(int indent){
TableWrapData tableWrapData = (TableWrapData)label.getLayoutData();
if (tableWrapData == null){
tableWrapData = new TableWrapData();
tableWrapData.indent = indent;
label.setLayoutData(tableWrapData);
getLayoutComposite().layout();
-
}
-}
+}
\ No newline at end of file
+/**\r
+* Copyright (C) 2018 EDIT\r
+* European Distributed Institute of Taxonomy\r
+* http://www.e-taxonomy.eu\r
+*\r
+* The contents of this file are subject to the Mozilla Public License Version 1.1\r
+* See LICENSE.TXT at the top of this package for the full license terms.\r
+*/\r
package eu.etaxonomy.taxeditor.ui.element;\r
\r
import org.eclipse.jface.util.PropertyChangeEvent;\r
import eu.etaxonomy.taxeditor.l10n.Messages;\r
\r
public class DateDetailSection<T extends TimePeriod>\r
- extends AbstractFormSection<T> {\r
+ extends AbstractFormSection<T>\r
+ implements ICacheRelevantFormElement{\r
+\r
protected TextWithLabelElement text_freeText;\r
protected PartialElement partialElement_start;\r
protected PartialElement partialElement_end;\r
}\r
\r
/**\r
- * <p>\r
* Constructor for DateDetailSection.\r
- * </p>\r
- *\r
- * @param formFactory\r
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}\r
- * object.\r
- * @param parentElement\r
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}\r
- * object.\r
- * @param style\r
- * a int.\r
*/\r
protected DateDetailSection(CdmFormFactory formFactory,\r
ICdmFormElement parentElement, boolean includeVerbatim, int style) {\r
LayoutConstants.FILL_HORIZONTALLY(6, 1));\r
}\r
\r
-\r
-\r
text_freeText = formFactory.createTextWithLabelElement(this,\r
"Freetext", null, style);\r
text_freeText.getMainControl().setLayoutData(\r
\r
\r
/**\r
- * <p>\r
* Setter for the field <code>timePeriod</code>.\r
- * </p>\r
- *\r
- * @param timePeriod\r
- * a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.\r
*/\r
@Override\r
public void setEntity(T timePeriod) {\r
}\r
\r
/**\r
- * When setting the entity through parsing we do not want to alter the parse field\r
- * @param timePeriod\r
+ * When setting the entity through parsing we do not want\r
+ * to alter the parse field\r
*/\r
protected void setEntityInternally(T timePeriod){\r
Partial start = timePeriod.getStart();\r
super.setEntity(timePeriod);\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
public void propertyChange(PropertyChangeEvent event) {\r
if (event == null) {\r
}\r
}\r
\r
- /**\r
- * @param event\r
- */\r
private void handleException(CdmPropertyChangeEvent event) {\r
firePropertyChangeEvent(new CdmPropertyChangeEvent(this,\r
event.getException()));\r
firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));\r
}\r
\r
-// protected abstract T parseNewInstance() ;\r
-\r
protected void updateTitle(){\r
String title = CdmUtils.Nz(getEntity().toString());\r
this.setText(title);\r
layout();\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
public void dispose() {\r
formFactory.removePropertyChangeListener(this);\r
public void setText_parseText(TextWithLabelElement text_parseText) {\r
this.text_parseText = text_parseText;\r
}\r
-}\r
+\r
+ @Override\r
+ public void updateCacheRelevance() {\r
+ CacheRelevanceHelper.updateCacheRelevanceForSubelements(this);\r
+ }\r
+\r
+ @Override\r
+ public void addDependsOnCache(ToggleableTextElement toggleElement) {\r
+ CacheRelevanceHelper.addDependsOnCacheForSubElements(this, toggleElement);\r
+ }\r
+\r
+ @Override\r
+ public CacheRelevance cacheRelevance() {\r
+ return null;\r
+ }\r
+}
\ No newline at end of file
--- /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.element;
+
+/**
+ * IRelevantFormElement interface.
+ *
+ * @author n.hoffmann
+ * @created May 10, 2010
+ */
+public interface ICacheRelevantFormElement {
+
+ /**
+ * Update the relevance state of the element.
+ * Usually the results in a color change.
+ * Containers may sent this to their subelements.
+ */
+ public void updateCacheRelevance();
+
+ /**
+ * Registers this element as being dependend on the
+ * given cache element (ToggleableTextElement).
+ * An element may depend on multiple cache elements.
+ */
+ public void addDependsOnCache(ToggleableTextElement toggleElement);
+
+ /**
+ * Computes the cache relevance for this element.
+ * The cache relevance depends on the registered cache elements
+ * and on their state.
+ */
+ public CacheRelevance cacheRelevance();
+
+}
\ No newline at end of file
* 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.element;
-
/**
- * <p>IEnableableFormElement interface.</p>
+ * IEnableableFormElement interface.
*
* @author n.hoffmann
* @created Mar 10, 2010
- * @version 1.0
*/
-public interface IEnableableFormElement extends IRelevantFormElement {
+public interface IEnableableFormElement {
/**
* Sets composites of this element to the given enablement state.
* 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.element;
-
-
/**
* Any composite that represent a cdm entity should implement
* this interface. Selection of CdmEntity data will rely on this
*
* @author n.hoffmann
* @created Feb 16, 2010
- * @version 1.0
*/
public interface IEntityElement<ENTITY> extends ICdmFormElement, ISelectable {
* @return a ENTITY object.
*/
public ENTITY getEntity();
-}
+}
\ No newline at end of file
+++ /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.element;
-
-
-/**
- * <p>IRelevantFormElement interface.</p>
- *
- * @author n.hoffmann
- * @created May 10, 2010
- * @version 1.0
- */
-public interface IRelevantFormElement {
-
- /**
- * <p>setIrrelevant</p>
- *
- * @param irrelevant a boolean.
- */
- public void setIrrelevant(boolean irrelevant);
-
-}
/**
* Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy
+* 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.element;
import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Display;
-
/**
* <p>ISelectable interface.</p>
*
* @author n.hoffmann
* @created Feb 22, 2010
- * @version 1.0
*/
public interface ISelectable{
-
+
/** Constant <code>SELECTED</code> */
public static Color SELECTED = Display.getCurrent().getSystemColor(SWT.COLOR_LIST_SELECTION);
/** Constant <code>NOT_SELECTED</code> */
public static Color NOT_SELECTED = Display.getCurrent().getSystemColor(SWT.COLOR_WHITE);
-
+
/**
* <p>setSelected</p>
*
* @param selected a boolean.
*/
public void setSelected(boolean selected);
-}
+}
\ No newline at end of file
* 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.element;
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
import org.apache.http.HttpException;
import org.eclipse.core.runtime.IProgressMonitor;
/**
* @author n.hoffmann
* @created Sep 24, 2010
- * @version 1.0
*/
public class ImageElement extends AbstractCdmFormElement implements PaintListener{
/**
* @author pplitzner
* @since Jul 17, 2019
- *
*/
public class LoadImageJob extends Job {
public LoadImageJob(String name) {
/**
* @author n.hoffmann
*/
-public class TextWithLabelElement extends AbstractCdmFormElement implements ModifyListener, IEnableableFormElement,
- ISelectable {
+public class TextWithLabelElement
+ extends AbstractRelevanceFormElement
+ implements ModifyListener, IEnableableFormElement, ISelectable {
protected Text text;
private Label label;
* a {@link java.lang.String} object.
*/
public void setText(String string) {
- StoreUtil.setTextWithoutModifyListeners(text, string);
+ StoreUtil.setTextWithoutModifyListeners(text, string != null? string.trim(): string);
}
@Override
@Override
- public void setIrrelevant(boolean irrelevant) {
- String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
-
- Color color = getColor(colorId);
+ public void updateCacheRelevance() {
+ Color color = cacheRelevance().getColor();
text.setBackground(color);
}
text.setForeground(color);
}
+ @Override
+ public String toString() {
+ if (label != null){
+ return CdmUtils.concat("", "TextWithLabelElement[", label.getText(),"]");
+ }else{
+ return super.toString();
+ }
+ }
}
* 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.element;
-import org.eclipse.ui.forms.widgets.Section;
+import org.eclipse.ui.forms.widgets.ExpandableComposite;
import eu.etaxonomy.cdm.model.common.TimePeriod;
/**
- * <p>
* TimePeriodElement class.
- * </p>
*
* @author n.hoffmann
* @created Nov 17, 2009
public class TimePeriodElement
extends TimePeriodElementBase<TimePeriod> {
-
public TimePeriodElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString,
TimePeriod timePeriod, int style) {
super(formFactory, parentElement, labelString, timePeriod, style);
@Override
protected DateDetailSection<TimePeriod> createDateDetailSection() {
return formFactory.createDateDetailSection(this,
- Section.TWISTIE);
+ ExpandableComposite.TWISTIE);
}
-
-}
+}
\ No newline at end of file
+/**
+* Copyright (C) 2018 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.element;
import org.eclipse.jface.util.PropertyChangeEvent;
import eu.etaxonomy.cdm.model.common.TimePeriod;
public abstract class TimePeriodElementBase<T extends TimePeriod>
- extends AbstractCdmFormElement
+ extends AbstractRelevanceFormElement
implements ISelectable {
protected T timePeriod;
protected DateDetailSection<T> section_dateDetails;
/**
- * <p>
* Constructor for TimePeriodElement.
- * </p>
- *
- * @param style
- * a int.
- * @param formFactory
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
- * object.
- * @param parentElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param labelString
- * a {@link java.lang.String} object.
- * @param timePeriod
- * a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
*/
public TimePeriodElementBase(CdmFormFactory formFactory,
ICdmFormElement parentElement, String labelString,
label.setText(string);
}
-}
+ @Override
+ public void updateCacheRelevance() {
+ if (section_dateDetails != null){
+ section_dateDetails.updateCacheRelevance();
+ }
+ }
+
+ @Override
+ public void addDependsOnCache(ToggleableTextElement cacheElement) {
+ if (section_dateDetails != null){
+ section_dateDetails.addDependsOnCache(cacheElement);
+ }
+ }
+}
\ No newline at end of file
* 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.element;
import java.util.HashSet;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
+import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
import eu.etaxonomy.taxeditor.model.ImageResources;
*
* @author n.hoffmann
* @created Nov 18, 2009
- * @version 1.0
*/
-public class ToggleableTextElement extends AbstractCdmFormElement implements SelectionListener, ModifyListener, IEnableableFormElement, ISelectable {
+public class ToggleableTextElement
+ extends AbstractRelevanceFormElement
+ implements SelectionListener, ModifyListener, IEnableableFormElement, ISelectable {
private final Text text_cache;
private final Button btnToggleProtectTitleCache;
private boolean state;
- private final Set<SelectionListener> selectionListener = new HashSet<SelectionListener>();
+ private final Set<SelectionListener> selectionListener = new HashSet<>();
private final Label label;
private final Composite container;
+ private final CacheRelevance relevance;
//TODO for RL
public void setVisible(boolean b) {
}
protected ToggleableTextElement(CdmFormFactory formFactory, ICdmFormElement parentElement,
- String labelString, String initialText, boolean initialState, int style) {
+ String labelString, String initialText, boolean initialState,
+ CacheRelevance relevance, int style) {
super(formFactory, parentElement);
label = formFactory.createLabel(getLayoutComposite(), labelString, style);
text_cache.addModifyListener(this);
text_cache.setLayoutData(LayoutConstants.FILL());
-
// Don't accept carriage returns as input
text_cache.addKeyListener( new KeyAdapter(){
@Override
addControl(btnToggleProtectTitleCache);
btnToggleProtectTitleCache.addSelectionListener(this);
+ this.relevance = relevance;
setState(initialState);
}
return text_cache.isEnabled();
}
+ public CacheRelevance getRelevance() {
+ return this.relevance;
+ }
+
public boolean getState(){
return state;
}
}
@Override
- public void setIrrelevant(boolean irrelevant) {
- String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
-
- Color color = getColor(colorId);
+ public void updateCacheRelevance() {
+ Color color = cacheRelevance().getColor();
text_cache.setBackground(color);
}
- @Override
+ @Override
public void setBackground(Color color) {
label.setBackground(color);
container.setBackground(color);
public void setSelected(boolean selected) {
setBackground(selected ? SELECTED : getPersistentBackground());
}
-}
+
+ @Override
+ public String toString() {
+ if (label != null){
+ return CdmUtils.concat("", "ToggleableTextElement[", label.getText(),"]");
+ }else{
+ return super.toString();
+ }
+ }
+
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.ui.element;
import java.io.IOException;
-import java.net.URI;
import java.net.URL;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Composite;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.common.UrlUtf8Coder;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.ImageResources;
protected URI getParsedText() throws Exception {
String uriText = super.getText();
if(uriText!=null){
- try{
- return new URI(super.getText());
- }catch(Exception e){
- URL url = new URL(uriText);
- String[] pathElements = url.getPath().split("/");
-
- for (String element: pathElements){
- String replacement = UrlUtf8Coder.encode(element);
- uriText = uriText.replace(element, replacement);
- }
- if (url.getQuery() != null){
- uriText = uriText.replace(url.getQuery(), UrlUtf8Coder.encode(url.getQuery()));
- }
- url = new URL(uriText);
- return url.toURI();
- }
+ return new URI(super.getText());
+ }else{
+ return null;
}
- return null;
}
}
/**
* @author k.luther
* @since 15.05.2018
- *
*/
-public class VerbatimTimePeriodElement
+public class VerbatimTimePeriodElement
extends TimePeriodElementBase<VerbatimTimePeriod> {
-
+
public VerbatimTimePeriodElement(CdmFormFactory formFactory, ICdmFormElement parentElement, String labelString,
VerbatimTimePeriod timePeriod, int style) {
super(formFactory, parentElement, labelString, timePeriod, style);
}
/**
- * <p>
* Setter for the field <code>timePeriod</code>.
- * </p>
- *
- * @param timePeriod
- * the timePeriod to set
*/
@Override
public void setTimePeriod(VerbatimTimePeriod timePeriod) {
super.setTimePeriod(timePeriod);
}
-
-
-
-
-}
+}
\ No newline at end of file
/**
* Basic implementation of {@link ICdmComposite}.
+ *
* @author pplitzner
* @date 11.02.2014
*
protected T controller;
- /**
- * @param parent
- * @param style
- */
public AbstractCdmComposite(Composite parent, int style) {
super(parent, style);
}
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.mvc.interfaces.CdmComposite#initController(eu.etaxonomy.taxeditor.ui.element.CdmFormFactory, eu.etaxonomy.taxeditor.ui.element.ICdmFormElement)
- */
@Override
public void initController(CdmFormFactory formFactory, ICdmFormElement parentElement) {
initInternalController(formFactory, parentElement);
initChildController(formFactory, parentElement);
}
- /**
- * @param formFactory
- * @param parentElement
- * @return
- */
protected abstract void initInternalController(CdmFormFactory formFactory, ICdmFormElement parentElement);
@Override
public T getController(){
return controller;
}
-
-}
+}
\ No newline at end of file
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Composite;
-import eu.etaxonomy.cdm.model.term.IEnumTerm;
-import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
+import eu.etaxonomy.cdm.model.reference.OriginalSourceType;
import eu.etaxonomy.cdm.model.reference.ReferenceType;
+import eu.etaxonomy.cdm.model.term.IEnumTerm;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
-import eu.etaxonomy.taxeditor.preference.Resources;
-import eu.etaxonomy.taxeditor.store.StoreUtil;
-import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.AbstractRelevanceFormElement;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
/**
* @author pplitzner
* @date 29.01.2014
- *
*/
-public class EnumTermComboController<T extends IEnumTerm<T>> extends AbstractCdmFormElement implements SelectionListener,
-IEnableableFormElement, ISelectable, CdmCompositeController {
+public class EnumTermComboController<T extends IEnumTerm<T>>
+ extends AbstractRelevanceFormElement
+ implements SelectionListener, IEnableableFormElement, ISelectable, CdmCompositeController {
- private static CdmEnumDataHolder[] cdmEnumDataHolders = {
+ private static CdmEnumDataHolder<?>[] cdmEnumDataHolders = {
new CdmEnumDataHolder<NomenclaturalCode>(){
@Override
private final Class<T> enumType;
/**
- * <p>
* Constructor for AbstractEnumComboElement.
- * </p>
- *
- * @param formFactory
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
- * object.
- * @param parentElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param labelString
- * a {@link java.lang.String} object.
- * @param <T>
- * a T object.
*/
public EnumTermComboController(Combo combo, CdmFormFactory formFactory,
ICdmFormElement parentElement, Class<T> enumType, int style) {
populateTypes();
combo.addSelectionListener(this);
-
- }
-
- private String getDefaultLabelString() {
- if(enumType.equals(ReferenceType.class)){
- return "Reference Type";
- } else if (enumType.equals(NomenclaturalCode.class)){
- return "Nomenclatural Code";
- } else if(enumType.equals(OriginalSourceType.class)) {
- return "Orig. Source Type";
- } else if(enumType.equals(SpecimenOrObservationType.class)) {
- return "Spec./Obs. Type";
- }
- return "No Label";
}
/**
- * <p>
* populateTypes
- * </p>
*/
private void populateTypes(){
Collection<T> elementsForClass = getElementsForClass(enumType);
}
}
- /**
- * <p>
- * Setter for the field <code>selection</code>.
- * </p>
- *
- * @param selection
- * the selection to set
- */
public void setSelection(T selection) {
this.selection = selection;
combo.select(elementTypeList.indexOf(selection));
}
- /**
- * <p>
- * addSelectionListener
- * </p>
- *
- * @param listener
- * a {@link org.eclipse.swt.events.SelectionListener} object.
- */
public void addSelectionListener(SelectionListener listener) {
combo.addSelectionListener(listener);
}
- /**
- * <p>
- * removeSelectionListener
- * </p>
- *
- * @param listener
- * a {@link org.eclipse.swt.events.SelectionListener} object.
- */
public void removeSelectionListener(SelectionListener listener) {
combo.removeSelectionListener(listener);
}
- /** {@inheritDoc} */
@Override
public void setSelected(boolean selected) {
setBackground(selected ? SELECTED : getPersistentBackground());
}
- /**
- * <p>
- * Getter for the field <code>selection</code>.
- * </p>
- *
- * @return the selection
- */
public T getSelection() {
return selection;
}
- /** {@inheritDoc} */
@Override
public void setEnabled(boolean enabled) {
combo.setEnabled(enabled);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#isEnabled()
- */
@Override
public boolean isEnabled() {
return combo.isEnabled();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt
- * .events.SelectionEvent)
- */
- /** {@inheritDoc} */
@Override
public void widgetSelected(SelectionEvent e) {
selection = elementTypeList.get(combo.getSelectionIndex());
}
- /** {@inheritDoc} */
@Override
- public void setIrrelevant(boolean irrelevant) {
- String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT
- : Resources.COLOR_COMPOSITE_BACKGROUND;
-
- Color color = StoreUtil.getColor(colorId);
+ public void updateCacheRelevance() {
+ Color color = cacheRelevance().getColor();
combo.setBackground(color);
}
- /** {@inheritDoc} */
@Override
public void setBackground(Color color) {
// label.setBackground(color);
}
- /** {@inheritDoc} */
@Override
public void widgetDefaultSelected(SelectionEvent e) {
}
}
private CdmEnumDataHolder<T> getCdmEnumDataHolderForClass(Class<T> clazz){
- for (CdmEnumDataHolder dataHolder : cdmEnumDataHolders) {
+ for (CdmEnumDataHolder<?> dataHolder : cdmEnumDataHolders) {
if (dataHolder.getClazz().equals(clazz)){
- return dataHolder;
+ return (CdmEnumDataHolder<T>)dataHolder;
}
}
return null;
String getName();
Collection<T> getElements();
}
-}
+}
\ No newline at end of file
*/
package eu.etaxonomy.taxeditor.ui.mvc.element;
-
-
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
import org.joda.time.DateTimeZone;
import eu.etaxonomy.taxeditor.model.ImageResources;
+import eu.etaxonomy.taxeditor.ui.element.CacheRelevance;
+import eu.etaxonomy.taxeditor.ui.element.CacheRelevanceHelper;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICacheRelevantFormElement;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
import eu.etaxonomy.taxeditor.ui.mvc.AbstractCdmComposite;
/**
* @author pplitzner
* @date 16.06.2014
- *
*/
-public class DateElement extends AbstractCdmComposite<DateElementController> {
+public class DateElement
+ extends AbstractCdmComposite<DateElementController>
+ implements ICacheRelevantFormElement {
+
+ private static final String pattern = "yyyy-MM-dd HH:mm";
private final FormToolkit toolkit = new FormToolkit(Display.getCurrent());
private org.joda.time.DateTime initialDateTime;
- private Text textDate;
+ private final Text textDate;
private final Button openDateDialog;
- private static final String pattern = "yyyy-MM-dd HH:mm";
-
+ protected CacheRelevanceHelper cacheRelevanceHelper = new CacheRelevanceHelper();
/**
* Create the composite.
- * @param parent
- * @param style
*/
public DateElement(Composite parent, org.joda.time.DateTime initDateTime, String label, int style, boolean editableText) {
super(parent, style);
this.initialDateTime = initDateTime.toDateTime(DateTimeZone.UTC);
}
-
addDisposeListener(new DisposeListener() {
@Override
public void widgetDisposed(DisposeEvent e) {
// time.setSeconds(initialDateTime.getSecondOfMinute());
}
-
// new Label (dialog, SWT.NONE);
// new Label (dialog, SWT.NONE);
Button ok = new Button (dialog, SWT.PUSH);
return textDate;
}
-
-
-
public static org.joda.time.DateTime makeZonedTimeFromSWT(
org.eclipse.swt.widgets.DateTime widget,
org.eclipse.swt.widgets.DateTime dateTime) {
widget.setDay(dateTime.getDay());
widget.setHours(dateTime.getHours());
widget.setMinutes(dateTime.getMinutes());
-
}
public void setData (org.joda.time.DateTime data) {
this.textDate.setText(initialDateTime.toString(pattern));
}
-}
+ @Override
+ public void updateCacheRelevance() {
+ textDate.setBackground(cacheRelevance().getColor());
+ }
+
+ @Override
+ public void addDependsOnCache(ToggleableTextElement cacheElement) {
+ cacheRelevanceHelper.addDependsOnCache(cacheElement);
+ }
+
+ @Override
+ public CacheRelevance cacheRelevance() {
+ return cacheRelevanceHelper.cacheRelevance();
+ }
+}
\ No newline at end of file
*/
package eu.etaxonomy.taxeditor.ui.mvc.element;
-
-import java.time.ZonedDateTime;
-import java.time.format.DateTimeFormatter;
-
import org.eclipse.swt.events.ModifyEvent;
import org.eclipse.swt.events.ModifyListener;
import org.eclipse.swt.widgets.Text;
import org.joda.time.DateTime;
-import org.joda.time.LocalDateTime;
-import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.AbstractRelevanceFormElement;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
/**
* @author pplitzner
* @date 16.06.2014
- *
*/
-public class DateElementController extends AbstractCdmFormElement implements IEnableableFormElement, CdmCompositeController, ModifyListener{
+public class DateElementController
+ extends AbstractRelevanceFormElement
+ implements IEnableableFormElement, CdmCompositeController, ModifyListener {
private final Text textDate;
private DateTime dateTime;
- /**
- * @param dateTimeElement
- * @param formFactory
- * @param parentElement
- * @param initialDateTime
- * @param none
- */
- public DateElementController(DateElement dateTimeElement, CdmFormFactory formFactory,
+ public DateElementController(DateElement dateTimeElement, CdmFormFactory formFactory,
ICdmFormElement parentElement, DateTime initialDateTime) {
super(formFactory, parentElement);
this.textDate = dateTimeElement.getTextDate();
// if (initialDateTime != null){
// this.textDate.setText(initialDateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm")));
// }
- this.textDate.setText(initialDateTime!=null?initialDateTime.toString("yyyy-MM-dd HH:mm"):"");
+ this.textDate.setText(initialDateTime!=null?initialDateTime.toString("yyyy-MM-dd HH:mm"):"");
addControl(textDate);
dateTime = initialDateTime;
textDate.addModifyListener(this);
}
-
+
// public DateElementController(DateElementFormElement dateTimeElement, CdmFormFactory formFactory, DateTime initialDateTime) {
// super(formFactory, dateTimeElement);
// this.textDate = dateTimeElement.getTextDate();
public DateTime getDateTime(){
return dateTime;
- }
+ }
public void setDateTime(DateTime date){
dateTime = date;
- }
-
- @Override
- public void setIrrelevant(boolean irrelevant) {
- // TODO Auto-generated method stub
}
@Override
return textDate.isEnabled();
}
-}
+ @Override
+ public void updateCacheRelevance() {
+ System.out.println("updateCacheRelevance not yet implemented for " + this.getClass().getName());
+ }
+}
\ No newline at end of file
/**
- *
- */
+* Copyright (C) 2014 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.mvc.element;
import org.eclipse.swt.SWT;
import eu.etaxonomy.taxeditor.preference.Resources;
import eu.etaxonomy.taxeditor.store.StoreUtil;
-import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.AbstractRelevanceFormElement;
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;
/**
- * <p>
* TextWithLabelElement class.
- * </p>
*
* @author n.hoffmann
*/
-public class TextWithLabelElementController extends AbstractCdmFormElement implements ModifyListener, IEnableableFormElement,
- ISelectable, CdmCompositeController {
+public class TextWithLabelElementController
+ extends AbstractRelevanceFormElement
+ implements ModifyListener, IEnableableFormElement, ISelectable, CdmCompositeController {
protected Text text;
// private Label label;
public static final int SINGLE = -1;
/**
- * <p>
* Constructor for TextWithLabelElement.
- * </p>
- *
- * @param formFactory
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
- * object.
- * @param parentElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param labelString
- * a {@link java.lang.String} object.
- * @param initialText
- * a {@link java.lang.String} object.
- * @param textHeight
- * a {@link java.lang.Integer} object.
- * @param style
- * a int.
- * @wbp.parser.entryPoint
*/
public TextWithLabelElementController(TextWithLabelElementMVC textWithLabelElement, CdmFormFactory formFactory, ICdmFormElement parentElement,
String initialText, Integer textHeight, int style) {
/**
* Get the text of this composites text composite
- *
- * @return a {@link java.lang.String} object.
*/
public String getText() {
return text.getText();
/**
* Set the text of this composites text composite
- *
- * @param string
- * a {@link java.lang.String} object.
*/
public void setText(String string) {
StoreUtil.setTextWithoutModifyListeners(text, string);
}
@Override
- public void setIrrelevant(boolean irrelevant) {
- String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
-
- Color color = getColor(colorId);
+ public void updateCacheRelevance() {
+ Color color = cacheRelevance().getColor();
text.setBackground(color);
}
}
/**
- * <p>
* getMainControl
- * </p>
- *
- * @return a {@link org.eclipse.swt.widgets.Control} object.
*/
public Control getMainControl() {
return text;
}
/**
- * <p>
* setTextLimit
- * </p>
- *
- * @param limit
- * a int.
*/
public void setTextLimit(int limit) {
text.setTextLimit(limit);
* 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.openurl;
-import java.net.URI;
-
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.model.reference.Reference;
/**
* @author n.hoffmann
* @created Feb 3, 2011
- * @version 1.0
*/
public interface IOpenUrlEnabled {
public void setOpenUrl(URI uri);
- /**
- * @return
- */
public Reference getReference();
- /**
- * @return
- */
- public String getDetail();
-
-}
+ public String getDetail();
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.ui.openurl;
-import java.net.URI;
import java.util.List;
import org.eclipse.jface.operation.IRunnableWithProgress;
import org.eclipse.swt.widgets.Label;
import org.eclipse.ui.forms.widgets.ScrolledForm;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.ext.openurl.OpenUrlReference;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.ui.element.ImageElement;
/**
* @author n.hoffmann
* @created Jan 31, 2011
- * @version 1.0
*/
public class OpenUrlReferencePage extends WizardPage implements SelectionListener {
private Label label_pageNumber;
- /**
- * @param pageName
- */
protected OpenUrlReferencePage() {
super(NAME);
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createControl(Composite parent) {
container = getWizard().getFormFactory().createComposite(parent, SWT.NULL);
return (OpenUrlSelectorWizard) super.getWizard();
}
- /**
- * @param jpegImage
- */
public void displayImage() {
URI imageUri = getWizard().getOpenUrlReferenceImageUri();
try {
}
}
- /**
- *
- */
private void configurePageBar() {
setTitle(getWizard().getOpenUrlReference().getTitleCache());
String pageNumber = getWizard().getOpenUrlReference().getPages();
button_next.setEnabled(canPage(NEXT));
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
@Override
public void widgetSelected(SelectionEvent e) {
if(e.getSource() == button_next){
return true;
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
- */
@Override
public void widgetDefaultSelected(SelectionEvent e) {}
-}
+}
\ No newline at end of file
* 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.openurl;
import org.eclipse.core.runtime.IStatus;
/**
* @author n.hoffmann
* @created Jan 31, 2011
- * @version 1.0
*/
public class OpenUrlSelectorElement extends AbstractCdmFormElement implements SelectionListener{
button.addSelectionListener(this);
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt.events.SelectionEvent)
- */
@Override
public void widgetSelected(SelectionEvent e) {
if(openUrlEnabled.getReference() == null){
}
}
- /**
- * @return
- */
public String getDetail() {
return referenceDetail;
}
this.referenceDetail = referenceDetail;
}
- /* (non-Javadoc)
- * @see org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse.swt.events.SelectionEvent)
- */
@Override
public void widgetDefaultSelected(SelectionEvent e) {}
- /**
- * @param reference the reference to set
- */
public void setReference(Reference reference) {
this.reference = reference;
}
- /**
- * @return the reference
- */
public Reference getReference() {
return reference;
}
-}
+}
\ No newline at end of file
* 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.openurl;
-import java.net.URI;
import java.util.List;
import org.eclipse.jface.wizard.Wizard;
import org.eclipse.swt.widgets.Display;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.ext.openurl.MobotOpenUrlQuery;
import eu.etaxonomy.cdm.ext.openurl.MobotOpenUrlServiceWrapper;
import eu.etaxonomy.cdm.ext.openurl.MobotOpenUrlServiceWrapper.ReferenceType;
/**
* @author n.hoffmann
* @created Jan 31, 2011
- * @version 1.0
*/
public class OpenUrlSelectorWizard extends Wizard {
private final String referenceDetail;
-
-
/**
* @param openUrlSelectorElement
* @param reference
query.startPage = referenceDetail;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#addPages()
- */
@Override
public void addPages() {
super.addPages();
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.Wizard#performFinish()
- */
@Override
public boolean performFinish() {
return true;
}
- /**
- * @param openUrlReference the openUrlReference to set
- */
public void setOpenUrlReference(OpenUrlReference openUrlReference) {
this.openUrlReference = openUrlReference;
this.openUrlReferenceImageUri = openUrlReference.getJpegImage(PreferencesUtil.getIntValue(PreferencePredicate.MobotOpenUrlServiceMaxWidth.getKey(), true)
, PreferencesUtil.getIntValue(PreferencePredicate.MobotOpenUrlServiceMaxHeight.getKey(), true));
}
-
- /**
- * @return the openUrlReference
- */
public OpenUrlReference getOpenUrlReference() {
return openUrlReference;
}
- /**
- * @return
- */
public List<OpenUrlReference> getResult() {
return openUrlServiceWrapper.doResolve(query);
}
- /**
- * @return the formFactory
- */
public CdmFormFactory getFormFactory() {
return formFactory;
}
- /**
- * @return the openUrlServiceWrapper
- */
public MobotOpenUrlServiceWrapper getOpenUrlServiceWrapper() {
return openUrlServiceWrapper;
}
- /**
- * @return
- */
public URI getOpenUrlReferenceImageUri() {
return openUrlReferenceImageUri;
}
public String getReferenceDetail() {
return referenceDetail;
}
-}
+}
\ No newline at end of file
* 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;
import java.util.ArrayList;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.LoginManager;
import eu.etaxonomy.taxeditor.store.StoreUtil;
-import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.AbstractRelevanceFormElement;
+import eu.etaxonomy.taxeditor.ui.element.CacheRelevance;
+import eu.etaxonomy.taxeditor.ui.element.CacheRelevanceHelper;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
+import eu.etaxonomy.taxeditor.ui.element.ICacheRelevantFormElement;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
import eu.etaxonomy.taxeditor.ui.element.LabelElement;
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
+import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
/**
* @author n.hoffmann
* @created Feb 26, 2010
*/
-public abstract class AbstractCdmDetailElement<T> extends AbstractCdmFormElement implements ICdmDetailElement<T>, Observer{
+public abstract class AbstractCdmDetailElement<T>
+ extends AbstractRelevanceFormElement
+ implements ICdmDetailElement<T>, Observer{
private T entity;
- private boolean irrelevant;
-
protected boolean enabled = true;
private LabelElement warnForReferencedObjects;
/**
* Sets all field to the given enablement state except the objects in
- * collection except
+ * the collection except parameter.
*
* @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#setEnabled(boolean)
- * @param enabled
- * a boolean.
- * @param except
- * a {@link java.util.Collection} object.
*/
public void setEnabled(boolean enabled, Collection<Object> except) {
this.enabled = enabled;
return enabled;
}
- /**
- * <p>
- * Setter for the field <code>irrelevant</code>.
- * </p>
- *
- * @param irrelevant
- * a boolean.
- * @param except
- * a {@link java.util.Collection} object.
- */
- public void setIrrelevant(boolean irrelevant, Collection<Object> except) {
- // logger.warn("Setting " + this.getClass().getSimpleName() +
- // " to irrelevant state: " + irrelevant);
- for (ICdmFormElement element : getElements()) {
- if (element instanceof IEnableableFormElement) {
- IEnableableFormElement relevantElement = (IEnableableFormElement) element;
- if (except != null && except.contains(relevantElement)) {
- // do nothing
- // logger.warn("not setting elements irrelevance: " +
- // relevantElement.getClass().getSimpleName() + " in :" +
- // this.getClass().getSimpleName());
- } else {
- relevantElement.setIrrelevant(irrelevant);
- }
- }
- }
- }
-
- @Override
+ @Override
public void setEnabled(boolean enabled) {
- setEnabled(enabled, null);
- }
+ setEnabled(enabled, null);
+ }
+
+ @Override
+ public CacheRelevance cacheRelevance() {
+ return cacheRelevanceHelper.cacheRelevance();
+ }
+
+ @Override
+ public void addDependsOnCache(ToggleableTextElement toggleElement) {
+ cacheRelevanceHelper.addDependsOnCache(toggleElement);
+ }
+
+ protected void registerCacheRelevance(ICacheRelevantFormElement element, ToggleableTextElement... toggleableCaches) {
+ if (element != null && toggleableCaches != null) {
+ for (ToggleableTextElement toggleableCache : toggleableCaches){
+ if (toggleableCache != null){
+ element.addDependsOnCache(toggleableCache);
+ }
+ }
+ }
+// updateCacheRelevance();
+ }
+ /**
+ * Updates the cache relevance state of all internal elements of this
+ * AbstractCdmDetailElement.
+ */
@Override
- public void setIrrelevant(boolean irrelevant) {
- this.irrelevant = irrelevant;
- setIrrelevant(irrelevant, null);
+ public void updateCacheRelevance(){
+ CacheRelevanceHelper.updateCacheRelevanceForSubelements(getElements());
}
/**
if (eventSource instanceof ICdmFormElement) {
ICdmFormElement eventElement = (ICdmFormElement) eventSource;
- ICdmFormElement eventElementContainer = eventElement
- .getParentElement();
- ICdmFormElement parent = this.getParentElement();
+ ICdmFormElement eventElementContainer = eventElement.getParentElement();
if (eventElementContainer == this) {
if (event instanceof CdmPropertyChangeEvent) {
if (((CdmPropertyChangeEvent) event).hasException()) {
isRelevant &= this instanceof AbstractIdentifiableEntityDetailElement;
if (isRelevant) {
- ((AbstractIdentifiableEntityDetailElement) this)
- .updateToggleableCacheField();
+ ((AbstractIdentifiableEntityDetailElement<?>)this).updateToggleableCacheField();
}
}
private void updateParentSection() {
if (getParentElement() instanceof AbstractCdmDetailSection) {
- ((AbstractCdmDetailSection) getParentElement()).updateTitle();
+ ((AbstractCdmDetailSection<?>) getParentElement()).updateTitle();
}
//NOTE: This slows down the rendering of the details view
// StoreUtil.reflowParentScrolledForm(getLayoutComposite(), true);
MessagingUtils.error(event.getSource().getClass(), event.getException());
}
- public boolean isIrrelevant() {
- return irrelevant;
- }
-
@Override
public ConversationHolder getConversationHolder() {
if (getParentElement() instanceof IConversationEnabled) {
getWarnForReferencedObjects().setLayout(LayoutConstants.FILL(2, 3));
getWarnForReferencedObjects().setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
formFactory.createLabel(formElement, "");
-
}
}
}
getWarnForReferencedObjects().setVisible(isVisible);
}
}
-
-}
+}
\ No newline at end of file
* 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;
import java.util.ArrayList;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.StoreUtil;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
+import eu.etaxonomy.taxeditor.ui.element.CacheRelevance;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICacheRelevantFormElement;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
import eu.etaxonomy.taxeditor.ui.element.ISelectableElement;
+import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
/**
* This class visualizes an CDM entity of type ENTITY.
*/
public abstract class AbstractCdmDetailSection<ENTITY>
extends AbstractFormSection<ENTITY>
- implements IEnableableFormElement, IExpansionListener {
+ implements IEnableableFormElement, IExpansionListener, ICacheRelevantFormElement {
protected AbstractCdmDetailElement<ENTITY> detailElement;
this(formFactory, null, conversation, parentElement, selectionProvider, style);
}
+ //TODO remove conversation
public AbstractCdmDetailSection(CdmFormFactory formFactory, Class<ENTITY> clazz,
ConversationHolder conversation, ICdmFormElement parentElement,
ISelectionProvider selectionProvider, int style) {
public abstract String getHeading();
- /** {@inheritDoc} */
@Override
public void dispose() {
if (detailElement instanceof ISelectableElement) {
super.dispose();
}
- /** {@inheritDoc} */
@Override
public void setBackground(Color color) {
if (detailElement != null) {
super.setEntity(entity);
setSectionTitle();
layout();
-
}
protected void setSectionTitle() {
}
}
if(CdmUtils.isBlank(label)){
- label = ((IdentifiableEntity) getEntity()).getTitleCache();
+ label = ((IdentifiableEntity<?>) getEntity()).getTitleCache();
}
if(CdmUtils.isBlank(label)){
- label = ((IdentifiableEntity) getEntity()).generateTitle();
+ label = ((IdentifiableEntity<?>) getEntity()).generateTitle();
}
title = ": " + label;
}
}
}
- /** {@inheritDoc} */
- @Override
- public void setIrrelevant(boolean irrelevant) {
- if (detailElement != null) {
+ @Override
+ public void updateCacheRelevance() {
+ if (detailElement != null) {
+ detailElement.updateCacheRelevance();
+ }
+ }
- detailElement.setIrrelevant(irrelevant);
- }
- }
+ @Override
+ public void addDependsOnCache(ToggleableTextElement toggleElement) {
+ if (detailElement != null) {
+ detailElement.addDependsOnCache(toggleElement);
+ }
+ }
- /** {@inheritDoc} */
- @Override
+ @Override
+ public CacheRelevance cacheRelevance() {
+ return detailElement.cacheRelevance();
+ }
+
+ @Override
public void expansionStateChanging(ExpansionEvent e) {
// logger.warn("Expansion State Changing");
}
- /** {@inheritDoc} */
@Override
public void expansionStateChanged(ExpansionEvent e) {
// logger.warn("Expansion State Changed");
* 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;
import org.eclipse.jface.util.PropertyChangeEvent;
* @author n.hoffmann
* @created Nov 16, 2009
*/
-public abstract class AbstractEntityCollectionElement<ENTITY> extends
- AbstractCdmFormElement implements IEntityElement<ENTITY>,
- SelectionListener, IConversationEnabled {
+public abstract class AbstractEntityCollectionElement<ENTITY>
+ extends AbstractCdmFormElement
+ implements IEntityElement<ENTITY>, SelectionListener,
+ IConversationEnabled {
protected ENTITY entity;
/**
- *
- */
+* Copyright (C) 2018 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;
import java.util.ArrayList;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
/**
- * This class visualizes an CDM entity of type ENTITY and additionally provides the functionality to add
- * other elements of type ELEMENT to them.
+ * This class visualizes an CDM entity of type ENTITY and additionally provides
+ * the functionality to add other elements of type ELEMENT to them.
*
* @param <ENTITY> A CDM entity which should be visualized by this section.
* @param <ELEMENT> An element that can be added (multiple times) to this entity.
*
* @author n.hoffmann
*/
-public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT> extends AbstractFormSection<ENTITY> implements IExpansionListener, Observer {
+public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT>
+ extends AbstractFormSection<ENTITY>
+ implements IExpansionListener, Observer {
private static final EnumSet<CRUD> UPDATE = EnumSet.of(CRUD.UPDATE);
/**
* Create the elements to be shown in this section client area
*/
- private void renderContent(boolean forceExpansion)
- {
+ private void renderContent(boolean forceExpansion){
Collection<ELEMENT> collection = getCollection(getEntity());
if(collection == null || collection.isEmpty()){
/**
* Creates the widgets for the collection
- *
- * @param elements a {@link java.util.Collection} object.
*/
protected void createDynamicContents(Collection<ELEMENT> elements)
{
entityCollectionElement = formFactory.createEntityCollectionElement(this, element, removeListener, backgroundColor, SWT.NULL);
}
- /** {@inheritDoc} */
@Override
public void setBackground(Color color) {
if(label_empty != null && !label_empty.isDisposed()){
}
/**
- * <p>getTitleString</p>
- *
- * @return a {@link java.lang.String} object.
+ * getTitleString
*/
public String getTitleString() {
return CdmUtils.Nz(title);
}
/**
- * <p>setTitleString</p>
- *
- * @param title a {@link java.lang.String} object.
+ * setTitleString
*/
public void setTitleString(String title){
this.title = title;
layout();
}
- /** {@inheritDoc} */
@Override
public void expansionStateChanging(ExpansionEvent e) {
// logger.warn("Expansion State Changing");
}
- /** {@inheritDoc} */
@Override
public void expansionStateChanged(ExpansionEvent e) {
if(isExpanded()){
/**
- *
- */
+* Copyright (C) 2018 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;
-import java.util.Arrays;
import java.util.EnumSet;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.permission.CRUD;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICacheRelevantFormElement;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
/**
* @author n.hoffmann
- *
*/
-public abstract class AbstractIdentifiableEntityDetailElement<T extends IIdentifiableEntity> extends
- AbstractCdmDetailElement<T> {
+public abstract class AbstractIdentifiableEntityDetailElement<T extends IIdentifiableEntity>
+ extends AbstractCdmDetailElement<T> {
- /**
- *
- */
private static final EnumSet<CRUD> UPDATE = EnumSet.of(CRUD.UPDATE);
protected ToggleableTextElement toggleable_cache;
-
public AbstractIdentifiableEntityDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
super(formFactory, formElement);
updateToggleableCacheState();
-
-
}
-
public void updateToggleableCacheField() {
if (toggleable_cache != null){
if (!getEntity().isProtectedTitleCache()) {
}
protected void handleToggleableCacheField() {
- boolean pushedState = toggleable_cache.getState();
-
- getEntity().setTitleCache(toggleable_cache.getText(), pushedState);
- setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache }));
+ getEntity().setTitleCache(toggleable_cache.getText(), toggleable_cache.getState());
+ updateCacheRelevance();
updateToggleableCacheField();
}
-
@Override
protected void updateControlStates(){
-
updateToggleableCacheState();
super.updateControlStates();
}
-
private void updateToggleableCacheState() {
if(toggleable_cache != null){
toggleable_cache.setEnabled(getEntity() != null && CdmStore.currentAuthentiationHasPermission((CdmBase) getEntity(), UPDATE));
}
}
-
-
-}
+ protected void registerCacheRelevance(ICacheRelevantFormElement element) {
+ registerCacheRelevance(element, toggleable_cache);
+ }
+}
\ No newline at end of file
/**
* @author pplitzner
* @since Mar 5, 2018
- *
*/
public class DefaultCdmBaseComparator<T extends CdmBase> implements Comparator<T> {
- /**
- * {@inheritDoc}
- */
@Override
public int compare(T o1, T o2) {
if(o1==null){
if(o2==null){
return 1;
}
- int diff = o1.getId()-o2.getId();
+ int diff = o1.getId() - o2.getId();
if(diff==0){
diff = o1.getCreated().compareTo(o2.getCreated());
}
return diff;
}
-
-}
+}
\ No newline at end of file
/**
* @author pplitzner
* @date 30.07.2013
- *
*/
-public interface ICdmDetailElement<T> extends IEntityElement<T>, IEnableableFormElement, IConversationEnabled{
+public interface ICdmDetailElement<T>
+ extends IEntityElement<T>, IEnableableFormElement, IConversationEnabled{
public abstract void setEntity(T entity);
-
-}
+}
\ No newline at end of file
*
* @param taxon a {@link eu.etaxonomy.cdm.model.taxon.TaxonBase} object.
*/
- public abstract void setTaxonBase(TaxonBase taxon);
+ public abstract void setTaxonBase(TaxonBase<?> taxon);
- public abstract TaxonBase getTaxonBase();
+ public abstract TaxonBase<?> getTaxonBase();
}
* 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.agent;
-import java.util.Arrays;
-import java.util.Collection;
-
import org.eclipse.swt.SWT;
import eu.etaxonomy.cdm.model.agent.Person;
import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
/**
- * <p>
* PersonDetailElement class.
- * </p>
*
* @author n.hoffmann
* @created Mar 8, 2010
private TimePeriodElement time_lifespan;
private OrcidWithLabelElement text_orcid;
private LsidWithExceptionLabelElement text_lsid;
- private Collection<Object> excludeFromIrrelevantToggleableObjects;
public PersonDetailElement(CdmFormFactory cdmFormFactory,
ICdmFormElement formElement, int style) {
text_lsid = formFactory.createLsidWithExceptionLabelElement(formElement, "LSID", entity.getLsid(), SWT.NULL);
getLayoutComposite().layout();
+ //cache relevance
+ registerCacheRelevance(text_firstname);
+ registerCacheRelevance(text_lastname);
+ registerCacheRelevance(text_prefix);
+ registerCacheRelevance(text_suffix);
+ registerCacheRelevance(text_initials);
}
@Override
protected void updateContent() {
super.updateContent();
-
- excludeFromIrrelevantToggleableObjects = Arrays.asList(new Object[] {
- toggleable_cache, text_nomenclaturalTitle });
-
toggleable_cache.setEnabled(getEntity().isProtectedTitleCache());
- setIrrelevant(toggleable_cache.getState(),
- excludeFromIrrelevantToggleableObjects);
+ updateCacheRelevance();
}
@Override
public void handleEvent(Object eventSource) {
if (eventSource == toggleable_cache) {
handleToggleableCacheField();
-
} else if (eventSource == text_nomenclaturalTitle) {
- getEntity()
- .setNomenclaturalTitle(text_nomenclaturalTitle.getText());
+ getEntity().setNomenclaturalTitle(text_nomenclaturalTitle.getText());
} else if (eventSource == text_firstname) {
getEntity().setGivenName(text_firstname.getText());
}else if (eventSource == text_initials) {
if (pushedState){
getEntity().setTitleCache(toggleable_cache.getText(), pushedState);
}
- setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache, text_nomenclaturalTitle }));
+ updateCacheRelevance();
updateToggleableCacheField();
-
}
-}
+}
\ No newline at end of file
* 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.agent;
-import java.util.Arrays;
-
import eu.etaxonomy.cdm.model.agent.Team;
import eu.etaxonomy.taxeditor.store.StoreUtil;
+import eu.etaxonomy.taxeditor.ui.element.CacheRelevance;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
/**
- * <p>
* TeamDetailElement class.
- * </p>
*
* @author n.hoffmann
* @created Apr 26, 2010
- * @version 1.0
*/
-public class TeamDetailElement extends AbstractIdentifiableEntityDetailElement<Team> {
+public class TeamDetailElement
+ extends AbstractIdentifiableEntityDetailElement<Team> {
private ToggleableTextElement toggleable_nomenclaturalTitleCache;
private CheckboxElement hasAdditionalMembers;
private boolean isNomenclaturalTeam;
/**
- * <p>
* Constructor for TeamDetailElement.
- * </p>
- *
- * @param cdmFormFactory
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
- * object.
- * @param formElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param style
- * a int.
*/
public TeamDetailElement(CdmFormFactory cdmFormFactory,
ICdmFormElement formElement, int style, boolean isNomenclatural) {
this.isNomenclaturalTeam = isNomenclatural;
}
- /** {@inheritDoc} */
@Override
protected void createControls(ICdmFormElement formElement, Team entity, int style) {
setWarnForReferencingObjects(formElement);
- toggleable_cache = formFactory.createToggleableTextField(formElement, "Title Cache", entity.getTitleCache(), entity.isProtectedTitleCache(), style);
- toggleable_nomenclaturalTitleCache = formFactory.createToggleableTextField(formElement, "Abbrev. Title", entity.getNomenclaturalTitle(), entity.isProtectedNomenclaturalTitleCache(), style);
+ toggleable_cache = formFactory.createToggleableTextField(formElement, "Title Cache",
+ entity.getTitleCache(), entity.isProtectedTitleCache(), style);
+ toggleable_nomenclaturalTitleCache = formFactory.createToggleableTextField(formElement,
+ "Abbrev. Title", entity.getNomenclaturalTitle(), entity.isProtectedNomenclaturalTitleCache(),
+ CacheRelevance.CACHE2, style);
hasAdditionalMembers = formFactory.createCheckbox(formElement, "Additional Members", entity.isHasMoreMembers(), style);
section_teamMembers = formFactory.createTeamMemberSection(getConversationHolder(), formElement, StoreUtil.getSectionStyle(TeamMemberSection.class, entity.getClass().getCanonicalName(), true), isNomenclaturalTeam);
section_teamMembers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
+
+ //cache relevance
+ //TODO
+// registerCacheRelevance(toggleable_nomenclaturalTitleCache);
+ registerCacheRelevance(hasAdditionalMembers, toggleable_cache, toggleable_nomenclaturalTitleCache);
+ registerCacheRelevance(section_teamMembers, toggleable_cache, toggleable_nomenclaturalTitleCache);
}
- /** {@inheritDoc} */
@Override
protected void updateContent() {
super.updateContent();
toggleable_nomenclaturalTitleCache.setEnabled(getEntity()
.isProtectedNomenclaturalTitleCache());
}
- if (toggleable_nomenclaturalTitleCache != null && toggleable_cache != null){
- setIrrelevant(
- toggleable_cache.getState(),
- Arrays.asList(new Object[] { toggleable_cache,
- toggleable_nomenclaturalTitleCache , hasAdditionalMembers}));
- } else if (toggleable_cache != null){
- setIrrelevant(
- toggleable_cache.getState(),
- Arrays.asList(new Object[] { toggleable_cache, hasAdditionalMembers}));
- }
-
section_teamMembers.setEntity(getEntity());
+ updateCacheRelevance();
}
- /** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
if (eventSource == toggleable_cache) {
} else if (eventSource == toggleable_nomenclaturalTitleCache) {
updateToggleable_nomanclaturalTitleCacheField();
- setIrrelevant(
- toggleable_nomenclaturalTitleCache.getState(),
- Arrays.asList(new Object[] { toggleable_nomenclaturalTitleCache, hasAdditionalMembers }));
+ updateCacheRelevance();
} else if (eventSource == section_teamMembers) {
toggleable_cache.setText(getEntity().getTitleCache());
toggleable_nomenclaturalTitleCache.setText(getEntity()
boolean pushedState = toggleable_nomenclaturalTitleCache.getState();
getEntity().setNomenclaturalTitle(toggleable_nomenclaturalTitleCache.getText(), pushedState);
- setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache }));
+ updateCacheRelevance();
if (!getEntity().isProtectedNomenclaturalTitleCache()) {
toggleable_nomenclaturalTitleCache.setText(getEntity().getNomenclaturalTitle());
}
}
- /**
- * @return the isNomenclaturalTeam
- */
public boolean isNomenclaturalTeam() {
return isNomenclaturalTeam;
}
-
- /**
- * @param isNomenclaturalTeam the isNomenclaturalTeam to set
- */
public void setNomenclaturalTeam(boolean isNomenclaturalTeam) {
this.isNomenclaturalTeam = isNomenclaturalTeam;
}
-}
+}
\ No newline at end of file
* 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.agent;
import org.eclipse.swt.events.SelectionListener;
/**
* @author n.hoffmann
* @created Apr 30, 2010
- * @version 1.0
*/
public class TeamMemberElement extends AbstractEntityCollectionElement<Person> {
private EntitySelectionElement<Person> selection_person;
- private final boolean isNomenclatural;
public TeamMemberElement(CdmFormFactory cdmFormFactory,
AbstractFormSection section, Person entity,
SelectionListener removeListener, int style, boolean isNomenclatural) {
super(cdmFormFactory, section, entity, removeListener, null, style);
- this.isNomenclatural =isNomenclatural;
-
}
- /** {@inheritDoc} */
@Override
public void createControls(ICdmFormElement element, int style) {
selection_person = formFactory
.createSelectionElement(Person.class,
- //getConversationHolder(),
this, "Person", null,
EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE,
style);
}
- /** {@inheritDoc} */
@Override
public void setEntity(Person entity) {
this.entity = entity;
selection_person.setEntity(entity);
}
- /** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
if (eventSource == selection_person) {
}
else{
//first remove the edited team member and then add it again
- //because the model allows the same person multiple time in on team
+ //because the model allows the same person multiple time in one team
team.removeTeamMember(getEntity());
team.addTeamMember(selection_person.getEntity(), index);
}
entity = selection_person.getEntity();
}
}
-}
+}
\ No newline at end of file
* 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.agent;
import java.util.Collection;
import java.util.Comparator;
import java.util.List;
+import org.eclipse.swt.graphics.Color;
+
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.model.agent.Person;
import eu.etaxonomy.cdm.model.agent.Team;
+import eu.etaxonomy.taxeditor.ui.element.CacheRelevance;
+import eu.etaxonomy.taxeditor.ui.element.CacheRelevanceHelper;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
+import eu.etaxonomy.taxeditor.ui.element.ICacheRelevantFormElement;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AbstractUnboundEntityCollectionSection;
/**
- * <p>TeamMemberSection class.</p>
+ * TeamMemberSection class.
*
* @author n.hoffmann
* @created Apr 30, 2010
- * @version 1.0
*/
-public class TeamMemberSection extends AbstractUnboundEntityCollectionSection<Team, Person> {
+public class TeamMemberSection
+ extends AbstractUnboundEntityCollectionSection<Team, Person>
+ implements ICacheRelevantFormElement {
private boolean isNomenclaturalTeam = false;
+ private CacheRelevanceHelper cacheRelevanceHelper = new CacheRelevanceHelper();
+
/**
* <p>Constructor for TeamMemberSection.</p>
*
isNomenclaturalTeam = isNomenclatural;
}
- /** {@inheritDoc} */
@Override
public String getTitleString() {
return "Team Members";
}
- /** {@inheritDoc} */
@Override
public void addElement(Person element) {
getEntity().addTeamMember(element);
}
- /** {@inheritDoc} */
@Override
public Person createNewElement() {
return Person.NewTitledInstance("");
}
- /** {@inheritDoc} */
@Override
public String getEmptyString() {
return "No persons yet.";
}
- /** {@inheritDoc} */
@Override
protected String getTooltipString() {
return "Add a member to this team";
}
- /** {@inheritDoc} */
@Override
public void removeElement(Person element) {
getEntity().removeTeamMember(element);
@Override
public Comparator<Person> getComparator() {
return (p1, p2) -> {
- if(p1==null){
+ if (p1 == p2){
+ return 0;
+ }else if(p1==null){
return -1;
- }
- if(p2==null){
+ }else if(p2==null){
return 1;
}
+
List<Person> teamMembers = getEntity().getTeamMembers();
int indexOfP1 = teamMembers.indexOf(p1);
int indexOfP2 = teamMembers.indexOf(p2);
};
}
- /**
- * @return
- */
public boolean isNomenclaturalTeam() {
return isNomenclaturalTeam;
}
- /**
- * {@inheritDoc}
- */
@Override
public Person addExisting() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean allowAddExisting() {
return false;
}
-}
+ @Override
+ public void updateCacheRelevance() {
+ Color color = cacheRelevance().getColor();
+ setBackground(color);
+ }
+
+ @Override
+ public void addDependsOnCache(ToggleableTextElement toggleElement) {
+ cacheRelevanceHelper.addDependsOnCache(toggleElement);
+ }
+
+ @Override
+ public CacheRelevance cacheRelevance() {
+ return cacheRelevanceHelper.cacheRelevance();
+ }
+}
\ No newline at end of file
/**
* @author k.luther
* @date 23.03.2016
- *
*/
-public class EditTaxonNodeWizard extends AbstractEditWizard<TaxonNode> implements ICdmEntitySessionEnabled{
+public class EditTaxonNodeWizard
+ extends AbstractEditWizard<TaxonNode>
+ implements ICdmEntitySessionEnabled<TaxonNode>{
private TaxonNodeWizardPage taxonNodePage;
private IWizardPageListener wizardPageListener;
// conversation = CdmStore.createConversation();
// }
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.classification.AbstractEditWizard#getEntityName()
- */
@Override
protected String getEntityName() {
return "taxon node";
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.classification.AbstractEditWizard#saveEntity()
- */
@Override
protected void saveEntity() {
getConversationHolder().bind();
this.wizardPageListener = wizardPageListener;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard#setEntity(java.lang.Object)
- */
@Override
public void setEntity(TaxonNode entity) {
setWindowTitle(String.format("Edit %s", getEntityName()));
super.setEntity(entity);
}
- /**
- * {@inheritDoc}
- */
@Override
public ICdmEntitySession getCdmEntitySession() {
-
return cdmEntitySession;
}
- /**
- * {@inheritDoc}
- */
@Override
public Collection<TaxonNode> getRootEntities() {
return Collections.singleton(this.getEntity());
}
- /**
- * {@inheritDoc}
- */
@Override
public Map<Object, List<String>> getPropertyPathsMap() {
// TODO Auto-generated method stub
cdmEntitySession.dispose();
super.dispose();
}
-
-
-
-
-}
+}
\ No newline at end of file
private EnumComboElement<TaxonNodeStatus> combo_status;
private CheckboxElement checkbox_publish;
private MultilanguageTextElement multiLanguageTextStatusNotes;
+ String defaultPublish;
public TaxonNodeDetailElement(CdmFormFactory formFactory,
ICdmFormElement formElement, boolean isCreateNew) {
selection_parentTaxonNode = formFactory
.createTaxonNodeSelectionElement(getConversationHolder(), formElement, Messages.TaxonNodeWizardPage_PARENT, parentNode,
- EntitySelectionElement.DELETABLE, style, 100);
+ EntitySelectionElement.SELECTABLE, style, 100);
selection_parentTaxonNode.setIndent(10);
+ selection_parentTaxonNode.setEnabled(false);
}else{
taxon = getEntity().getTaxon();
selection_reuseExistingTaxon = formFactory
- .createSelectionElement(Taxon.class,//getConversationHolder(),
- formElement,
+ .createSelectionElement(Taxon.class, formElement,
Messages.TaxonNodeWizardPage_TAXON, taxon,
EntitySelectionElement.DELETABLE, SWT.NULL);
combo_status.setIndent(10);
if(isCreateNew()){
- String defaultPublish = PreferencesUtil.getStringValue(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey());
- if (defaultPublish != null && defaultPublish.equals(PublishEnum.Publish.getKey())){
- checkbox_publish.setSelection(true);
- } else if (defaultPublish != null && defaultPublish.equals(PublishEnum.NotPublish.getKey())){
- checkbox_publish.setSelection(false);
- }else{
- if(this.getParentTreeNode() != null && this.getParentTreeNode().isInstanceOf(TaxonNode.class) && this.getParentTreeNode().getTaxon() != null){
- checkbox_publish.setSelection(this.getParentTreeNode().getTaxon().isPublish());
- }else{
- checkbox_publish.setSelection(true);
- }
- }
+ defaultPublish = PreferencesUtil.getStringValue(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey());
+ setDefaultPublish();
} else{
setTreeNode(entity);
complete = true;
}
+ private void setDefaultPublish() {
+ if (defaultPublish != null && defaultPublish.equals(PublishEnum.Publish.getKey())){
+ checkbox_publish.setSelection(true);
+ } else if (defaultPublish != null && defaultPublish.equals(PublishEnum.NotPublish.getKey())){
+ checkbox_publish.setSelection(false);
+ }else{
+ if(this.getParentTreeNode() != null && this.getParentTreeNode().isInstanceOf(TaxonNode.class) && this.getParentTreeNode().getTaxon() != null){
+ checkbox_publish.setSelection(this.getParentTreeNode().getTaxon().isPublish());
+ }else{
+ checkbox_publish.setSelection(true);
+ }
+ }
+ }
+
private void preFillTaxonName() {
TaxonNode node = parentNode;
if(node != null && node.getTaxon()!=null){
microReference.setText(getTaxon().getSecMicroReference());
if (isCreateNew()){
selection_SecRef.setEntity(getTaxon().getSec());
+
}else{
textTaxonSec.setText((getTaxon().getSec().getTitleCache()));
}
microReference.setText("");
if (isCreateNew()){
selection_SecRef.setEntity(null);
+
}else{
textTaxonSec.setText("");
}
}
- checkbox_publish.setSelected(getTaxon().isPublish());
+ if (checkbox_publish != null){
+ checkbox_publish.setSelected(getTaxon().isPublish());
+ }
+ }else{
+ selection_SecRef.setEntity(null);
+ setDefaultPublish();
}
boolean enabled = selection_reuseExistingTaxon.getEntity() == null;
if (selection_reuseExistingName != null){
selection_reuseExistingName.setEnabled(enabled);
+ }
+ if (selection_SecRef != null){
+ selection_SecRef.setEnabled(enabled);
}
if (textNewTaxonName != null){
textNewTaxonName.setEnabled(enabled);
}
textNewTaxonName.setEnabled(enabled);
complete = !textNewTaxonName.getText().isEmpty();
- } else if (eventSource == selection_SecRef) {
- if (taxon != null){
- taxon.setSec(selection_SecRef.getEntity());
- }
- } else if (eventSource == microReference) {
- if (taxon != null){
- taxon.setSecMicroReference(microReference.getText());
- }
-
- } else if (eventSource == checkbox_publish) {
- if (taxon != null){
- taxon.setPublish(checkbox_publish.getSelection());
- }
}
if (eventSource == combo_status) {
if (!isCreateNew()){
getEntity().setTaxon(taxon);
}
+
this.set_publish(taxon.isPublish());
if (isCreateNew()){
textNewTaxonName.setText(taxon.getName().getTitleCache());
secundum = this.selection_SecRef.getEntity();
}
}
- if (taxonName != null){
- taxon = Taxon.NewInstance(taxonName, secundum);
- if (textNewTaxonName.getText() == null || !taxonName.getTitleCache().trim().equals(textNewTaxonName.getText().trim())){
- textNewTaxonName.setText(taxonName.getTitleCache());
- }
- if (!isCreateNew()){
- getEntity().setTaxon(taxon);
- }
- } else {
- textNewTaxonName.setText(null);
- }
}
public String getTaxonName() {
}
public void set_publish(boolean publish) {
- this.checkbox_publish.setSelection(publish);
+ if (checkbox_publish != null){
+ this.checkbox_publish.setSelection(publish);
+ }
}
/**
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.dto.CreateTaxonDTO;
import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.newWizard.IWizardPageListener;
public CreateTaxonDTO createTaxon() {
UUID nameUuid = null;
+ UUID taxonUuid = null;
String taxonNameString = null;
if (((TaxonNodeDetailElement) getDetailElement()).getExistingName() != null){
nameUuid = ((TaxonNodeDetailElement) getDetailElement()).getExistingName().getUuid();
- }else{
+ }else if (((TaxonNodeDetailElement) getDetailElement()).getTaxon() != null){
+ taxonUuid = ((TaxonNodeDetailElement) getDetailElement()).getTaxon().getUuid();
+ }else {
taxonNameString = ((TaxonNodeDetailElement) getDetailElement()).getTaxonName();
}
}
boolean isPublish = ((TaxonNodeDetailElement) getDetailElement()).is_publish();
String secMicroReference = ((TaxonNodeDetailElement) getDetailElement()).getMicroReference();
-
- CreateTaxonDTO createDto = new CreateTaxonDTO(nameUuid, secUuid,secMicroReference,false, null,isPublish,
+ CreateTaxonDTO createDto = null;
+ if (taxonUuid != null){
+ createDto = new CreateTaxonDTO(taxonUuid, false, null,isPublish,
+ taxonNameString, PreferencesUtil.getPreferredNomenclaturalCode(), null);
+ }else{
+ createDto = new CreateTaxonDTO(nameUuid, secUuid, secMicroReference,false, null,isPublish,
taxonNameString, PreferencesUtil.getPreferredNomenclaturalCode(), null);
+ }
return createDto;
}
return ((TaxonNodeDetailElement) getDetailElement()).getEntity();
}
+ public Taxon getExistingTaxon(){
+ return ((TaxonNodeDetailElement) getDetailElement()).getTaxon();
+ }
+
@Override
public void dispose() {
formFactory.removePropertyChangeListener(this);
* 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.description;
-import java.util.Arrays;
import java.util.stream.Collectors;
import org.eclipse.jface.util.PropertyChangeEvent;
* @author n.hoffmann
* @created Mar 5, 2010
*/
-public class DescriptionDetailElement extends AbstractIdentifiableEntityDetailElement<DescriptionBase<?>> {
+public class DescriptionDetailElement
+ extends AbstractIdentifiableEntityDetailElement<DescriptionBase<?>> {
// private EntitySelectionElement<FeatureTree> selection_featureTree;
private TextWithLabelElement txtDescriptionTypes;
@Override
protected void createControls(ICdmFormElement formElement, DescriptionBase entity, int style) {
- toggleable_cache = formFactory.createToggleableTextField(this, "Label", entity.getTitleCache(), entity.isProtectedTitleCache(), style);
+ toggleable_cache = formFactory.createToggleableTextField(this, "Label",
+ entity.getTitleCache(), entity.isProtectedTitleCache(), style);
// TODO I initially thought that we can handle the entity's descriptive system with a feature tree
// Since descriptiveSystem is a Set of Features that are present or allowed for the current description,
// it is similar to a FeatureTree (you can get this information from a feature tree) but not the same.
protected void updateContent() {
super.updateContent();
toggleable_cache.setEnabled(getEntity().isProtectedTitleCache());
- setIrrelevant(toggleable_cache.getState(),
- Arrays.asList(new Object[] { txtDescriptionTypes, toggleable_cache}));
+ updateCacheRelevance();
}
@Override
public void handleEvent(Object eventSource) {
if (eventSource == toggleable_cache) {
getEntity().setTitleCache(toggleable_cache.getText(), toggleable_cache.getState());
- setIrrelevant(toggleable_cache.getState(), Arrays.asList(new Object[] { toggleable_cache }));
+ updateCacheRelevance();
}
}
}
\ No newline at end of file
* 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.description;
import org.eclipse.jface.action.ToolBarManager;
import eu.etaxonomy.taxeditor.ui.section.media.MediaViewSwitch;
/**
- * <p>MediaDetailsSection class.</p>
+ * MediaDetailsSection class.
*
* @author n.hoffmann
* @created Jun 15, 2010
- * @version 1.0
*/
public class MediaDetailsSection extends AbstractCdmDetailSection<Media> {
layout();
}
- /** {@inheritDoc} */
+
+ public void setMediaSectionTitle() {
+ this.setSectionTitle();
+ }
+
@Override
public String getHeading() {
return "Image";
return null;
}
-
-
@Override
protected Control createToolbar() {
ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
toolBarManager.add(MediaViewSwitch.createSwitch(mediaMetaElement));
return toolBarManager.createControl(this);
}
-
-}
+}
\ No newline at end of file
* 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.description;
import java.util.ArrayList;
import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
/**
- * <p>ModifierElement class.</p>
+ * ModifierElement class.
*
* @author n.hoffmann
* @created Sep 15, 2010
- * @version 1.0
*/
public class ModifierElement extends AbstractEntityCollectionElement<DefinedTerm> {
super(formFactory, section, entity, removeListener, null, style);
}
- /** {@inheritDoc} */
@Override
public void setEntity(DefinedTerm entity) {
this.entity = entity;
}
}
- /** {@inheritDoc} */
@Override
public void createControls(ICdmFormElement element, int style) {
combo_modifier = formFactory.createDefinedTermComboElement(TermType.Modifier, element, "Modifier", getEntity(), style);
}
- /** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
if(eventSource==combo_modifier && combo_modifier.getSelection()!=null){
}
}
}
-}
+}
\ No newline at end of file
* 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.description;
import java.util.Collection;
import java.util.Comparator;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.term.DefinedTerm;
import eu.etaxonomy.cdm.model.description.TaxonDescription;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.section.DefaultCdmBaseComparator;
super(cdmFormFactory, conversation, parentElement, "Scope", style);
}
- /** {@inheritDoc} */
@Override
public void addElement(DefinedTerm element) {
getEntity().addScope(element);
return null;
}
- /** {@inheritDoc} */
@Override
public String getEmptyString() {
return "No scopes yet.";
}
- /** {@inheritDoc} */
@Override
protected String getTooltipString() {
return "Create a new scope";
}
- /** {@inheritDoc} */
@Override
public void removeElement(DefinedTerm element) {
getEntity().removeScope(element);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AbstractUnboundEntityCollectionSection#getEntityCollection(java.lang.Object)
- */
@Override
protected Collection<DefinedTerm> getEntityCollection(TaxonDescription entity) {
return entity.getScopes();
return new DefaultCdmBaseComparator<>();
}
- /**
- * {@inheritDoc}
- */
@Override
public DefinedTerm addExisting() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean allowAddExisting() {
return false;
}
-}
+}
\ No newline at end of file
+/**
+* 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.description;
-
import java.util.Comparator;
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
/**
* @author pplitzner
* @date Apr 13, 2016
- *
*/
public class SourceComparator <T extends OriginalSourceBase> implements Comparator<T> {
+
@Override
public int compare(T o1, T o2) {
- int id1 = o1.getId();
- int id2 = o2.getId();
+
+ //same and null compare, to be on the save side
+ if (o1 == o2){
+ return 0;
+ }else if (o1 == null){
+ return -1;
+ }else if (o2 == null){
+ return 1;
+ }
+
boolean isDescriptionElementSource1 = false;
boolean isDescriptionElementSource2 = false;
- if (o1 instanceof DescriptionElementSource){
+ if (o1.isInstanceOf(DescriptionElementSource.class)){
isDescriptionElementSource1 = true;
}
- if (o2 instanceof DescriptionElementSource){
+ if (o2.isInstanceOf(DescriptionElementSource.class)){
isDescriptionElementSource2 = true;
}
int result = 0;
return 1;
}
}
- OriginalSourceType type1 = o1.getType();
- OriginalSourceType type2 = o2.getType();
- Reference citation1 = o1.getCitation();
- Reference citation2 = o2.getCitation();
-
-
// the newly created should always be on top
- if (id1 == 0){
- if(id2!=0) {
- return -1;
- }
- else{
- result = 0;
- }
- } else if(id2==0){
+ if (!o1.isPersited() && o2.isPersited()) {
+ return -1;
+ } else if(o1.isPersited() && !o2.isPersited()){
return 1;
}
// sort by type (Primary taxonomic > Primary Media > others
// alphabetically by reference title cache)
- else if (type1 == null){
- if(type2==null){
- result = 0;
- }
- else{
- result = -1;
+ OriginalSourceType type1 = o1.getType();
+ OriginalSourceType type2 = o2.getType();
+ if (type1 == null){
+ if (type2!=null){
+ return -1;
}
} else if (type2 == null){
- result = 1;
+ return 1;
} else if(type1.equals(type2)){
- result = 0;
+ //continue with citation compare
} else if (type1.equals(OriginalSourceType.PrimaryTaxonomicSource)){
- result = 1;
+ return 1;
} else if (type2.equals(OriginalSourceType.PrimaryTaxonomicSource)){
- result = -1;
+ return -1;
} else if (type1.equals(OriginalSourceType.PrimaryMediaSource)){
- result = 1;
+ return 1;
} else if (type2.equals(OriginalSourceType.PrimaryMediaSource)){
- result = -1;
+ return -1;
}
+ int result;
+
//sort by citation title cache if types are equal
- if (result == 0){
- if(citation1!=null && citation2!=null){
- result = citation1.getTitleCache().compareTo(citation2.getTitleCache());
+ Reference citation1 = o1.getCitation();
+ Reference citation2 = o2.getCitation();
+ if(citation1!=null && citation2!=null){
+ result = citation1.getTitleCache().compareTo(citation2.getTitleCache());
+ if (result != 0){
+ return result;
}
+ }
- if(o2.getCreated()!=null && o1.getCreated()!=null){
- result = o1.getCreated().compareTo(o2.getCreated());
- }else if (o1.getCreated() == null ){
- if (o2.getCreated() == null){
- result = 0;
- }else{
- return -1;
- }
- }else if (o2.getCreated() == null){
- return 1;
+ //sort by created
+ if(o2.getCreated()!=null && o1.getCreated()!=null){
+ result = o1.getCreated().compareTo(o2.getCreated());
+ if (result != 0){
+ return result;
}
- if (result == 0){
- //default fallback
- return o1.getUuid().compareTo(o2.getUuid());
+ }else if (o1.getCreated() == null){
+ if (o2.getCreated() != null){
+ return -1;
}
+ }else if (o2.getCreated() == null){
+ return 1;
}
- return result;
-
+ //default fallback
+ return o1.getUuid().compareTo(o2.getUuid());
}
-}
+}
\ No newline at end of file
* 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.description.detail;
import org.eclipse.swt.SWT;
*
* @author n.hoffmann
* @created Jun 10, 2010
- * @version 1.0
*/
public abstract class AbstractDetailedDescriptionDetailElement<T extends DescriptionElementBase> extends AbstractCdmDetailElement<T>{
}
}
-}
+}
\ No newline at end of file
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
/**
- *
* @author pplitzner
* @since Aug 19, 2019
- *
*/
public class CharacterNodeDtoDetailSection extends AbstractCdmDetailSection<TermNodeDto> {
return "Character Node";
}
- /**
- * {@inheritDoc}
- */
@Override
protected AbstractCdmDetailElement<TermNodeDto> createCdmDetailElement(AbstractCdmDetailSection<TermNodeDto> parentElement,
int style) {
return formFactory.createCharacterNodeDtoDetailElement(parentElement, style);
}
-
-}
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.ui.section.feature;
-import java.net.URI;
import java.net.URISyntaxException;
import java.util.Arrays;
import java.util.List;
import org.eclipse.swt.widgets.Label;
import eu.etaxonomy.cdm.api.application.CdmApplicationRemoteController;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.common.UriUtils;
import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.term.TermVocabulary;
import eu.etaxonomy.cdm.persistence.dto.TermNodeDto;
import eu.etaxonomy.cdm.persistence.dto.TermVocabularyDto;
-import eu.etaxonomy.taxeditor.featuretree.AvailableFeaturesWizard;
+import eu.etaxonomy.taxeditor.featuretree.AvailableTermsWizard;
import eu.etaxonomy.taxeditor.model.ImageResources;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.AbstractEntityCollectionElementWizardPage;
@Override
public void widgetSelected(SelectionEvent e) {
- AvailableFeaturesWizard wizard = new AvailableFeaturesWizard(stateVocabulariesDtos);
+ AvailableTermsWizard wizard = new AvailableTermsWizard(stateVocabulariesDtos);
wizard.setSingleSelection(true);
WizardDialog dialog = new WizardDialog(getShell(), wizard);
package eu.etaxonomy.taxeditor.ui.section.media;
-import java.net.URI;
-
import org.apache.commons.io.FileUtils;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
import org.eclipse.swt.events.SelectionListener;
import eu.etaxonomy.cdm.common.media.CdmImageInfo;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.model.media.ImageFile;
import eu.etaxonomy.taxeditor.store.StoreUtil;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
}
return Status.OK_STATUS;
}
-
}
private NumberWithLabelElement text_height;
package eu.etaxonomy.taxeditor.ui.section.media;
import java.io.IOException;
-import java.net.URI;
import java.util.List;
import java.util.Set;
import org.eclipse.swt.widgets.Button;
import org.eclipse.swt.widgets.Label;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.common.UriUtils;
import eu.etaxonomy.cdm.common.media.CdmImageInfo;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
import eu.etaxonomy.taxeditor.ui.element.UriWithLabelElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
+import eu.etaxonomy.taxeditor.ui.section.description.MediaDetailsSection;
/**
* @author pplitzner
/**
* @author pplitzner
* @since Jul 11, 2019
- *
*/
private final class LoadImageJob extends Job {
private URI uri;
@Override
protected void createControls(ICdmFormElement formElement, Media entity, int style) {
-
this.parentFormElement = formElement;
this.style = style;
-
}
@Override
job.schedule();
}
}
+ if (this.getParentElement() != null && this.getParentElement() instanceof MediaMetaElement){
+ MediaMetaElement metaElement = (MediaMetaElement)this.getParentElement();
+ if (metaElement.getParentElement() != null && metaElement.getParentElement() instanceof MediaDetailsSection){
+ MediaDetailsSection sec = (MediaDetailsSection)metaElement.getParentElement();
+ sec.setMediaSectionTitle();
+ metaElement.createTitle();
+ }
+ }
}
}
/**
+ * 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.media;
/**
* @author n.hoffmann
* @created Nov 17, 2009
- * @version 1.0
*/
public class MediaMetaElement extends AbstractEntityCollectionElement<Media> implements ISelectableElement, ITogglableMediaElement{
private TimePeriodElement mediaCreated;
private SelectionArbitrator selectionArbitrator;
-
public MediaMetaElement(CdmFormFactory cdmFormFactory,
AbstractFormSection<?> formElement, Media element,
SelectionListener removeListener, int style) {
if(cdmFormFactory.getSelectionProvider() != null){
selectionArbitrator = cdmFormFactory.createSelectionArbitrator(this);
}
-
-
}
- /** {@inheritDoc} */
@Override
public void createControls(ICdmFormElement element, int style) {
// final IAction switchAction = MediaViewSwitch.createSwitch(MediaMetaElement.this);
text_description = formFactory.createLanguageStringWithLabelElement(element, "Description", null, 100, true, style);
-
-
mediaDetailElement = formFactory.createMediaDetailElement(element);
ICdmFormElement grandGrandParent = getParentElement().getParentElement().getParentElement();
- Class clazz = null;
+ Class<?> clazz = null;
if (grandGrandParent != null){
clazz = grandGrandParent.getClass();
}
addElement(mediaDetailElement);
}
- /** {@inheritDoc} */
@Override
public void setEntity(Media element) {
this.entity = element;
}
}
- LanguageString title = element.getTitle(CdmStore.getDefaultLanguage());
+ createTitle();
+ }
+
+ public void createTitle() {
+ LanguageString title = this.entity.getTitle(CdmStore.getDefaultLanguage());
if (title == null) {
- title = LanguageString.NewInstance(element.getTitleCache(), CdmStore.getDefaultLanguage());
+ title = LanguageString.NewInstance(entity.getTitleCache(), CdmStore.getDefaultLanguage());
}
text_title.setLanguageString(title);
-
-
}
@Override
mediaDetailElement.toggleAdvancedMediaView();
}
- /** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
if (eventSource == selection_artist) {
return selectionArbitrator;
}
-
-
-}
+ public MediaDetailElement getMediaDetailElement(){
+ return mediaDetailElement;
+ }
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.ui.section.media;
import java.io.IOException;
-import java.net.URI;
import java.util.Collection;
import org.apache.http.HttpException;
import org.eclipse.core.runtime.jobs.Job;
import org.eclipse.swt.events.SelectionListener;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.common.UriUtils;
import eu.etaxonomy.cdm.common.media.CdmImageInfo;
import eu.etaxonomy.cdm.model.media.ImageFile;
* 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.media;
-import java.net.URI;
-
import org.apache.commons.io.FileUtils;
import org.eclipse.swt.events.SelectionListener;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
*
* @author n.hoffmann
* @created Mar 24, 2010
- * @version 1.0
*/
public class MediaRepresentationPartElement<T extends MediaRepresentationPart> extends
AbstractEntityCollectionElement<T> {
* 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.name;
-import java.util.Arrays;
-
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.name.IZoologicalName;
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.element.NumberWithLabelElement;
+import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
/**
- * <p>
* AuthorshipDetailElement class.
- * </p>
*
* @author n.hoffmann
* @created Mar 4, 2010
- * @version 1.0
*/
-public class AuthorshipDetailElement extends
- AbstractIdentifiableEntityDetailElement<INonViralName> {
+public class AuthorshipDetailElement
+ extends AbstractIdentifiableEntityDetailElement<INonViralName> {
+ @SuppressWarnings("rawtypes")
private EntitySelectionElement<TeamOrPersonBase> selectionExBasionymAuthor;
+ @SuppressWarnings("rawtypes")
private EntitySelectionElement<TeamOrPersonBase> selectionBasionymAuthor;
+ @SuppressWarnings("rawtypes")
private EntitySelectionElement<TeamOrPersonBase> selectionExCombinationAuthor;
+ @SuppressWarnings("rawtypes")
private EntitySelectionElement<TeamOrPersonBase> selectionCombinationAuthor;
private NumberWithLabelElement text_publicationYear;
private NumberWithLabelElement text_originalPublicationYear;
- /**
- * <p>
+
+ /**
* Constructor for AuthorshipDetailElement.
- * </p>
- *
- * @param cdmFormFactory
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
- * object.
- * @param formElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param style
- * a int.
*/
public AuthorshipDetailElement(CdmFormFactory cdmFormFactory,
ICdmFormElement formElement, int style) {
super(cdmFormFactory, formElement);
}
- /** {@inheritDoc} */
@Override
protected void createControls(ICdmFormElement formElement,
INonViralName entity, int style) {
"Authorship Cache", entity.getAuthorshipCache(),
entity.isProtectedAuthorshipCache(), style);
addElement(toggleable_cache);
- }
+ }
NomenclaturalCode code = entity.getNameType();
if (config == null || config.isAuthorshipSectionActivated()){
if (code != null){
if (code.equals(NomenclaturalCode.ICZN)){
text_publicationYear = formFactory.createFloatTextWithLabelElement(formElement, "Publication Year", ((IZoologicalName)entity).getPublicationYear(), style);
-
}
- }
+ }
selectionBasionymAuthor = formFactory.createSelectionElementWithAbbreviatedTitle(TeamOrPersonBase.class, getConversationHolder(),
formElement, "Basionym Author", entity.getBasionymAuthorship(),
EntitySelectionElement.DELETABLE | EntitySelectionElement.SELECTABLE | EntitySelectionElement.EDITABLE, style);
EntitySelectionElement.DELETABLE | EntitySelectionElement.SELECTABLE | EntitySelectionElement.EDITABLE, style);
addElement(selectionExBasionymAuthor);
- if (code != null){
- if (code.equals(NomenclaturalCode.ICZN)){
+ if (code != null && code.equals(NomenclaturalCode.ICZN)){
+ text_originalPublicationYear = formFactory.createFloatTextWithLabelElement(formElement, "Orig. Publication Year", ((IZoologicalName)entity).getOriginalPublicationYear(), style);
+ }
+ }
- text_originalPublicationYear = formFactory.createFloatTextWithLabelElement(formElement, "Orig. Publication Year", ((IZoologicalName)entity).getOriginalPublicationYear(), style);
+ //put to Cache
+ registerCacheRelevance(selectionCombinationAuthor);
+ registerCacheRelevance(selectionBasionymAuthor);
+ registerCacheRelevance(selectionExCombinationAuthor);
+ registerCacheRelevance(selectionExBasionymAuthor);
+ registerCacheRelevance(text_publicationYear);
+ registerCacheRelevance(text_originalPublicationYear);
- }
- }
-
- }
+ registerCacheRelevance(toggleable_cache, cacheRelevanceHelper.getDependenciesArray());
}
- /** {@inheritDoc} */
- @Override
+ @Override
+ public void addDependsOnCache(ToggleableTextElement toggleElement) {
+ super.addDependsOnCache(toggleElement);
+ //register my cache on higher cache (if not null yet)
+ registerCacheRelevance(toggleable_cache, toggleElement);
+ }
+
+ @Override
public void updateContent() {
if (getEntity() == null) {
setEntity(TaxonNameFactory.NewNonViralInstance(null));
super.updateContent();
if (toggleable_cache != null){
toggleable_cache.setEnabled(getEntity().isProtectedAuthorshipCache());
-
-
- if (this.isIrrelevant()) {
- setIrrelevant(isIrrelevant());
- } else {
- setIrrelevant(toggleable_cache.getState(),
- Arrays.asList(new Object[] { toggleable_cache }));
- }
+ updateCacheRelevance();
}
}
- /** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
if (eventSource == toggleable_cache) {
getEntity().setAuthorshipCache(toggleable_cache.getText(),
toggleable_cache.getState());
- if (!isIrrelevant()){
- setIrrelevant(toggleable_cache.getState(),
- Arrays.asList(new Object[] { toggleable_cache }));
- }
+ updateCacheRelevance();
} else if (eventSource == selectionCombinationAuthor) {
getEntity().setCombinationAuthorship(
selectionCombinationAuthor.getSelection());
// toggleable_cache.setText(getEntity().getAuthorshipCache());
// }
-// we have to notify the parent if this is embedded in the nonviral name
-// section
-// maybe we can handle this a little bit more elegant
+// we have to notify the parent if this is embedded in the nonviral name
+// section
+// maybe we can handle this a little bit more elegant
// if (getParentElement() instanceof AbstractCdmDetailSection)
firePropertyChangeEvent(new CdmPropertyChangeEvent(
getParentElement(), null));
}
}
}
-}
+}
\ No newline at end of file
* 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.name;
import org.eclipse.jface.viewers.ISelectionProvider;
/**
* @author n.hoffmann
* @created 05.06.2009
- * @version 1.0
*/
public class AuthorshipDetailSection extends AbstractCdmDetailSection<INonViralName> implements ITaxonBaseDetailSection {
- private TaxonBase taxonBase;
-
+ private TaxonBase<?> taxonBase;
public AuthorshipDetailSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement,
ISelectionProvider selectionProvider, int style) {
super(cdmFormFactory, conversation, parentElement, selectionProvider, style);
-
}
- /** {@inheritDoc} */
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
setEntity(name);
}
- /** {@inheritDoc} */
@Override
public String getHeading() {
return "Authorship";
public void updateContent(){
((AuthorshipDetailElement)this.detailElement).updateContent();
}
-
-}
+}
\ No newline at end of file
* 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.name;
import org.eclipse.jface.util.PropertyChangeEvent;
private CheckboxElement checkboxTrinomHybrid;
private CheckboxElement checkboxHybridFormula;
- /**
- * @param formFactory
- * @param formElement
- */
public HybridDetailElement(CdmFormFactory formFactory,
ICdmFormElement formElement) {
super(formFactory, formElement);
checkboxTrinomHybrid.setEnabled(enableTrinom);
checkboxHybridFormula = formFactory.createCheckbox(formElement, "Hybrid formula", entity.isHybridFormula(), style);
checkboxHybridFormula.setEnabled(false);//read-only
+
+ registerCacheRelevance(checkboxMonomHybrid, cacheRelevanceHelper.getDependenciesArray());
+ registerCacheRelevance(checkboxBinomHybrid, cacheRelevanceHelper.getDependenciesArray());
+ registerCacheRelevance(checkboxTrinomHybrid, cacheRelevanceHelper.getDependenciesArray());
+ registerCacheRelevance(checkboxHybridFormula, cacheRelevanceHelper.getDependenciesArray());
+
}
@Override
else if(eventSource == checkboxTrinomHybrid){
getEntity().setTrinomHybrid(checkboxTrinomHybrid.getSelection());
}
-
}
-
-
-
@Override
public void propertyChange(PropertyChangeEvent event) {
if (event == null) {
checkboxTrinomHybrid.setEnabled(getEntity().getRank().isLower(Rank.SPECIES()));
}
}
-
}
-
-
-
-}
+}
\ No newline at end of file
* 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.name;
import org.eclipse.jface.viewers.ISelectionProvider;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.description.detail.AbstractDetailedDescriptionDetailElement;
/**
* @author n.hoffmann
* @created Jan 5, 2011
*/
-public class HybridDetailSection extends AbstractCdmDetailSection<TaxonName> implements
- ITaxonBaseDetailSection {
+public class HybridDetailSection
+ extends AbstractCdmDetailSection<TaxonName>
+ implements ITaxonBaseDetailSection {
- private TaxonBase taxonBase;
+ private TaxonBase<?> taxonBase;
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param selectionProvider
- * @param style
- */
public HybridDetailSection(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
ISelectionProvider selectionProvider, int style) {
public void updateContent() {
((AbstractCdmDetailElement)this.detailElement).setEntity(getEntity());
-
}
-
-}
+}
\ No newline at end of file
* 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.name;
-import java.util.Arrays;
-import java.util.Collection;
import java.util.Comparator;
import org.apache.log4j.Logger;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
import eu.etaxonomy.taxeditor.ui.element.ISelectableElement;
import eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator;
import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
* @author n.hoffmann
* @created Feb 26, 2010
*/
-public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<INonViralName> implements ISelectableElement, IEnableableFormElement{
+public class NameDetailElement
+ extends AbstractIdentifiableEntityDetailElement<INonViralName>
+ implements ISelectableElement {
private final Logger logger = Logger.getLogger(NameDetailElement.class);
- private TermComboElement<Rank> combo_rank;
+ private SelectionArbitrator selectionArbitrator;
+
+ private TermComboElement<Rank> combo_rank;
private TextWithLabelElement text_appendedPhrase;
private TextWithLabelElement text_uninomial;
private TextWithLabelElement text_infragenericEpithet;
private TextWithLabelElement text_specificEpithet;
private TextWithLabelElement text_infraspecificEpithet;
- private SelectionArbitrator selectionArbitrator;
private CheckboxElement checkbox_anamorphic;
private TextWithLabelElement text_cultivarName;
private TextWithLabelElement text_subGenusAuthorship;
-
private TextWithLabelElement text_breed;
- //private NumberWithLabelElement text_publicationYear;
- //private NumberWithLabelElement text_originalPublicationYear;
- private int cursorPosition;
- NameDetailsConfigurator config;
+ private NameDetailsConfigurator config;
/**
* <p>Constructor for NameDetailElement.</p>
int style) {
super(cdmFormFactory, formElement);
// make this element selectable
-
-
}
- /** {@inheritDoc} */
@Override
protected void createControls(ICdmFormElement formElement, INonViralName nonViralName, int style) {
Comparator<Rank> comparator = null;
if(PreferencesUtil.getSortRanksHierarchichally()){
comparator = new Comparator<Rank>(){
-
- @Override
- public int compare(Rank o1, Rank o2) {
- return o2.compareTo(o1);
- }
-
- };
+ @Override
+ public int compare(Rank o1, Rank o2) {
+ return o2.compareTo(o1);
+ }
+ };
}
if (config == null){
toggleable_cache = formFactory.createToggleableTextField(this, "Name Cache", nonViralName.getNameCache(), nonViralName.isProtectedNameCache(), style);
element.setBackground(getPersistentBackground());
}
+ //cache relevance
+ registerCacheRelevance(combo_rank);
+ //TODO decide if relevant
+ registerCacheRelevance(text_appendedPhrase);
+ registerCacheRelevance(text_uninomial);
+ registerCacheRelevance(text_infragenericEpithet);
+ registerCacheRelevance(text_specificEpithet);
+ registerCacheRelevance(text_infraspecificEpithet);
+ registerCacheRelevance(text_cultivarName);
+ registerCacheRelevance(text_subGenusAuthorship);
+ registerCacheRelevance(text_breed);
+
+ registerCacheRelevance(toggleable_cache, cacheRelevanceHelper.getDependenciesArray());
}
- /**
- * <p>clearCheckRankWarnings</p>
+ /**
+ * clearCheckRankWarnings
*/
protected void clearCheckRankWarnings() {
if(getEntity().hasProblem(ParserProblem.CheckRank)){
getEntity().removeParsingProblem(ParserProblem.CheckRank);
- // FIXME this has to be reafctored completely. See tickets #1959, #1663, #1957, #1958
+ // FIXME this has to be refactored completely. See tickets #1959, #1663, #1957, #1958
// TaxonNameEditor nameEditor = (TaxonNameEditor) EditorUtil.getActiveEditorPage(Page.NAME);
// nameEditor.getSelectedContainer().getNameViewer().clearErrors();
}
}
- /** {@inheritDoc} */
@Override
public void updateContent() {
if(getEntity() == null){
toggleable_cache.setEnabled(getEntity().isProtectedNameCache());
if (config == null){
- if(isIrrelevant()){
- setIrrelevant(isIrrelevant());
- }else{
- setIrrelevant(toggleable_cache.getState(), Arrays.asList(new Object[]{toggleable_cache}));
- }
+ updateCacheRelevance();
}
}
}
-
private void createSpecificNameParts(ICdmFormElement formElement,
INonViralName nonViralName, int style) {
NomenclaturalCode code = nonViralName.getNameType();
}
}
-
private void createBacterialNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style) {
IBacterialName bacterialName = (IBacterialName) nonViralName;
text_subGenusAuthorship = formFactory.createTextWithLabelElement(formElement, "Subgenus Authorship", bacterialName.getSubGenusAuthorship(), style);
private void createCultivarNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style) {
ICultivarPlantName cultivarName = (ICultivarPlantName)nonViralName;
text_cultivarName = formFactory.createTextWithLabelElement(formElement, "Cultivar Name", cultivarName.getCultivarName(), style);
-
}
private void createBotanicalNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style){
private void createGenusOrUninomialControls(ICdmFormElement element, INonViralName nonViralName, int style){
String title = "Genus";
- Rank rank = nonViralName.getRank();
- if(rank != null && rank.isSupraGeneric()){
+ if(nonViralName.isSupraGeneric()){
title = "Uninomial";
}
text_uninomial = formFactory.createTextWithLabelElement(element, title, nonViralName.getGenusOrUninomial(), style);
}
private void createInfragenerericEpithetControls(ICdmFormElement element, INonViralName nonViralName, int style){
- if (nonViralName.getNameType() == null || nonViralName.getNameType().equals(NomenclaturalCode.ICZN)){
- if(nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS()) ){
- text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
- }
- } else{
- if((nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS())) && !nonViralName.getRank().isLower(Rank.SPECIES()) && !nonViralName.getRank().isSpeciesAggregate()){
- text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
- }
- }
+ boolean isIcznOrNull = nonViralName.getNameType() == null || nonViralName.getNameType().equals(NomenclaturalCode.ICZN);
+ if (nonViralName.isInfraGeneric() || nonViralName.isSpecies()
+ || isIcznOrNull && (nonViralName.isInfraSpecific() || nonViralName.isSpeciesAggregate()) //for iczn all subgeneric names may have infrageneric part, but unclear if speciesAggregates exist at all
+ ){
+ text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
+ }
}
private void createSpecificEpithetControls(ICdmFormElement element, INonViralName nonViralName, int style){
- if(nonViralName.getRank() != null && (nonViralName.getRank().isSpecies() || nonViralName.getRank().isInfraSpecific() || nonViralName.getRank().isSpeciesAggregate())){
+ if(nonViralName.isSpecies() || nonViralName.isInfraSpecific() || nonViralName.isSpeciesAggregate()){
text_specificEpithet = formFactory.createTextWithLabelElement(element, "Specific Epithet", nonViralName.getSpecificEpithet(), SWT.NULL);
}
}
private void createInfraSpecificEpithetControls(ICdmFormElement element, INonViralName nonViralName, int style){
- if(nonViralName.getRank() != null && nonViralName.getRank().isInfraSpecific()){
+ if(nonViralName.isInfraSpecific()){
text_infraspecificEpithet = formFactory.createTextWithLabelElement(element, "Infraspecific Epithet", nonViralName.getInfraSpecificEpithet(), SWT.NULL);
}
}
- /** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource){
if (eventSource == toggleable_cache) {
getEntity().setNameCache(toggleable_cache.getText(),
toggleable_cache.getState());
- //if (!isIrrelevant()) {
- setIrrelevant(toggleable_cache.getState(),
- Arrays.asList(new Object[] { toggleable_cache }));
- //}
+ updateCacheRelevance();
}
else if(eventSource == combo_rank){
getEntity().setRank(combo_rank.getSelection());
}else if(eventSource == this.text_subGenusAuthorship){
((IBacterialName)getEntity()).setSubGenusAuthorship(text_subGenusAuthorship.getText());
}
-
}
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.section.cdmdetail.ISelectableElement#getSelectionArbitrator()
- */
/**
* <p>Getter for the field <code>selectionArbitrator</code>.</p>
- *
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator} object.
*/
@Override
public SelectionArbitrator getSelectionArbitrator() {
@Override
protected void handleToggleableCacheField() {
- boolean pushedState = toggleable_cache.getState();
-
- getEntity().setTitleCache(toggleable_cache.getText(), pushedState);
- setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache, text_appendedPhrase, checkbox_anamorphic }));
+ getEntity().setTitleCache(toggleable_cache.getText(), toggleable_cache.getState());
+ updateCacheRelevance();
updateToggleableCacheField();
}
-
- @Override
- public void setIrrelevant(boolean irrelevant, Collection<Object> except){
- if (toggleable_cache != null){
- if (toggleable_cache.getState() == irrelevant){
- super.setIrrelevant(irrelevant, except);
- }
- if (except == null || except.isEmpty()){
- toggleable_cache.setIrrelevant(irrelevant);
- }
- }
-
- }
-
-
-
-
-}
+}
\ No newline at end of file
* 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.name;
import org.eclipse.jface.viewers.ISelectionProvider;
* @author n.hoffmann
* @created 05.06.2009
*/
-public class NameDetailSection extends AbstractCdmDetailSection<INonViralName> implements ITaxonBaseDetailSection{
+public class NameDetailSection
+ extends AbstractCdmDetailSection<INonViralName>
+ implements ITaxonBaseDetailSection{
- private TaxonBase taxonBase;
+ private TaxonBase<?> taxonBase;
/**
* <p>Constructor for NameDetailSection.</p>
super(cdmFormFactory, conversation, parentElement, selectionProvider, style);
}
- /** {@inheritDoc} */
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
setEntity(name);
}
- /** {@inheritDoc} */
@Override
public String getHeading() {
return "Scientific Name";
}
- /** {@inheritDoc} */
@Override
protected void setSectionTitle() {
if(!isDisposed()){
}
@Override
- public TaxonBase getTaxonBase() {
+ public TaxonBase<?> getTaxonBase() {
return taxonBase;
}
@Override
public void setEntity(NameRelationship entity) {
- String text = (entity.getFromName() == null? "-":entity.getFromName().getTitleCache())
- + " is " + (entity.getType()==null?"(no type)":entity.getType().getLabel())
+ String text = (entity.getFromName() == null? "-":entity.getFromName().getTitleCache())
+ + " " +(entity.getType()==null?"(no type)":entity.getType().getLabel())
+ " " + (entity.getToName()==null?"-":entity.getToName().getTitleCache());
labelElement.setText(text);
if (ruleConsidered != null){
* 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.name;
-import java.util.Arrays;
-
import eu.etaxonomy.cdm.model.name.IBacterialName;
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
import eu.etaxonomy.cdm.model.name.TaxonName;
private HybridDetailSection section_hybrid;
private LsidWithExceptionLabelElement textLsid;
private TextWithLabelElement text_nameApprobation;
- //protected boolean isAdvancedView ;
public NonViralNameDetailElement(CdmFormFactory formFactory,
ICdmFormElement formElement) {
super(formFactory, formElement);
-
}
- /** {@inheritDoc} */
@Override
protected void createControls(ICdmFormElement formElement, final TaxonName entity, int style) {
NameDetailsConfigurator config = PreferencesUtil.getPreferredNameDetailsConfiguration();
text_nameApprobation = formFactory.createTextWithLabelElement(formElement, "Name Approbation", entity.getNameApprobation(),style);
}
textLsid = formFactory.createLsidWithExceptionLabelElement(formElement, "Lsid", entity.getLsid(), style);
-
-
}else{
if (config.isNameCacheActivated()){
toggleable_cache = formFactory.createToggleableTextField(formElement, "Cache", entity.getTitleCache(), entity.isProtectedTitleCache() || entity.isProtectedFullTitleCache(), style);
-
}
if (config.isNomenclaturalCodeActived()){
combo_nomenclaturalCode = formFactory.createEnumComboElement(NomenclaturalCode.class, formElement, style);
}
if (entity.getNameType().equals(NomenclaturalCode.ICNB)){
if (config.isNameApprobiationActivated()){
- text_nameApprobation = formFactory.createTextWithLabelElement(formElement, "Name Approbation", entity.getNameApprobation(),style);
+ text_nameApprobation = formFactory.createTextWithLabelElement(formElement, "Name Approbation", entity.getNameApprobation(),style);
}
}
-
if (config.isLSIDActivated()){
textLsid = formFactory.createLsidWithExceptionLabelElement(formElement, "Lsid", entity.getLsid(), style);
-
}
-
-
}
-
section_name = formFactory.createNameDetailSection(getConversationHolder(), formElement, null, StoreUtil.getSectionStyle(NameDetailSection.class, entity.getClass().getCanonicalName(), true));
section_name.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
addControl(section_name);
section_hybrid.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
addControl(section_hybrid);
addElement(section_hybrid);
+ }
- }
-
-
+ //cache relevance
+ registerCacheRelevance(section_name);
+ registerCacheRelevance(section_author);
+ registerCacheRelevance(combo_nomenclaturalCode);
+ registerCacheRelevance(section_hybrid);
}
- /** {@inheritDoc} */
@Override
protected void updateContent() {
super.updateContent();
- // disable nomenclatural code, because changing of nom.code is not
- // implemented on library side
-// if(combo_nomenclaturalCode!=null){
-// combo_nomenclaturalCode.setEnabled(false);
-// }
- if(toggleable_cache!=null){
+ if(toggleable_cache != null){
toggleable_cache.setEnabled(getEntity().isProtectedTitleCache() || getEntity().isProtectedFullTitleCache());
- setIrrelevant(toggleable_cache.getState(),
- Arrays.asList(new Object[] { toggleable_cache, textLsid, text_nameApprobation }));
+ updateCacheRelevance();
}
}
- /** {@inheritDoc} */
@Override
public void setEntity(TaxonName entity) {
super.setEntity(entity);
}
}
- /** {@inheritDoc} */
@Override
public void removeElements() {
super.removeElements();
}
}
- /** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
if (eventSource == toggleable_cache) {
getEntity().setProtectedFullTitleCache(false);
} else if (eventSource == section_name || eventSource == section_author) {
if (getParentElement() instanceof AbstractCdmDetailSection) {
- ((AbstractCdmDetailSection) getParentElement()).updateTitle();
+ ((AbstractCdmDetailSection<?>) getParentElement()).updateTitle();
}
if (toggleable_cache != null){
if (!toggleable_cache.getState()) {
((IBacterialName)getEntity()).setNameApprobation(text_nameApprobation.getText());
}
}
+
private boolean checkForDeletableParts(NomenclaturalCode selection) {
NomenclaturalCode actualCode = getEntity().getNameType();
if (selection.equals(actualCode)){
}else {
return true;
}
-
}
if (actualCode.equals(NomenclaturalCode.ICNB)){
if (getEntity().getNameApprobation() != null || getEntity().getSubGenusAuthorship() != null){
}else{
return true;
}
-
}
if (actualCode.equals(NomenclaturalCode.NonViral)){
return true;
}else{
return true;
}
-
}
if (actualCode.equals(NomenclaturalCode.ICNAFP)){
return true;
@Override
protected void handleToggleableCacheField() {
- boolean pushedState = toggleable_cache.getState();
-
- getEntity().setTitleCache(toggleable_cache.getText(), pushedState);
- setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache, textLsid, text_nameApprobation }));
+ getEntity().setTitleCache(toggleable_cache.getText(), toggleable_cache.getState());
+ updateCacheRelevance();
updateToggleableCacheField();
}
-
-
-
-
-// @Override
-// public void toggleAdvancedMediaView(){
-// mediaDetailElement.toggleAdvancedMediaView();
-// }
-}
+}
\ No newline at end of file
* 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.name;
import org.eclipse.swt.events.SelectionListener;
-import eu.etaxonomy.cdm.api.service.name.TypeDesignationStatusComparator;
+import eu.etaxonomy.cdm.compare.name.TypeDesignationStatusComparator;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
/**
* @author n.hoffmann
* @created May 17, 2010
- * @version 1.0
*/
public class SpecimenTypeDesignationElement extends
AbstractTypeDesignationElement<SpecimenTypeDesignation> {
super(formFactory, section, entity, removeListener, style);
}
- /** {@inheritDoc} */
@Override
public void createControls(ICdmFormElement formElement, int style) {
selection_typeSpecimen = formFactory
super.createControls(formElement, style);
}
- /** {@inheritDoc} */
@Override
public void setEntity(SpecimenTypeDesignation entity) {
super.setEntity(entity);
checkbox_notDesignated.setSelection(entity.isNotDesignated());
}
- /** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
super.handleEvent(eventSource);
// text_referenceDetail.getText());
// }
}
-}
+}
\ No newline at end of file
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.INameService;
import eu.etaxonomy.cdm.api.service.UpdateResult;
-import eu.etaxonomy.cdm.api.service.name.TypeDesignationStatusComparator;
+import eu.etaxonomy.cdm.compare.name.TypeDesignationComparator;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
import eu.etaxonomy.cdm.model.name.Rank;
@Override
public void addElement(TypeDesignationBase element) {
- getEntity().addTypeDesignation(element, PreferencesUtil.getBooleanValue(IPreferenceKeys.ADD_TYPES_TO_ALL_NAMES));
+ getEntity().addTypeDesignation(element, PreferencesUtil.getBooleanValue(IPreferenceKeys.ADD_TYPES_TO_ALL_NAMES));
updateToolbar();
}
@Override
public Comparator<TypeDesignationBase> getComparator() {
- return new Comparator<TypeDesignationBase>(){
-
- //TODO: this is only a workaround to avoid a cdmlib hotfix this needs to be reverted for next release!!
- private TypeDesignationStatusComparator statusComparator = new TypeDesignationStatusComparator();
-
- @SuppressWarnings("unchecked")
- @Override
- public int compare(TypeDesignationBase o1, TypeDesignationBase o2) {
-
- if (o1 == null && o2 == null){
- return 0;
- }
- if(o1==null){
- return 1;
- }
- if(o2==null){
- return -1;
- }
- int result = 0;
- if(o1.getTypeStatus()==null ){
- if (o2.getTypeStatus() != null){
- return 1;
- }
- }
- if (o2.getTypeStatus() == null){
- return -1;
- }
- if(result == 0 && (o1.getTypeStatus() == null || o2.getTypeStatus() == null)){
- return o1.getUuid().compareTo(o2.getUuid());
- }
- return statusComparator.compare(o1.getTypeStatus(), o2.getTypeStatus()) ;
- }
- };
+ return new TypeDesignationComparator();
}
@Override
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
- *
* @author pplitzner
* @since Apr 10, 2019
- *
*/
public class DeleteTypeDesignationOperation extends AbstractPostOperation<TaxonName> {
public DeleteTypeDesignationOperation(String label, IUndoContext undoContext, TaxonName taxonName,
TypeDesignationBase<?> typeDesignation, IPostOperationEnabled postOperationEnabled,
- ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
+ ICdmEntitySessionEnabled<TaxonName> cdmEntitySessionEnabled) {
super(label, undoContext, taxonName, postOperationEnabled, cdmEntitySessionEnabled);
this.typeDesignation = typeDesignation;
-
}
@Override
element.removeTypeDesignation(typeDesignation);
return postExecute(element);
}
-
-}
+}
\ No newline at end of file
* 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 eu.etaxonomy.cdm.model.agent.Institution;
private EntitySelectionElement<Collection> selection_superCollection;
/**
- * <p>
* Constructor for CollectionDetailElement.
- * </p>
- *
- * @param formFactory
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
- * object.
- * @param formElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
*/
public CollectionDetailElement(CdmFormFactory formFactory,
ICdmFormElement formElement) {
formElement, "Town Or Location", entity.getTownOrLocation(),
style);
selection_institute = formFactory
- .createSelectionElement(Institution.class,//getConversationHolder(),
+ .createSelectionElement(Institution.class,
formElement, "Institute",
entity.getInstitute(),
EntitySelectionElement.ALL, style);
selection_superCollection = formFactory
- .createSelectionElement(Collection.class,//getConversationHolder(),
+ .createSelectionElement(Collection.class,
formElement,
"Super Collection", entity.getSuperCollection(),
EntitySelectionElement.ALL, style);
text_titleCache.setText(getEntity().getTitleCache());
}
}
-}
+}
\ No newline at end of file
/**
* @author pplitzner
* @date 05.11.2013
- *
*/
public class FieldUnitGeneralDetailElement extends AbstractCdmDetailElement<DerivedUnitFacade> {
private GatheringEventUnitElement element_elevation;
private CheckboxElement checkIsPublish;
- /**
- * @param formFactory
- * @param formElement
- */
public FieldUnitGeneralDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
super(formFactory, formElement);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls
- * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
- */
@Override
protected void createControls(ICdmFormElement formElement, DerivedUnitFacade entity, int style) {
toggleableText_titleCache = formFactory.createToggleableTextField(formElement, "Title Cache",
checkIsPublish = formFactory.createCheckbox(formElement, "Publish", entity.isPublish(), style);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
- * .lang.Object)
- */
@Override
public void handleEvent(Object eventSource) {
if (eventSource == toggleableText_titleCache) {
toggleableText_titleCache.setText(getEntity().getTitleCache());
}
}
-}
+}
\ No newline at end of file
super(formFactory, conversation, parentElement, "Type Designations", style);
}
- /** {@inheritDoc} */
@Override
public Collection<SpecimenTypeDesignation> getCollection(DerivedUnitFacade entity) {
typeDesignations = entity.innerDerivedUnit().getSpecimenTypeDesignations();
return new DefaultCdmBaseComparator<>();
}
- /** {@inheritDoc} */
@Override
public SpecimenTypeDesignation createNewElement() {
return SpecimenTypeDesignation.NewInstance();
}
- /** {@inheritDoc} */
@Override
public void addElement(SpecimenTypeDesignation element) {
element.setTypeSpecimen(getEntity().innerDerivedUnit());
typeDesignations.add(element);
}
- /** {@inheritDoc} */
@Override
public void removeElement(SpecimenTypeDesignation element) {
List<SpecimenTypeDesignation> toRemove = new ArrayList<SpecimenTypeDesignation>();
typeDesignations.removeAll(toRemove);
}
- /** {@inheritDoc} */
@Override
public String getEmptyString() {
return "No type designation yet.";
return "Add a type designation";
}
- /**
- * {@inheritDoc}
- */
@Override
public SpecimenTypeDesignation addExisting() {
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public boolean allowAddExisting() {
return false;
}
-
-
-}
+}
\ No newline at end of file
* @author pplitzner
* @date 21.01.2014
*/
-public abstract class AbstractUnboundEntityCollectionSection<ENTITY, ELEMENT> extends AbstractEntityCollectionSection<ENTITY, ELEMENT> {
+public abstract class AbstractUnboundEntityCollectionSection<ENTITY, ELEMENT>
+ extends AbstractEntityCollectionSection<ENTITY, ELEMENT> {
private boolean addUnboundElement = false;
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param title
- * @param style
- */
public AbstractUnboundEntityCollectionSection(CdmFormFactory formFactory, ConversationHolder conversation, ICdmFormElement parentElement, String title, int style) {
super(formFactory, conversation, parentElement, title, style);
}
/**
- * @deprecated this method should not be extended in sub classes of {@link AbstractUnboundEntityCollectionSection}.<br>
+ * This method can not be extended in sub classes.
+ * Use {@link #getEntityCollection(Object)} instead.
*/
- @Deprecated
@Override
- public Collection<ELEMENT> getCollection(ENTITY entity) {
+ public final Collection<ELEMENT> getCollection(ENTITY entity) {
Collection<ELEMENT> elements = getEntityCollection(entity);
if(addUnboundElement){
//cloning to avoid saving the dummy element
ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
Action addAction = new Action("add", IAction.AS_PUSH_BUTTON){
- /* (non-Javadoc)
- * @see org.eclipse.jface.action.Action#run()
- */
+
@Override
public void run() {
addUnboundElement = true;
/**
* @author pplitzner
* @date 15.01.2014
- *
*/
public class AmplificationCloningDetailElement extends AbstractCdmDetailElement<AmplificationResult> {
- private TextWithLabelElement textCloningStrain;
+
+ private TextWithLabelElement textCloningStrain;
private TimePeriodElement date;
private EntitySelectionElement<AgentBase> selectionCloningStaff;
private TermComboElement<DefinedTerm> comboCloningMaterialOrMethod;
-
- /**
- * @param formFactory
- * @param formElement
- */
public AmplificationCloningDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
super(formFactory, formElement);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls
- * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
- */
@Override
protected void createControls(ICdmFormElement formElement, AmplificationResult entity, int style) {
Cloning cloning = entity.getCloning();
comboCloningMaterialOrMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Cloning Mat. & Meth.", cloning==null?null:cloning.getDefinedMaterialOrMethod(), style);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
- * .lang.Object)
- */
@Override
public void handleEvent(Object eventSource) {
if(eventSource==textCloningStrain || eventSource==date|| eventSource==selectionCloningStaff || eventSource==comboCloningMaterialOrMethod){
}
}
}
-
-}
+}
\ No newline at end of file
/**
* @author pplitzner
* @date 15.01.2014
- *
*/
-public class AmplificationCloningDetailSection extends AbstractCdmDetailSection<AmplificationResult> {
+public class AmplificationCloningDetailSection
+ extends AbstractCdmDetailSection<AmplificationResult> {
- /**
- * @param formFactory
- * @param conversation
- * @param parentElement
- * @param selectionProvider
- * @param style
- */
public AmplificationCloningDetailSection(CdmFormFactory formFactory,
ConversationHolder conversation, ICdmFormElement parentElement,
ISelectionProvider selectionProvider, int style) {
super(formFactory, conversation, parentElement, selectionProvider, style);
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading()
- */
@Override
public String getHeading() {
return "Cloning";
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
@Override
protected AbstractCdmDetailElement<AmplificationResult> createCdmDetailElement(AbstractCdmDetailSection<AmplificationResult> parentElement, int style) {
return formFactory.createAmplificationCloningDetailElement(parentElement);
}
-
-}
+}
\ No newline at end of file
/**
* @author pplitzner
* @date 05.03.2014
- *
*/
public class DnaQualityDetailElement extends AbstractCdmDetailElement<DerivedUnitFacade> {
private TermComboElement<OrderedTerm> comboQualityTerm;
private DateElement dateQualityCheck;
- /**
- * @param formFactory
- * @param formElement
- */
public DnaQualityDetailElement(CdmFormFactory formFactory, ICdmFormElement formElement) {
super(formFactory, formElement);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#createControls
- * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, java.lang.Object, int)
- */
@Override
protected void createControls(ICdmFormElement formElement, DerivedUnitFacade facade, int style) {
DnaSample entity = (DnaSample)facade.innerDerivedUnit();
OrderedTerm qualityTerm = dnaQuality.getQualityTerm();
textPurificationMethod = formFactory.createTextWithLabelElement(formElement, "DNA Purification Details", dnaQuality.getPurificationMethod(), style);
- numberRatioOfAbsorbance260_280 = formFactory.createFloatTextWithLabelElement(formElement, "Ratio of absorbance 260-280", ratioOfAbsorbance260_280, style);
- numberRatioOfAbsorbance260_230 = formFactory.createFloatTextWithLabelElement(formElement, "Ratio of absorbance 260-230", ratioOfAbsorbance260_230, style);
+ numberRatioOfAbsorbance260_280 = formFactory.createFloatTextWithLabelElement(formElement, "Ratio of absorbance 260/280", ratioOfAbsorbance260_280, style);
+ numberRatioOfAbsorbance260_230 = formFactory.createFloatTextWithLabelElement(formElement, "Ratio of absorbance 260/230", ratioOfAbsorbance260_230, style);
numberConcentration = formFactory.createFloatTextWithLabelElement(formElement, "Concentration", concentration, style);
comboQualityTerm = formFactory.createDefinedTermComboElement(TermType.DnaQualityType, formElement, "Quality Term", qualityTerm, style);
DateTime qualityCheckedDate = dnaQuality.getQualityCheckDate();
dateQualityCheck = formFactory.createDateElement(formElement, "Quality Check", qualityCheckedDate, style, false);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java
- * .lang.Object)
- */
@Override
public void handleEvent(Object eventSource) {
DnaSample entity = (DnaSample)getEntity().innerDerivedUnit();
dnaQuality.setQualityCheckDate(dateTime);
}
}
-}
+}
\ No newline at end of file
* 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.dna;
import org.eclipse.swt.events.SelectionListener;
import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
/**
- *
* @author pplitzner
* @date Oct 16, 2014
- *
- * @param <T>
*/
-public class SampleDesignationTextDetailElement extends
- AbstractEntityCollectionElement<Identifier> {
+public class SampleDesignationTextDetailElement
+ extends AbstractEntityCollectionElement<Identifier> {
protected TextWithLabelElement text_description;
- /**
- * @param formFactory
- * @param section
- * @param entity
- * @param removeListener
- * @param backgroundColor
- * @param style
- */
public SampleDesignationTextDetailElement(CdmFormFactory formFactory, AbstractFormSection<?> section,
Identifier entity, SelectionListener removeListener, Color backgroundColor, int style) {
super(formFactory, section, entity, removeListener, backgroundColor, style);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#createControls
- * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, int)
- */
- /** {@inheritDoc} */
@Override
public void createControls(ICdmFormElement element, int style) {
text_description = formFactory.createTextWithLabelElement(element,
"Sample Designation", null, style);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#handleEvent(java.lang.Object)
- */
@Override
public void handleEvent(Object eventSource) {
if(eventSource==text_description){
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement#setEntity(java.lang.Object)
- */
@Override
public void setEntity(Identifier entity) {
this.entity = entity;
text_description.setText(entity.getIdentifier());
}
-
-}
+}
\ No newline at end of file
*/
package eu.etaxonomy.taxeditor.ui.section.occurrence.dna;
-import java.net.URI;
import java.net.URISyntaxException;
import org.eclipse.swt.widgets.Text;
import eu.etaxonomy.cdm.model.term.DefinedTerm;
import eu.etaxonomy.cdm.model.term.TermType;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.model.molecular.Sequence;
import eu.etaxonomy.cdm.model.molecular.SequenceString;
import eu.etaxonomy.taxeditor.preference.Resources;
/**
* @author pplitzner
* @date 19.12.2013
- *
*/
public class SequenceGeneralDetailElement extends AbstractCdmDetailElement<Sequence> {
/**
* @author pplitzner
* @date 07.01.2014
- *
*/
-public class SequenceReferenceCollectionDetailElement extends AbstractEntityCollectionElement<Reference>{
+public class SequenceReferenceCollectionDetailElement
+ extends AbstractEntityCollectionElement<Reference>{
protected EntitySelectionElement<Reference> selection_reference;
protected TextWithLabelElement text_referenceDetail;
super(formFactory, section, entity, removeListener, null, style);
}
- /** {@inheritDoc} */
@Override
public void createControls(ICdmFormElement formElement, int style) {
selection_reference = formFactory
- .createSelectionElement(Reference.class,//getConversationHolder(),
+ .createSelectionElement(Reference.class,
formElement, "Reference",
null, EntitySelectionElement.SELECTABLE|EntitySelectionElement.EDITABLE, style);
text_referenceDetail = formFactory.createTextWithLabelElement(
entity.setReferenceAbstract(text_referenceDetail.getText());
}
}
-
-}
+}
\ No newline at end of file
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.element.LabelElement;
import eu.etaxonomy.taxeditor.ui.element.LanguageStringWithLabelElement;
import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
import eu.etaxonomy.taxeditor.ui.element.TimePeriodElement;
private EntitySelectionElement<Collection> selection_collection;
private TextWithLabelElement text_accessionNumber;
private EntitySelectionElement<Reference> selection_publishedIn;
+ private TextWithLabelElement text_published_in_detail;
private CheckboxElement checkIsPublish;
private MediaDetailElement mediaDetailElement;
else{
comboKindOfUnit = formFactory.createDefinedTermComboElement(mediaSpecimenVocabulary, formElement, "Kind of Media", specimen.getKindOfUnit(), style);
textTitleLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Motif", media.getTitle(), style);
+ LabelElement label1 = formFactory.createLabel(formElement, "");
+
selectionArtist = formFactory.createSelectionElement(AgentBase.class, //getConversationHolder(),
formElement, "Prepared by", media.getArtist(), EntitySelectionElement.ALL, style);
TimePeriod mediaCreated = specimen.getMediaSpecimen().getMediaCreated();
date = formFactory.createTimePeriodElement(formElement, "Preparation Date", mediaCreated, style);
textMethodLanguageString = formFactory.createLanguageStringWithLabelElement(formElement, "Method", media.getDescription(Language.getDefaultLanguage()), style);
+// EmptyElement spacer = formFactory.createEmptyElement(formElement, ""); //$NON-NLS-1$
+// spacer.setBackground(getPersistentBackground());
+ LabelElement label2 = formFactory.createLabel(formElement, "");
+
selection_collection = formFactory.createSelectionElement(Collection.class,// getConversationHolder(),
formElement, "Collection", entity.getCollection(), EntitySelectionElement.ALL, style);
text_accessionNumber = formFactory.createTextWithLabelElement(formElement, "Accession Number", entity.getAccessionNumber(), style);
+ LabelElement label3 = formFactory.createLabel(formElement, "");
//the first PrimaryMediaSource is used for storing the reference
Reference publishedIn = null;
+ String publishedInDetail = null;
for(IdentifiableSource source:media.getSources()){
if(source.getType()==OriginalSourceType.PrimaryMediaSource){
publishedIn = source.getCitation();
+ publishedInDetail = source.getCitationMicroReference();
break;
}
}
selection_publishedIn = formFactory.createSelectionElement(Reference.class, //getConversationHolder(),
formElement, "Published in", publishedIn, EntitySelectionElement.ALL, style);
+ text_published_in_detail = formFactory.createTextWithLabelElement(formElement, "Published in Detail", publishedInDetail, style);
+ LabelElement label4 = formFactory.createLabel(formElement, "");
+
checkIsPublish = formFactory.createCheckbox(formElement, "Publish", entity.isPublish(), style);
mediaDetailElement = formFactory.createMediaDetailElement(formElement);
primaryMediaSource.setCitation(selection_publishedIn.getSelection());
}
}
+ else if(eventSource==text_published_in_detail){
+ IdentifiableSource primaryMediaSource = null;
+ for(IdentifiableSource source:media.getSources()){
+ if(source.getType()==OriginalSourceType.PrimaryMediaSource){
+ primaryMediaSource = source;
+ }
+ }
+ if(primaryMediaSource==null){
+ primaryMediaSource = IdentifiableSource.NewInstance(OriginalSourceType.PrimaryMediaSource);
+ media.addSource(primaryMediaSource);
+ }
+ else{
+ primaryMediaSource.setCitationMicroReference(text_published_in_detail.getText());
+ }
+ }
else if(eventSource==checkIsPublish){
((MediaSpecimen)getEntity().innerDerivedUnit()).setPublish(checkIsPublish.getSelection());
}
* 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.reference;
-
-
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import eu.etaxonomy.cdm.model.reference.ReferenceType;
import eu.etaxonomy.taxeditor.store.StoreUtil;
import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
+import eu.etaxonomy.taxeditor.ui.element.CacheRelevance;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;
import eu.etaxonomy.taxeditor.ui.element.DoiWithLabelElement;
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
/**
- * <p>
* ReferenceBaseDetailElement class.
- * </p>
*
* @author n.hoffmann
* @created Mar 2, 2010
public class ReferenceDetailElement extends AbstractIdentifiableEntityDetailElement<Reference>
implements IErrorIntolerableElement, IExceptionHandler {
-
-
private ToggleableTextElement toggleableAbbrevCache;
private TextWithLabelElement text_edition;
private EnumComboElement<ReferenceType> combo_referenceType;
private EntitySelectionElement<Reference> selection_inSeries;
- private boolean isWizard;
+
+ private void registerCacheElements() {
+ registerCacheRelevance(text_edition, toggleable_cache, toggleableAbbrevCache);
+ registerCacheRelevance(text_pages, toggleable_cache);
+ registerCacheRelevance(text_series, toggleable_cache, toggleableAbbrevCache);
+ registerCacheRelevance(text_volume, toggleable_cache, toggleableAbbrevCache);
+ registerCacheRelevance(text_abbrevTitle, toggleableAbbrevCache);
+ registerCacheRelevance(text_title, toggleable_cache);
+ registerCacheRelevance(text_accessed, toggleable_cache, toggleableAbbrevCache);
+ registerCacheRelevance(selection_authorTeam, toggleable_cache, toggleableAbbrevCache);
+ registerCacheRelevance(element_timePeriod, toggleable_cache, toggleableAbbrevCache);
+ registerCacheRelevance(selection_inReference, toggleable_cache, toggleableAbbrevCache);
+ registerCacheRelevance(combo_referenceType, toggleable_cache, toggleableAbbrevCache);
+ }
/**
- * <p>
* Constructor for ReferenceBaseDetailElement.
- * </p>
- *
- * @param cdmFormFactory
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
- * object.
- * @param formElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
- * object.
- * @param style
- * a int.
*/
public ReferenceDetailElement(CdmFormFactory cdmFormFactory,
- ICdmFormElement formElement, int style, boolean isWizard) {
+ ICdmFormElement formElement, int style) {
super(cdmFormFactory, formElement);
- this.isWizard = isWizard;
}
-
- /** {@inheritDoc} */
@Override
protected void createControls(ICdmFormElement formElement,
Reference entity, int style) {
toggleableAbbrevCache = formFactory.createToggleableTextField(formElement,
"Nomencl. Cache", entity.getAbbrevTitleCache(),
- entity.isProtectedAbbrevTitleCache(), style);
+ entity.isProtectedAbbrevTitleCache(), CacheRelevance.CACHE2, style);
combo_referenceType = formFactory.createEnumComboElement(ReferenceType.class,
formElement, style);
// author team
if(referenceType != null && !referenceType.equals(ReferenceType.Journal) && !referenceType.equals(ReferenceType.PrintSeries) ) {
selection_authorTeam = formFactory
- .createSelectionElement(TeamOrPersonBase.class,//getConversationHolder(),
+ .createSelectionElement(TeamOrPersonBase.class,
formElement, "Author",
entity.getAuthorship(),
EntitySelectionElement.ALL, style);
}
-
-
if (referenceType != null) {
createInReferenceByType(this, referenceType, entity, SWT.NULL);
// if (referenceType.equals(ReferenceType.Proceedings)) {
// text_isbn = formFactory.createTextWithLabelElement(this, "ISBN",
// entity.getIsbn(), style);
-// }
+// }
if (referenceType.isPublication()) {
createPublicationControls(this, referenceType, entity,
SWT.NULL);
if (referenceType.isSection()) {
createSectionControls(this, entity, SWT.NULL);
}
-
}
}
createLsid(this, entity, SWT.NULL);
createAbstract(this, entity, SWT.NULL);
+ registerCacheElements();
+
handleToggleableAbbrevTitleField();
handleToggleableCacheField();
+
}
- private void createWebPageControls(ReferenceDetailElement referenceDetailElement, Reference reference, int style) {
+ private void createWebPageControls(ReferenceDetailElement referenceDetailElement, Reference reference, int style) {
DateTime accessed = reference.getAccessed();
- text_accessed = formFactory.createDateElement(referenceDetailElement, "Accessed", accessed, style, false);
-
+ text_accessed = formFactory.createDateElement(referenceDetailElement, "Accessed", accessed, style, false);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.forms.section.cdmdetail.AbstractCdmDetailComposite
- * #updateContent()
- */
- /** {@inheritDoc} */
@Override
protected void updateContent() {
if (getEntity() == null) {
super.updateContent();
// enable elements according to state of cache protection
- // setEnabled(getEntity().isProtectedTitleCache(), Arrays.asList(new
- // Object[]{text_cache}));
toggleable_cache.setEnabled(getEntity().isProtectedTitleCache());
toggleableAbbrevCache.setEnabled(getEntity().isProtectedAbbrevTitleCache());
- setIrrelevantReferenceDetail(false);
- setIrrelevantReferenceDetail(true);
}
/**
* Creates an in reference for reference types that do hav this.
- *
- * @param element
- * @param referenceType
- * @param reference
- * @param style
*/
private void createInReferenceByType(ICdmFormElement element,
ReferenceType referenceType, Reference reference, int style) {
- boolean createInReferenceWidget = true;
- String label = "In Reference";
+
+ String label;
switch (referenceType) {
- case Generic:
- break;
- case Section:
- break;
+ case Book:
+ case Proceedings:
+ label = "In Series";
+ break;
case BookSection:
label = "Book";
break;
case Article:
label = "Journal";
break;
- case WebPage:
- break;
default:
- createInReferenceWidget = false;
+ label = "In Reference";
}
+ boolean createInReferenceWidget = !ReferenceType.inReferenceContraints(referenceType).isEmpty();
+
if (createInReferenceWidget) {
selection_inReference = formFactory
- .createSelectionElement(Reference.class,//getConversationHolder(),
+ .createSelectionElement(Reference.class,
element, label,
reference.getInReference(),
EntitySelectionElement.ALL, style);
/**
* Creates additional controls to edit a generic reference
- *
- * @param element
- * @param reference
- * @param listener
- * @param style
*/
private void createGenericControls(ICdmFormElement element,
Reference reference, int style) {
// pages
text_pages = formFactory.createTextWithLabelElement(element, "Pages",
reference.getPages(), style);
-
-
}
/**
* Creates additional controls to edit a publication
- *
- * @param element
- * @param reference
- * @param listener
- * @param style
*/
private void createPublicationControls(ICdmFormElement element,
ReferenceType referenceType, Reference reference, int style) {
if (referenceType.equals(ReferenceType.Thesis)) {
// school
selection_institution = formFactory
- .createSelectionElement(Institution.class,//getConversationHolder(),
+ .createSelectionElement(Institution.class,
element, "School",
reference.getSchool(),
EntitySelectionElement.ALL, style);
/**
* Creates additional controls to edit a section
- *
- * @param element
- * @param reference
- * @param style
*/
private void createSectionControls(ICdmFormElement element,
Reference reference, int style) {
/**
* Creates additional controls to edit a volume
- *
- * @param element
- * @param reference
- * @param style
*/
private void createVolumeControls(ICdmFormElement element,
Reference reference, int style) {
reference.getSeriesPart(), style);
}
- /**
- *
- * @param element
- * @param referenceType
- * @param reference
- * @param style
- */
private void createPrintedUnitControls(ICdmFormElement element,
ReferenceType referenceType, Reference reference, int style) {
// in series
- selection_inSeries = formFactory
- .createSelectionElement(Reference.class,//getConversationHolder(),
- element, "In Series",
- (Reference) reference.getInSeries(),
- EntitySelectionElement.ALL, style);
+ //handled in generic in-Reference part
// editor
text_editor = formFactory.createTextWithLabelElement(element, "Editor",
// edition
text_edition = formFactory.createTextWithLabelElement(element,
"Edition", reference.getEdition(), style);
-
}
+
// isbn
text_isbn = formFactory.createTextWithLabelElement(element, "ISBN",
reference.getIsbn(), style);
Reference reference, int style) {
text_lsid = formFactory.createLsidWithExceptionLabelElement(element, "LSID",
reference.getLsid(), style);
-
}
+
private void createUri(ICdmFormElement element,
Reference reference, int style) {
if (reference.getType().equals(ReferenceType.WebPage)){
createWebPageControls(this, reference, style);
}
-
}
- /** {@inheritDoc} */
+
@Override
public void handleEvent(Object eventSource) {
if (eventSource == combo_referenceType) {
firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
}
-
@Override
public void updateToggleableCacheField() {
if (!getEntity().isProtectedTitleCache()) {
}
protected void handleToggleableAbbrevTitleField() {
- boolean pushedAbbrevState = toggleableAbbrevCache.getState();
- getEntity().setAbbrevTitleCache(toggleableAbbrevCache.getText(), pushedAbbrevState);
- setIrrelevantReferenceDetail(true);
+ getEntity().setAbbrevTitleCache(
+ toggleableAbbrevCache.getText(), toggleableAbbrevCache.getState());
updateToggleableCacheField();
+ updateCacheRelevance();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleException
- * (eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent)
- */
- /** {@inheritDoc} */
@Override
public void handleException(CdmPropertyChangeEvent event) {
exceptionOccurred(event);
}
- /*
- * (non-Javadoc)
- *
- * @see eu.etaxonomy.taxeditor.forms.IExceptionHandler#clearException()
- */
- /** {@inheritDoc} */
@Override
public void clearException() {
exceptionOccurred(null);
}
- private final List<IExceptionHandler> exceptionHandlers = new ArrayList<IExceptionHandler>();
+ private final List<IExceptionHandler> exceptionHandlers = new ArrayList<>();
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.forms.IErrorIntolerableElement#addExceptionHandler
- * (eu.etaxonomy.taxeditor.forms.IExceptionHandler)
- */
- /** {@inheritDoc} */
@Override
public void addExceptionHandler(IExceptionHandler handler) {
exceptionHandlers.add(handler);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.forms.IErrorIntolerableElement#removeExceptionHandler
- * (eu.etaxonomy.taxeditor.forms.IExceptionHandler)
- */
- /** {@inheritDoc} */
@Override
public void removeExceptionHandler(IExceptionHandler handler) {
exceptionHandlers.remove(handler);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.forms.IErrorIntolerableElement#exceptionOccurred
- * (eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent)
- */
- /** {@inheritDoc} */
@Override
public void exceptionOccurred(CdmPropertyChangeEvent event) {
for (IExceptionHandler handler : exceptionHandlers) {
@Override
protected void handleToggleableCacheField() {
-
- boolean pushedState = toggleable_cache.getState();
- getEntity().setTitleCache(toggleable_cache.getText(), pushedState);
- setIrrelevantReferenceDetail(false);
+ getEntity().setTitleCache(toggleable_cache.getText(), toggleable_cache.getState());
updateToggleableCacheField();
+ updateCacheRelevance();
}
protected void setIrrelevantReferenceDetail(boolean abbrev){
- List<Object> except = new ArrayList();
+ List<Object> except = new ArrayList<>();
except.addAll( Arrays.asList(new Object[] { toggleable_cache, toggleableAbbrevCache, text_editor, text_isbn, text_issn, text_organisation, text_pages, text_placePublished, text_publisher, text_referenceAbstract, text_uri, selection_institution}));
- boolean pushedState;
+
if (abbrev){
except.add(text_title);
} else{
except.add(text_abbrevTitle);
}
- pushedState = toggleableAbbrevCache.getState() || toggleable_cache.getState();
switch( getEntity().getType()){
case Journal:
break;
}
- setIrrelevant(pushedState, except);
- text_title.setIrrelevant(toggleable_cache.getState());
- text_abbrevTitle.setIrrelevant(toggleableAbbrevCache.getState());
+ updateCacheRelevance();
}
-
-
-
-
-}
+}
\ No newline at end of file
* 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.reference;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
*
* @author n.hoffmann
* @created 05.06.2009
- * @version 1.0
*/
public class ReferenceDetailSection extends AbstractCdmDetailSection<Reference> implements ITaxonBaseDetailSection{
- private TaxonBase taxonBase;
+ private TaxonBase<?> taxonBase;
/**
* <p>Constructor for ReferenceBaseDetailSection.</p>
super(cdmFormFactory, conversation, parentElement, selectionProvider, style);
}
- /** {@inheritDoc} */
@Override
- public void setTaxonBase(TaxonBase entity) {
+ public void setTaxonBase(TaxonBase<?> entity) {
this.taxonBase = entity;
- TaxonName name = HibernateProxyHelper.deproxy(entity.getName());
-
- Reference reference = (Reference) HibernateProxyHelper.deproxy(name.getNomenclaturalReference());
+ TaxonName name = entity.getName();
+ Reference reference = HibernateProxyHelper.deproxy(name.getNomenclaturalReference());
setEntity(reference);
}
- /** {@inheritDoc} */
@Override
public String getHeading() {
return "Reference";
}
- /** {@inheritDoc} */
@Override
public void refresh() {
super.refresh();
}
@Override
- public TaxonBase getTaxonBase() {
+ public TaxonBase<?> getTaxonBase() {
return taxonBase;
}
@Override
protected AbstractCdmDetailElement<Reference> createCdmDetailElement(AbstractCdmDetailSection<Reference> parentElement, int style) {
- return formFactory.createReferenceDetailElement(parentElement, style, false);
+ return formFactory.createReferenceDetailElement(parentElement, style);
}
-
-}
+}
\ No newline at end of file
* 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.reference;
import org.eclipse.swt.SWT;
*
* @author n.hoffmann
* @created Jun 1, 2010
- * @version 1.0
*/
public class ReferenceWizardPage extends AbstractCdmEntityWizardPage<Reference> implements IExceptionHandler{
-
/**
* <p>Constructor for ReferenceBaseWizardPage.</p>
*
@Override
public void createControl(Composite parent) {
-
super.createControl(parent);
-
}
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.CdmEntityWizardPage#createElement(eu.etaxonomy.taxeditor.forms.ICdmFormElement)
- */
- /** {@inheritDoc} */
@Override
public AbstractCdmDetailElement<Reference> createElement(ICdmFormElement rootElement){
- ReferenceDetailElement referenceElement = formFactory.createReferenceDetailElement(rootElement, SWT.NULL, true);
+ ReferenceDetailElement referenceElement = formFactory.createReferenceDetailElement(rootElement, SWT.NULL);
referenceElement.addExceptionHandler(this);
referenceElement.setEntity(entity);
referenceElement.setWarnForReferencingObjectsVisible(true);
return referenceElement;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.IExceptionHandler#handleException(eu.etaxonomy.taxeditor.forms.CdmPropertyChangeEvent)
- */
- /** {@inheritDoc} */
@Override
public void handleException(CdmPropertyChangeEvent event) {
setMessage(event.getException().getMessage(), WARNING);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.IExceptionHandler#clearException()
- */
- /** {@inheritDoc} */
@Override
public void clearException() {
setMessage(null);
}
-}
+}
\ No newline at end of file
* 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.taxon;
-import java.util.Arrays;
-
import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.swt.SWT;
/**
* @author n.hoffmann
* @created Feb 26, 2010
- * @version 1.0
*/
-public class TaxonBaseDetailElement extends AbstractIdentifiableEntityDetailElement<TaxonBase> {
+public class TaxonBaseDetailElement extends AbstractIdentifiableEntityDetailElement<TaxonBase<?>> {
private CheckboxElement checkbox_doubtful;
private CheckboxElement checkbox_useNameCache;
private EntitySelectionElement<Reference> selection_secundum;
- private EntitySelectionElement<Reference> selection_sensu;
private TextWithLabelElement text_secundum_microreference;
private TextWithLabelElement text_appendedPhrase;
private CheckboxElement checkbox_published;
private TermComboElement<SynonymType> combo_relationshipType;
- private CheckboxElement checkProParte;
- private CheckboxElement checkPartial;
public TaxonBaseDetailElement(CdmFormFactory cdmFormFactory,
ICdmFormElement formElement, int style) {
super(cdmFormFactory, formElement);
}
- /** {@inheritDoc} */
@Override
- protected void createControls(ICdmFormElement formElement, TaxonBase entity, int style) {
+ protected void createControls(ICdmFormElement formElement, TaxonBase<?> entity, int style) {
NameDetailsConfigurator config = PreferencesUtil.getPreferredNameDetailsConfiguration();
toggleable_cache = formFactory.createToggleableTextField(formElement,
"Title Cache", entity.getTitleCache(),
entity.isProtectedTitleCache(), style);
-
text_appendedPhrase = formFactory.createTextWithLabelElement(
formElement, "Appended Phrase", entity.getAppendedPhrase(),
SWT.WRAP);
-
-
selection_secundum = formFactory.createSelectionElement(Reference.class,
formElement, "Secundum",
entity.getSec(), EntitySelectionElement.ALL,
entity.getClass().getSimpleName() + " is doubtful", entity.isDoubtful(), style);
-
checkbox_published = formFactory.createCheckbox(formElement,
entity.getClass().getSimpleName()+" is published", entity.isPublish(), style);
-
if(entity instanceof Synonym){
//#6198 removed type as it is currently not handled correctly in the editor
// combo_relationshipType = formFactory.createDefinedTermComboElement(TermType.SynonymType, formElement, "Synonym Type", ((Synonym) entity).getType(), style);
- //#7334 removed pro parte and partial as they are handled as concept relationships now
-// checkProParte = formFactory.createCheckbox(formElement, "Pro Parte Synonym", ((Synonym) entity).isProParte(), style);
-// checkPartial= formFactory.createCheckbox(formElement, "Partial Synonym", ((Synonym) entity).isPartial(), style);
}
+
+ //cache relevance
+ registerCacheRelevance(checkbox_doubtful);
+ registerCacheRelevance(checkbox_useNameCache);
+ registerCacheRelevance(selection_secundum);
+ registerCacheRelevance(text_secundum_microreference);
+ registerCacheRelevance(text_appendedPhrase);
+ registerCacheRelevance(combo_relationshipType);
}
private void updateCheckboxPublish() {
updateCheckboxPublish();
}
- /** {@inheritDoc} */
@Override
protected void updateContent() {
super.updateContent();
toggleable_cache.setEnabled(getEntity().isProtectedTitleCache());
- setIrrelevant(toggleable_cache.getState(),
- Arrays.asList(new Object[] { toggleable_cache, checkbox_published}));
+ updateCacheRelevance();
}
@Override
super.handleTitleCacheRelevantChange(event);
}
- /** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
if (eventSource== toggleable_cache) {
// ((Synonym) getEntity()).setProParte(checkProParte.getSelection());
}
}
+
@Override
protected void handleToggleableCacheField() {
- boolean pushedState = toggleable_cache.getState();
-
- getEntity().setTitleCache(toggleable_cache.getText(), pushedState);
- setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache, checkbox_published}));
+ getEntity().setTitleCache(toggleable_cache.getText(), toggleable_cache.getState());
+ updateCacheRelevance();
updateToggleableCacheField();
}
-}
+}
\ No newline at end of file
* 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.taxon;
import org.eclipse.jface.viewers.ISelectionProvider;
/**
* @author n.hoffmann
* @created Nov 4, 2009
- * @version 1.0
*/
-public class TaxonBaseDetailSection extends AbstractCdmDetailSection<TaxonBase> {
+public class TaxonBaseDetailSection extends AbstractCdmDetailSection<TaxonBase<?>> {
public TaxonBaseDetailSection(CdmFormFactory cdmFormFactory, ConversationHolder conversation, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) {
super(cdmFormFactory, conversation, parentElement, selectionProvider, style);
}
- /** {@inheritDoc} */
@Override
public String getHeading() {
return getEntity() != null ? getEntity().getClass().getSimpleName() : "TaxonBase";
}
@Override
- protected AbstractCdmDetailElement<TaxonBase> createCdmDetailElement(AbstractCdmDetailSection<TaxonBase> parentElement, int style) {
+ protected AbstractCdmDetailElement<TaxonBase<?>> createCdmDetailElement(AbstractCdmDetailSection<TaxonBase<?>> parentElement, int style) {
return formFactory.createTaxonBaseDetailElement(parentElement, style);
}
+/**
+ * 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.taxon;
-import java.util.Arrays;
-
import org.eclipse.swt.SWT;
import org.eclipse.swt.widgets.Display;
private SelectionArbitrator selectionArbitrator;
-
-
-
private CheckboxElement checkbox_doubtful;
-
public TaxonOfRelationshipElement(CdmFormFactory formFactory, ICdmFormElement formElement, int style ) {
super(formFactory, formElement);
}
@Override
protected void handleToggleableCacheField() {
- boolean pushedState = toggleable_cache.getState();
-
- getEntity().setTitleCache(toggleable_cache.getText(), pushedState);
- setIrrelevant(pushedState, Arrays.asList(new Object[] { toggleable_cache}));
+ getEntity().setTitleCache(toggleable_cache.getText(), toggleable_cache.getState());
+ updateCacheRelevance();
updateToggleableCacheField();
}
-
-
@Override
public void updateToggleableCacheField() {
-
- if (toggleable_cache != null){
- if (!getEntity().isProtectedTitleCache()) {
- toggleable_cache.setText(getEntity().generateTitle());
- }
- }
+ if (toggleable_cache != null){
+ if (!getEntity().isProtectedTitleCache()) {
+ toggleable_cache.setText(getEntity().generateTitle());
+ }
+ }
}
@Override
public void refresh(){
updateContent();
updateToggleableCacheField();
- }
+ }
@Override
protected void updateContent() {
- super.updateContent();
- toggleable_cache.setEnabled(getEntity().isProtectedTitleCache());
- setIrrelevant(toggleable_cache.getState(),
- Arrays.asList(new Object[] { toggleable_cache}));
+ super.updateContent();
+ toggleable_cache.setEnabled(getEntity().isProtectedTitleCache());
+ updateCacheRelevance();
firePropertyChangeEvent(getEntity());
-
- }
-
-
+ }
@Override
protected void createControls(ICdmFormElement formElement, Taxon entity, int style) {
selectionArbitrator = formFactory.createSelectionArbitrator(this);
}
+ //cache relevance
+ registerCacheRelevance(checkbox_doubtful);
}
-
-
@Override
public void handleEvent(Object eventSource) {
if (eventSource== toggleable_cache) {
} else if (eventSource == checkbox_doubtful) {
getEntity().setDoubtful(checkbox_doubtful.getSelection());
}
-
}
@Override
}
@Override
public void setWarnForReferencingObjects(ICdmFormElement formElement, int defaultReferencingObjects){
- if (getEntity() instanceof Taxon){
- Taxon taxon = getEntity();
- if (taxon.getId() != 0){
- long referencingObjectsCount = CdmStore.getCommonService().getReferencingObjectsCount(taxon);
-
- if (referencingObjectsCount > defaultReferencingObjects){
- setWarnForReferencedObjects(formFactory.createLabel(formElement, CdmUtils.Nz("The "+ taxon.getUserFriendlyTypeName()+" is referenced by " + (referencingObjectsCount - defaultReferencingObjects)+ " other object(s), if you change it, it is changed for all these objects")));
- getWarnForReferencedObjects().setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- getWarnForReferencedObjects().setLayout(LayoutConstants.FILL(2, 3));
- getWarnForReferencedObjects().setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
- formFactory.createLabel(formElement, "");
-
- }
+ Taxon taxon = getEntity();
+ if (taxon.getId() != 0){
+ long referencingObjectsCount = CdmStore.getCommonService().getReferencingObjectsCount(taxon);
+
+ if (referencingObjectsCount > defaultReferencingObjects){
+ setWarnForReferencedObjects(formFactory.createLabel(formElement, CdmUtils.Nz("The "+ taxon.getUserFriendlyTypeName()+" is referenced by " + (referencingObjectsCount - defaultReferencingObjects)+ " other object(s), if you change it, it is changed for all these objects")));
+ getWarnForReferencedObjects().setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ getWarnForReferencedObjects().setLayout(LayoutConstants.FILL(2, 3));
+ getWarnForReferencedObjects().setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+ formFactory.createLabel(formElement, "");
}
}
}
-
-
-}
+}
\ No newline at end of file
* 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.taxon;
import org.eclipse.swt.SWT;
import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
/**
- *
* @author pplitzner
* @date Jan 18, 2016
- *
*/
-public class TaxonWizardPage extends AbstractCdmEntityWizardPage<TaxonBase> {
+public class TaxonWizardPage extends AbstractCdmEntityWizardPage<TaxonBase<?>> {
public TaxonWizardPage(CdmFormFactory formFactory, ConversationHolder conversation,
- TaxonBase entity) {
+ TaxonBase<?> entity) {
super(formFactory, conversation, entity);
setTitle("Taxon");
}
-
- /** {@inheritDoc} */
@Override
- public AbstractCdmDetailElement<TaxonBase> createElement(ICdmFormElement rootElement) {
+ public AbstractCdmDetailElement<TaxonBase<?>> createElement(ICdmFormElement rootElement) {
TaxonBaseDetailElement taxonBaseDetailElement = formFactory.createTaxonBaseDetailElement(rootElement, SWT.NULL);
taxonBaseDetailElement.setEntity(entity);
return taxonBaseDetailElement;
/**
- *
- */
+* Copyright (C) 2013 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.user;
import java.util.List;
/**
* @author n.hoffmann
- *
*/
public class UserDetailSection extends AbstractCdmDetailSection<User> {
super(formFactory, conversation, parentElement, selectionProvider, style);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.ICdmFormElement#setPropertyChangeListeners(java.util.List)
- */
@Override
public void setPropertyChangeListeners(
List<IPropertyChangeListener> propertyChangeListeners) {
-
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading()
- */
@Override
public String getHeading() {
return "User " + (getEntity() != null ? getEntity().getUsername() : "");
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
@Override
protected AbstractCdmDetailElement<User> createCdmDetailElement(AbstractCdmDetailSection<User> parentElement, int style) {
return formFactory.createUserDetailElement(parentElement);
/**\r
* @author l.morris\r
* @date 20 Dec 2011\r
- *\r
*/\r
public class TermVocabularyDetailElement extends AbstractTermBaseDetailElement<TermVocabulary> {\r
\r
* 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.selection;
import java.util.Collections;
/**
* @author n.hoffmann
* @created Jun 1, 2010
- * @version 1.0
*/
public class EditFromSelectionWizard extends Wizard implements
- SelectionListener, ICdmEntitySessionEnabled {
+ SelectionListener, ICdmEntitySessionEnabled<CdmBase> {
private ICdmEntitySession cdmEntitySession;
private ICdmEntitySession previousCdmEntitySession;
- private final EntitySelectionElement selectionElement;
+ private final EntitySelectionElement<CdmBase> selectionElement;
private CdmBase rootElement;
public EditFromSelectionWizard(EntitySelectionElement selectionElement) {
this.setWindowTitle(String.format("Edit %s", TextHelper.deproxyClassName(selectionElement.getEntity().getClass())));
}
- /** {@inheritDoc} */
@Override
public void addPages() {
MessagingUtils.warningDialog("Missing interface", this,
"No detail element for current selection");
}
-
}
- /** {@inheritDoc} */
@Override
public boolean performFinish() {
IService<CdmBase> service = CdmStore.getService(rootElement);
return true;
}
- /** {@inheritDoc} */
@Override
public void widgetSelected(SelectionEvent e) {
WizardDialog dialog = new WizardDialog(selectionElement.getShell(),
}
}
- /** {@inheritDoc} */
@Override
public void widgetDefaultSelected(SelectionEvent e) {
}
/**\r
+ * Copyright (C) 2007 EDIT\r
+ * European Distributed Institute of Taxonomy\r
+ * http://www.e-taxonomy.eu\r
*\r
+ * The contents of this file are subject to the Mozilla Public License Version 1.1\r
+ * See LICENSE.TXT at the top of this package for the full license terms.\r
*/\r
package eu.etaxonomy.taxeditor.ui.selection;\r
\r
import eu.etaxonomy.cdm.model.permission.Group;\r
import eu.etaxonomy.cdm.model.permission.User;\r
import eu.etaxonomy.cdm.model.reference.Reference;\r
+import eu.etaxonomy.taxeditor.model.AbstractUtility;\r
import eu.etaxonomy.taxeditor.model.ImageResources;\r
import eu.etaxonomy.taxeditor.preference.Resources;\r
import eu.etaxonomy.taxeditor.store.CdmStore;\r
import eu.etaxonomy.taxeditor.store.LoginManager;\r
import eu.etaxonomy.taxeditor.store.StoreUtil;\r
import eu.etaxonomy.taxeditor.ui.dialog.selection.SelectionDialogFactory;\r
-import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement;\r
+import eu.etaxonomy.taxeditor.ui.element.AbstractRelevanceFormElement;\r
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;\r
import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent;\r
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;\r
/**\r
* @author n.hoffmann\r
* @created Nov 17, 2009\r
- * @version 1.0\r
- * @param <T>\r
*/\r
-public class EntitySelectionElement<T extends CdmBase> extends\r
- AbstractCdmFormElement implements SelectionListener, IEnableableFormElement, ISelectableElement, IEntityElement<T>, ILabeledElement, //IConversationEnabled,\r
- Observer {\r
+public class EntitySelectionElement<T extends CdmBase>\r
+ extends AbstractRelevanceFormElement\r
+ implements SelectionListener, IEnableableFormElement, ISelectableElement,\r
+ IEntityElement<T>, ILabeledElement, Observer {\r
\r
private static final EnumSet<CRUD> UPDATE = EnumSet.of(CRUD.UPDATE);\r
private static final EnumSet<CRUD> DELETE = EnumSet.of(CRUD.DELETE);\r
private final boolean isDeletable;\r
private final boolean isExternal;\r
\r
-// private final ConversationHolder conversation;\r
private Class<T> clazz;\r
\r
public EntitySelectionElement(CdmFormFactory formFactory,\r
-// ConversationHolder conversation,\r
ICdmFormElement parentElement, Class<T> clazz,\r
String labelString, T entity, int mode, int style, boolean filterElement){\r
this(formFactory, parentElement, clazz, labelString, entity, mode, style, filterElement, null);\r
}\r
\r
-\r
public EntitySelectionElement(CdmFormFactory formFactory,\r
-// ConversationHolder conversation,\r
ICdmFormElement parentElement, Class<T> clazz,\r
String labelString, T entity, int mode, int style, boolean filterElement, Integer limit) {\r
super(formFactory, parentElement);\r
\r
this.labelString = (labelString == null || labelString.equals("")) ? "" : labelString;\r
\r
-// this.conversation = conversation;\r
-\r
if (isSelectable && formFactory.getSelectionProvider() != null) {\r
selectionArbitrator = formFactory.createSelectionArbitrator(this);\r
}\r
\r
private void setFilteredEntity(T filterEntity) {\r
this.filteredEntity =filterEntity;\r
-\r
}\r
\r
- public EntitySelectionElement(CdmFormFactory formFactory,//ConversationHolder conversation,\r
+ public EntitySelectionElement(CdmFormFactory formFactory,\r
ICdmFormElement parentElement, Class<T> clazz,\r
String labelString, T entity, int mode, int style){\r
- this(formFactory, //conversation,\r
+ this(formFactory,\r
parentElement, clazz, labelString, entity, mode, style, false);\r
}\r
\r
- public EntitySelectionElement(CdmFormFactory formFactory,//ConversationHolder conversation,\r
+ public EntitySelectionElement(CdmFormFactory formFactory,\r
ICdmFormElement parentElement, Class<T> clazz,\r
String labelString, T entity, int mode, int style, Integer limit){\r
- this(formFactory, //conversation,\r
+ this(formFactory,\r
parentElement, clazz, labelString, entity, mode, style, false, limit);\r
- }\r
+ }\r
\r
private void createControls(Composite parent, int style, Integer limit) {\r
\r
addControl(text);\r
\r
text.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());\r
- text.setBackground(StoreUtil\r
- .getColor(Resources.COLOR_TEXT_DISABLED_BACKGROUND));\r
+ text.setBackground(AbstractUtility.getColor(Resources.COLOR_TEXT_DISABLED_BACKGROUND));\r
if (limit != null){\r
text.setTextLimit(limit);\r
}\r
@Override\r
public void widgetSelected(SelectionEvent e) {\r
if (e.getSource().equals(button_selection) ){\r
- T selection = SelectionDialogFactory.getSelectionFromDialog(clazz, getShell(), //getConversationHolder(),\r
+ T selection = SelectionDialogFactory.getSelectionFromDialog(clazz, getShell(),\r
getEntity(), getParentElement());\r
setSelectionInternal(selection);\r
if(!getLayoutComposite().isDisposed()){\r
StoreUtil.reflowParentScrolledForm(getLayoutComposite(), true);\r
}\r
}else{\r
- Reference selection = SelectionDialogFactory.getSelectionFromExtDialog(Reference.class, getShell(),//null,\r
+ Reference selection = SelectionDialogFactory.getSelectionFromExtDialog(Reference.class, getShell(),\r
getParentElement());\r
setSelectionInternal((T)selection);\r
}\r
-\r
}\r
\r
- /**\r
- * @return\r
- */\r
public T getFilteredEntity() {\r
\r
return this.filteredEntity;\r
\r
/**\r
* Return the selected object\r
- *\r
- * @return a T object.\r
*/\r
public T getSelection() {\r
return entity;\r
}\r
\r
- /*\r
- * (non-Javadoc)\r
- *\r
- * @see\r
- * eu.etaxonomy.taxeditor.forms.IEnableableFormElement#setEnabled(boolean)\r
- */\r
- /** {@inheritDoc} */\r
@Override\r
public void setEnabled(boolean enabled) {\r
\r
\r
}\r
\r
- /* (non-Javadoc)\r
- * @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#isEnabled()\r
- */\r
@Override\r
public boolean isEnabled() {\r
return button_selection.isEnabled();\r
}\r
\r
/**\r
- * <p>\r
* setSelectionInternal\r
- * </p>\r
- *\r
- * @param selection\r
- * a T object.\r
*/\r
protected void setSelectionInternal(T selection) {\r
if (selection != null && !selection.equals(this.entity)) {\r
}\r
\r
/**\r
- * <p>\r
* Setter for the field <code>entity</code>.\r
- * </p>\r
- *\r
- * @param selection\r
- * a T object.\r
*/\r
public void setEntity(T selection) {\r
this.entity = selection;\r
}\r
\r
/**\r
- * <p>\r
* getTitle\r
- * </p>\r
- *\r
- * @return a {@link java.lang.String} object.\r
*/\r
protected String getTitle() {\r
if (entity != null){\r
return "";\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
public void setSelected(boolean selected) {\r
setBackground(selected ? SELECTED : getPersistentBackground());\r
}\r
\r
- /*\r
- * (non-Javadoc)\r
- *\r
- * @see eu.etaxonomy.taxeditor.forms.IEntityElement#getEntity()\r
- */\r
/**\r
- * <p>\r
* Getter for the field <code>entity</code>.\r
- * </p>\r
- *\r
- * @return a T object.\r
*/\r
@Override\r
public T getEntity() {\r
return entity;\r
}\r
\r
- /*\r
- * (non-Javadoc)\r
- *\r
- * @see eu.etaxonomy.taxeditor.forms.section.cdmdetail.ISelectableElement#\r
- * getSelectionArbitrator()\r
- */\r
/**\r
- * <p>\r
* Getter for the field <code>selectionArbitrator</code>.\r
- * </p>\r
- *\r
- * @return a {@link eu.etaxonomy.taxeditor.ui.element.SelectionArbitrator}\r
- * object.\r
*/\r
@Override\r
public SelectionArbitrator getSelectionArbitrator() {\r
return getLayoutComposite().getShell();\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
- public void setIrrelevant(boolean irrelevant) {\r
- String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT\r
- : Resources.COLOR_TEXT_DISABLED_BACKGROUND;\r
-\r
- Color color = StoreUtil.getColor(colorId);\r
+ public void updateCacheRelevance() {\r
+ Color color = cacheRelevance().getColor(Resources.COLOR_TEXT_DISABLED_BACKGROUND);\r
text.setBackground(color);\r
}\r
\r
public void widgetDefaultSelected(SelectionEvent e) {\r
}\r
\r
- /**\r
- * <p>\r
- * getConversationHolder\r
- * </p>\r
- *\r
- * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}\r
- * object.\r
- */\r
// @Override\r
public ConversationHolder getConversationHolder() {\r
if(getParentElement() instanceof IConversationEnabled) {\r
return null;\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
public void setBackground(Color color) {\r
\r
}\r
}\r
\r
- /** {@inheritDoc} */\r
@Override\r
public void setLabel(String labelString) {\r
if (label != null) {\r
}\r
}\r
\r
- /**\r
- * <p>\r
- * Getter for the field <code>label</code>.\r
- * </p>\r
- *\r
- * @return a {@link java.lang.String} object.\r
- */\r
@Override\r
public String getLabel() {\r
if (label != null) {\r
return null;\r
}\r
\r
- /** {@inheritDoc} */\r
-// @Override\r
-// public void update(CdmDataChangeMap changeEvents) {\r
-// }\r
-\r
- /* (non-Javadoc)\r
- * @see eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement#removeElements()\r
- */\r
@Override\r
public void removeElements(){\r
super.removeElements();\r
getLayoutComposite().layout();\r
\r
}\r
-}\r
+}
\ No newline at end of file
import org.eclipse.jface.viewers.TreeNode;
import eu.etaxonomy.cdm.model.common.ICdmBase;
+import eu.etaxonomy.cdm.model.name.NomenclaturalSource;
import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache;
import eu.etaxonomy.taxeditor.l10n.Messages;
import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
firstElement = ((TreeNode) firstElement).getValue();
}
-
+ if (firstElement instanceof NomenclaturalSource){
+ firstElement = ((NomenclaturalSource)firstElement).getSourcedName();
+ }
Map<Command, String> enabledCommands = CdmViewerUtilE4.getAvailableViewers(firstElement, commandService, handlerService);
//check if only one or multiple viewers/commands are available
Command command = entry.getKey();
if (selectedObject instanceof IStructuredSelection){
menu.getChildren().add(addCommand(selectedObject, command, viewerName));
- }else if(selectedObject instanceof ICdmBase){
+ }else if(firstElement instanceof ICdmBase){
// UUID uuid = ((ICdmBase) selectedObject).getUuid();
- menu.getChildren().add(addCommand(selectedObject, command, viewerName));
+ menu.getChildren().add(addCommand(firstElement, command, viewerName));
}else if (selectedObject instanceof UuidAndTitleCache){
menu.getChildren().add(addCommand(selectedObject, command, viewerName));
}
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import org.apache.http.client.ClientProtocolException;
import org.eclipse.swt.widgets.Display;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
import eu.etaxonomy.cdm.ext.occurrence.bioCase.BioCaseQueryServiceWrapper;
import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
/**
* @author pplitzner
* @date 25.02.2014
- *
*/
public class BioCaseEditorInput extends DataImportEditorInput<SpecimenOrObservationBase<?>> {
});
}
- /* (non-Javadoc)
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
final int prime = 31;
return result;
}
- /* (non-Javadoc)
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(Object obj) {
if (this == obj) {
}
return true;
}
-}
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.view.dataimport;
import java.net.MalformedURLException;
-import java.net.URI;
+import eu.etaxonomy.cdm.common.URI;
import java.net.URISyntaxException;
import java.net.URL;
* Wizard page for selecting the specimen provider
* @author pplitzner
* @date 12.09.2013
- *
*/
public class SpecimenProviderSelectionWizardPage extends WizardPage{
}
}
- /**
- * @return
- * @throws URISyntaxException
- */
public URI getEndPoint() {
return endPoint;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
- */
@Override
public boolean isPageComplete() {
if(specimenProviderSelectionController.getComposite().getBtnBioCaseProvider().getSelection()){
endPoint = null;
try {
- endPoint = new URL(specimenProviderSelectionController.getComposite().getTxtAccessPoint().getText()).toURI();
+ endPoint = URI.fromUrl(new URL(specimenProviderSelectionController.getComposite().getTxtAccessPoint().getText()));
serviceWrapper = new BioCaseQueryServiceWrapper();
serviceWrapper.setBaseUrl(specimenProviderSelectionController.getComposite().getTxtAccessPoint().getText());
this.setErrorMessage(null);
return false;
}
- /**
- * @return the bioCaseQueryServiceWrapper
- */
public ServiceWrapperBase getQueryServiceWrapper() {
return serviceWrapper;
}
-
- /**
- * @param bioCaseQueryServiceWrapper the bioCaseQueryServiceWrapper to set
- */
public void setQueryServiceWrapper(ServiceWrapperBase queryServiceWrapper) {
this.serviceWrapper = queryServiceWrapper;
}
- /**
- * @return
- */
public SpecimenProviderSelectionController getController() {
return specimenProviderSelectionController;
}
-
-
-
-
-}
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.view.dataimport.e4;
-import java.net.URI;
import java.time.LocalDate;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import org.eclipse.swt.widgets.Table;
import org.eclipse.swt.widgets.TableItem;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.ITermService;
import eu.etaxonomy.cdm.ext.occurrence.OccurenceQuery;
import eu.etaxonomy.taxeditor.view.dataimport.GbifResponseComparator;
/**
- *
* @author pplitzner
* @since Oct 4, 2017
- *
*/
public class SaveImportedSpecimenActionE4 extends Action {
@Override
public void run() {
Table table = dataImportView.getTable();
- Collection<GbifResponse> checkedResults = new HashSet<GbifResponse>();
- Collection<BioCaseResponse> checkedAbcdResults = new HashSet<BioCaseResponse>();
+ Collection<GbifResponse> checkedResults = new HashSet<>();
+ Collection<BioCaseResponse> checkedAbcdResults = new HashSet<>();
Object data;
- Set<String[]> unitIdsGbif = new HashSet<String[]>();
- Set<String[]> unitIdsBioCase = new HashSet<String[]>();
- List<GbifResponse> biocaseResponses = new ArrayList<GbifResponse>();
+ Set<String[]> unitIdsGbif = new HashSet<>();
+ Set<String[]> unitIdsBioCase = new HashSet<>();
+ List<GbifResponse> biocaseResponses = new ArrayList<>();
for(TableItem item:table.getItems()){
if(item.getChecked()){
}else{
unitIdsGbif.add(tripleId);
}
-
-
}
}
Collections.sort(biocaseResponses, getComparator());
Abcd206ImportConfigurator configuratorAbcd;
- List<Abcd206ImportConfigurator> abcdConfigurators = new ArrayList<Abcd206ImportConfigurator>();
+ List<Abcd206ImportConfigurator> abcdConfigurators = new ArrayList<>();
DataSetResponse dataSetResponse;
OccurenceQuery bioCaseOccurrenceQuery = null;
URI dataSetUri = null;
configuratorAbcd.setSourceReferenceTitle(sourceRef);
}
- unitIdsBioCase = new HashSet<String[]>();
+ unitIdsBioCase = new HashSet<>();
bioCaseOccurrenceQuery = new OccurenceQuery(unitIdsBioCase);
configuratorAbcd.setOccurenceQuery(bioCaseOccurrenceQuery);
Job gbifJob = CdmStore.getImportManager().createIOServiceJob(configurator);
CdmStore.getImportManager().run(gbifJob);
}
-
}
private void persistTerm(DefinedTermBase<?> term, ITermService termService, ConversationHolder conversation){
}
return comparator;
}
-
-}
+}
\ No newline at end of file
import java.io.IOException;
import java.io.InputStream;
-import java.net.URI;
import java.util.ArrayList;
import java.util.Collection;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.ext.occurrence.bioCase.BioCaseQueryServiceWrapper;
import eu.etaxonomy.cdm.ext.occurrence.bioCase.BioCaseResponse;
import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206DataHolder;
/**
* @author pplitzner
* @date Sep 3, 2014
- *
*/
public class SpecimenImportViewE4 extends DataImportViewE4<BioCaseResponse> {
}
- /**
- * @param endPoint
- */
public void setEndpoint(URI endPoint) {
this.endPoint = endPoint;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.view.dataimport.DataImportView#getTextForTableItem(java.lang.Object)
- */
@Override
protected String getTextForTableItem(BioCaseResponse item) {
//TODO: could be defined in user preferences...
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.view.dataimport.DataImportView#query()
- */
@Override
public void query() {
String errorMessage = "Could not execute query " + query;
// setResults(results);
}
-
-
-
-}
+}
\ No newline at end of file
package eu.etaxonomy.taxeditor.view.dataimport.e4;
import java.net.MalformedURLException;
-import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import org.eclipse.jface.wizard.WizardPage;
import org.eclipse.swt.widgets.Composite;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.ext.common.ServiceWrapperBase;
import eu.etaxonomy.cdm.ext.occurrence.bioCase.BioCaseQueryServiceWrapper;
import eu.etaxonomy.taxeditor.view.dataimport.QueryType;
import eu.etaxonomy.taxeditor.view.search.specimen.SpecimenProviderSelectionController;
-
/**
* Wizard page for selecting the specimen provider
* @author pplitzner
* @date 12.09.2013
- *
*/
public class SpecimenProviderSelectionWizardPageE4 extends WizardPage{
"provider the access point URL must be entered.");
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.dialogs.IDialogPage#createControl(org.eclipse.swt.widgets.Composite)
- */
@Override
public void createControl(Composite parent) {
specimenProviderSelectionController = SpecimenProviderSelectionController.getInstance(parent, getWizard());
}
}
- /**
- * @return
- * @throws URISyntaxException
- */
public URI getEndPoint() {
return endPoint;
}
- /* (non-Javadoc)
- * @see org.eclipse.jface.wizard.WizardPage#isPageComplete()
- */
@Override
public boolean isPageComplete() {
if(specimenProviderSelectionController.getComposite().getBtnBioCaseProvider().getSelection()){
}
- endPoint = new URL(accessPoint).toURI();
+ endPoint = URI.fromUrl(new URL(accessPoint));
serviceWrapper = new BioCaseQueryServiceWrapper();
serviceWrapper.setBaseUrl(specimenProviderSelectionController.getComposite().getTxtAccessPoint().getText());
this.setErrorMessage(null);
return true;
}
-
-
-
} catch (MalformedURLException e) {
setErrorMessage("A valid URL has to be entered.");
return false;
return false;
}
- /**
- * @return the bioCaseQueryServiceWrapper
- */
public ServiceWrapperBase getQueryServiceWrapper() {
return serviceWrapper;
}
- /**
- * @param bioCaseQueryServiceWrapper the bioCaseQueryServiceWrapper to set
- */
public void setQueryServiceWrapper(ServiceWrapperBase queryServiceWrapper) {
this.serviceWrapper = queryServiceWrapper;
}
- /**
- * @return
- */
public SpecimenProviderSelectionController getController() {
return specimenProviderSelectionController;
}
-
-
-
-
-}
+}
\ No newline at end of file
* Wizard for querying specimen provider.
* @author pplitzner
* @date 11.09.2013
- *
*/
public class SpecimenSearchWizardE4 extends Wizard {
* 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.view.detail;
import java.util.EventObject;
*
* @author n.hoffmann
* @created Feb 8, 2010
- * @version 1.0
*/
public class CdmSectionPart<T> extends SectionPart implements
IPropertyChangeListener {
formSection = section;
}
- /** {@inheritDoc} */
@Override
public boolean setFormInput(Object input) {
this.rootInput = input;
if ((input instanceof TaxonBase)
&& (formSection instanceof ITaxonBaseDetailSection)) {
((ITaxonBaseDetailSection) formSection)
- .setTaxonBase((TaxonBase) input);
+ .setTaxonBase((TaxonBase<?>) input);
return true;
}
else if (input.getClass().equals(DerivedUnit.class)
// return true;
// }
-
formSection.setEntity((T) input);
return true;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse
- * .jface.util.PropertyChangeEvent)
- */
- /** {@inheritDoc} */
@Override
public void propertyChange(PropertyChangeEvent event) {
if (event != null) {
super.expansionStateChanged(expanded);
PreferencesUtil.setStringValue(StoreUtil.getPrefKey(formSection.getClass(), rootInput.getClass().getCanonicalName()), expanded?EXPANDED:COLLAPSED);
}
-
-}
+}
\ No newline at end of file
public abstract class AbstractCdmEditorPartE4
implements IConversationEnabled, IDirtyMarkable, ISelectionElementEditingPart, IPostOperationEnabled{
- private DelaySelection delaySelection = null;
+ private static final Logger logger = Logger.getLogger(AbstractCdmEditorPartE4.class);
+
+ private DelaySelection delaySelection = null;
/**
* This is the monitor for the DelaySelection runnable.
* If it is <code>true</code> then it is currently delaying a selection.
*/
private boolean isInDelay;
private boolean isEnabled = true;
- private static final Logger logger = Logger.getLogger(AbstractCdmEditorPartE4.class);
/**
* This class invokes internal_selectionChanged() in a separate thread.
parent.layout(true);
}
});
- String representation_L10n_text = result.getContent().getCitation();
+ String representation_L10n_text = result.getContent().getSummaryLabel();
if(representation_L10n_text!=null){
lblDescription.setText(representation_L10n_text);
}
package eu.etaxonomy.taxeditor.view.search.facet.term;
import java.io.InputStream;
-import java.net.URI;
import java.util.Collection;
import java.util.HashSet;
import java.util.UUID;
import eu.etaxonomy.cdm.api.service.IMediaService;
import eu.etaxonomy.cdm.common.CdmUtils;
+import eu.etaxonomy.cdm.common.URI;
import eu.etaxonomy.cdm.common.UriUtils;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.cdm.model.media.MediaUtils;
/**
* @author pplitzner
* @since Jan 23, 2019
- *
*/
public class TermSearchResultComposite extends CheckBoxSearchResultComposite<AbstractTermDto, TermSearchResult> {
/**
* @author pplitzner
* @since Apr 23, 2018
- *
*/
public abstract class AbstractTerminologyServiceRequest {
public String getValue() {
return value;
}
-
}
-}
+}
\ No newline at end of file
Bundle-ManifestVersion: 2
Bundle-Name: eu.etaxonomy.taxeditor.test
Bundle-SymbolicName: eu.etaxonomy.taxeditor.test;singleton:=true
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.0
Bundle-ActivationPolicy: lazy
Bundle-Vendor: EDIT
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.18.2</version>
+ <version>5.19.0</version>
</parent>
<artifactId>eu.etaxonomy.taxeditor.test</artifactId>
<!-- for packaging=eclipse-test-plugin
* 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.operation;
import org.eclipse.core.commands.operations.AbstractOperation;
/**
* @author n.hoffmann
* @created 15.04.2009
- * @version 1.0
*/
public abstract class BaseOperationTest extends RemotingSessionAwareTest {
public void initializeOperations() {
RemotingCdmUpdateOperation.throwExceptions = true;
}
-
-}
+}
\ No newline at end of file
import eu.etaxonomy.cdm.model.common.CdmBase;
public class MockSessionOwner<T extends CdmBase>
- implements ICdmEntitySessionEnabled, ICdmChangeListener {
+ implements ICdmEntitySessionEnabled<T>, ICdmChangeListener {
private static final Logger logger = Logger.getLogger(MockSessionOwner.class);
public Set<? extends CdmBase> getEventUpdatedObjects() {
return eventUpdatedObjects;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.cdm.api.application.ICdmChangeListener#onChange(eu.etaxonomy.cdm.api.application.CdmChangeEvent)
- */
+
@Override
public void onChange(CdmChangeEvent event) {
eventUpdatedObjects = event.getChangedObjects();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled#getPropertyPathsMap()
- */
@Override
public Map<Object, List<String>> getPropertyPathsMap() {
// TODO Auto-generated method stub
return null;
}
-
-}
+}
\ No newline at end of file
eu.etaxonomy.taxeditor.workbench.datasource,
eu.etaxonomy.taxeditor.workbench.part
Bundle-Name: Workbench Bundle
-Bundle-Version: 5.18.2
+Bundle-Version: 5.19.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.18.2</version>
+ <version>5.19.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
TaxonSearchPreferences_0=Open search results in separate windows
TCSImportWizard_ConfiguratorWizard_label=Configure the TCS import
FeatureMenuPreferences_display=Choose available features
-FeatureTreeEditorComposite_ADD_FEATURE=Add a term to this term tree.
-FeatureTreeEditorComposite_FEATURE_TREE=Term Tree
-FeatureTreeEditorComposite_OPEN_TREE=Open Tree
-FeatureTreeEditorComposite_REMOVE_FEATURE=Remove a term from this term tree.
+TermTreeEditorComposite_ADD_FEATURE=Add a term to this term tree.
+TermTreeEditorComposite_FEATURE_TREE=Term Tree
+TermTreeEditorComposite_OPEN_TREE=Open Tree
+TermTreeEditorComposite_REMOVE_FEATURE=Remove a term from this term tree.
FeatureTreeSelectionDialog_CHOOSE_TREE=Choose a term tree
FeatureTreeSelectionDialog_ENTER_LABEL=Enter label for term tree
FeatureTreeSelectionDialog_NEW_TREE=New Term tree
TaxonSearchPreferences_0=Öffne Suchergebnisse in eigenem Fenster
TCSImportWizard_ConfiguratorWizard_label=Konfiguration des TCS Imports
FeatureMenuPreferences_display=Auswahl der zur Verf\u00FCgung stehenden Features
-FeatureTreeEditorComposite_ADD_FEATURE=Term zum Termbaum hinzufügen
-FeatureTreeEditorComposite_FEATURE_TREE=Termbaum
-FeatureTreeEditorComposite_OPEN_TREE=Termbaum öffnen
-FeatureTreeEditorComposite_REMOVE_FEATURE=Term vom Termbaum entfernen
+TermTreeEditorComposite_ADD_FEATURE=Term zum Termbaum hinzufügen
+TermTreeEditorComposite_FEATURE_TREE=Termbaum
+TermTreeEditorComposite_OPEN_TREE=Termbaum öffnen
+TermTreeEditorComposite_REMOVE_FEATURE=Term vom Termbaum entfernen
FeatureTreeSelectionDialog_CHOOSE_TREE=Termbaum auswählen
FeatureTreeSelectionDialog_ENTER_LABEL=Namen für Termbaum eingeben
FeatureTreeSelectionDialog_NEW_TREE=Neuer Termbaum
* 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.workbench;
import java.io.IOException;
/**
* @author p.ciardelli
* @created 04.09.2009
- * @version 1.0
*/
public class OpenExternalAboutPlatformHandler {
private static final Logger logger = Logger.getLogger(OpenExternalAboutPlatformHandler.class);
-
@Execute
public Object execute() {
String url = "https://cybertaxonomy.eu/";
return null;
}
-}
+}
\ No newline at end of file
* 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.workbench;
import java.io.IOException;
*
* @author p.ciardelli
* @created 04.09.2009
- * @version 1.0
*/
public class OpenExternalParserHelpHandler {
+
private static final Logger logger = Logger.getLogger(OpenExternalParserHelpHandler.class);
@Execute
return null;
}
-}
+}
\ No newline at end of file
}
PreferenceDialog dialog = new PreferenceDialog(shell, manager);
dialog.create();
- dialog.getTreeViewer().expandAll();
dialog.open();
}
<?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.18.2">
+<?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.19.0">
<aboutInfo>
<image path="/eu.etaxonomy.taxeditor.application/icons/256color_48x48.gif"/>
<text>
<parent>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.18.2</version>
+ <version>5.19.0</version>
</parent>
<modelVersion>4.0.0</modelVersion>
</prerequisites>
<groupId>eu.etaxonomy</groupId>
<artifactId>taxeditor-parent</artifactId>
- <version>5.18.2</version>
+ <version>5.19.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.18.0</cdmlib.version>
+ <cdmlib.version>5.19.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.0.0</tycho.version>
- <taxeditor.version>5.18.0</taxeditor.version>
+ <taxeditor.version>5.19.0</taxeditor.version>
<update.dir>snapshot</update.dir>
<log4j.version>1.2.17</log4j.version>
<httpcomponents.version>4.5.12</httpcomponents.version>
BGBM BDI Projects / taxeditor.git / commitdiff