import eu.etaxonomy.cdm.model.common.IAnnotatableEntity;
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.common.Marker;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.taxeditor.annotatedlineeditor.EntityListener;
import eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy;
*
* @author p.ciardelli
* @created 07.07.2009
- * @version 1.0
*/
public class BulkEditorLineDisplay implements ILineDisplayStrategy {
this.editor = editor;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#getIcon(java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public Image getIcon(Object entity) {
return null;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#getIndent(java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public int getIndent(Object entity) {
return 0;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#getText(java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public String getText(Object entity) {
return editor.getEditorInput().getText((ICdmBase) entity);
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getSupplementalText(java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public String getSupplementalText(Object entity) {
return supplementalText;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#setText(java.lang.String, java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public void setText(String text, Object entity) {
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.ILineDisplayStrategy#getHoverText(java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public String getHoverText(Object entity) {
}).start();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#getEmptyText(java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public String getEmptyCacheMessage(Object entity) {
return entity.toString();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#isEntityCacheEmpty(java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public boolean isEntityCacheEmpty(Object entity) {
String text = ((Reference) entity).getTitleCache();
return (text == null || text.equals(""));
}
- if (entity instanceof TaxonNameBase) {
- String text = ((TaxonNameBase) entity).getTitleCache();
+ if (entity instanceof TaxonName) {
+ String text = ((TaxonName) entity).getTitleCache();
return (text == null || text.equals(""));
}
if (entity instanceof AgentBase) {
return false;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy#addDisplayListener(java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public void addDisplayListener(Object entity, EntityListener listener) {
import org.eclipse.core.runtime.Status;
import org.eclipse.jface.dialogs.MessageDialog;
import org.eclipse.jface.text.TextSelection;
-import org.eclipse.jface.text.source.Annotation;
import org.eclipse.jface.viewers.IStructuredSelection;
import org.eclipse.ui.IEditorInput;
import org.eclipse.ui.IEditorPart;
import eu.etaxonomy.cdm.model.common.Group;
import eu.etaxonomy.cdm.model.common.User;
import eu.etaxonomy.cdm.model.media.Media;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.Synonym;
IStructuredSelection structuredSelection = (IStructuredSelection) selection;
DeleteConfiguratorBase config = null;
- IEntityPersistenceService persistenceService = (IEntityPersistenceService) input;
+ IEntityPersistenceService<?> persistenceService = (IEntityPersistenceService<?>) input;
DeleteResult result = new DeleteResult();
String errorMessage= "The object ";
for(Object object : structuredSelection.toList()){
if (object instanceof CdmBase){
CdmBase base = (CdmBase)object;
- LineAnnotation annotation = (LineAnnotation) model.getAnnotation(object);
+ LineAnnotation<?> annotation = (LineAnnotation<?>) model.getAnnotation(object);
if (base.getId() != 0){
return null;
}
if (object != null){
- result = service.isDeletable(((SpecimenOrObservationBase) object).getUuid(), config);
+ result = service.isDeletable(((SpecimenOrObservationBase<?>) object).getUuid(), config);
errorMessage = "The specimen or observation ";
}
errorMessage = "The group ";
}else if (object instanceof User){
errorMessage = "The user ";
- } else if (object instanceof TaxonNameBase){
- TaxonNameBase name = HibernateProxyHelper.deproxy(object, TaxonNameBase.class);
+ } else if (object instanceof TaxonName){
+ TaxonName name = HibernateProxyHelper.deproxy(object, TaxonName.class);
if (object != null){
config = new NameDeletionConfigurator();
import eu.etaxonomy.cdm.model.common.User;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.cdm.model.name.NameRelationship;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
public static BulkEditorInputType getByType(Class clazz) {
if (Reference.class.isAssignableFrom(clazz)) {
return REFERENCE;
- } else if (TaxonNameBase.class.isAssignableFrom(clazz)) {
+ } else if (TaxonName.class.isAssignableFrom(clazz)) {
return NAME;
} else if (AgentBase.class.isAssignableFrom(clazz)) {
return AGENT;
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider;
import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.NameCreator;
*
* @author p.ciardelli
* @created 20.08.2009
- * @version 1.0
*/
-public class NameEditorInput extends AbstractBulkEditorInput<TaxonNameBase> {
+public class NameEditorInput extends AbstractBulkEditorInput<TaxonName> {
- /**
- *
- */
private static final long serialVersionUID = -3085029575759626823L;
private static NameEditorInput instance;
return instance;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IEditorInput#getName()
- */
/**
* <p>getName</p>
*
return BulkEditorInputType.NAME.label;
}
- /* (non-Javadoc)
- * @see org.eclipse.ui.IEditorInput#getToolTipText()
- */
/**
* <p>getToolTipText</p>
*
}
*/
@Override
- public boolean delete(TaxonNameBase entity, DeleteConfiguratorBase config) {
+ public boolean delete(TaxonName entity, DeleteConfiguratorBase config) {
NameDeletionConfigurator nameConfig = null;
if (config instanceof NameDeletionConfigurator){
nameConfig = (NameDeletionConfigurator) config;
/** {@inheritDoc} */
@Override
- public TaxonNameBase save(TaxonNameBase entity) {
- TaxonNameBase mergedName = null;
+ public TaxonName save(TaxonName entity) {
+ TaxonName mergedName = null;
mergedName = CdmStore.getService(INameService.class).merge(entity, true).getMergedEntity();
return mergedName;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#createEntityCreator()
- */
@Override
- protected IEntityCreator<TaxonNameBase> createEntityCreator() {
+ protected IEntityCreator<TaxonName> createEntityCreator() {
return new NameCreator();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#getSortProviders()
- */
@Override
- public List<IBulkEditorSortProvider<TaxonNameBase>> getSortProviders() {
- List<IBulkEditorSortProvider<TaxonNameBase>> sortProviders = super.getSortProviders();
+ public List<IBulkEditorSortProvider<TaxonName>> getSortProviders() {
+ List<IBulkEditorSortProvider<TaxonName>> sortProviders = super.getSortProviders();
- sortProviders.add(0, new IdentifiableEntitySortProvider<TaxonNameBase>());
+ sortProviders.add(0, new IdentifiableEntitySortProvider<>());
return sortProviders;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#getTypeText(java.lang.Object)
- */
@Override
public String getTypeText(Object entity) {
- if((entity instanceof TaxonNameBase) && (((TaxonNameBase) entity).getNomenclaturalCode() != null)){
- return ((TaxonNameBase) entity).getNomenclaturalCode().getTitleCache();
+ if((entity instanceof TaxonName) && (((TaxonName) entity).getNomenclaturalCode() != null)){
+ return ((TaxonName) entity).getNomenclaturalCode().getTitleCache();
}
return super.getTypeText(entity);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#getText(eu.etaxonomy.cdm.model.common.ICdmBase)
- */
@Override
- public String getText(TaxonNameBase entity) {
+ public String getText(TaxonName entity) {
return (entity).getFullTitleCache();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.editor.CdmEntitySessionInput#merge()
- */
@Override
public void merge() {
}
@Override
- protected TaxonNameBase loadEntity(UUID entityUuid) {
+ protected TaxonName loadEntity(UUID entityUuid) {
List<String> propertyPaths = Arrays.asList(new String[]{});
return CdmStore.getService(INameService.class).load(entityUuid, getPropertyPaths());
}
import java.util.TreeMap;
import eu.etaxonomy.cdm.model.name.Rank;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
import eu.etaxonomy.taxeditor.parser.ParseHandler;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
* @created 07.07.2009
* @version 1.0
*/
-public class NameCreator implements IEntityCreator<TaxonNameBase> {
+public class NameCreator implements IEntityCreator<TaxonName> {
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.bulkeditor.IEntityCreator#createEntity(java.lang.String)
- */
/** {@inheritDoc} */
@Override
- public TaxonNameBase createEntity(String text) {
- TaxonNameBase name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
+ public TaxonName createEntity(String text) {
+ TaxonName name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
name.setTitleCache(text, true);
//name.setTitleCache(text);
return name;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.Class, java.lang.String)
- */
/** {@inheritDoc} */
@Override
- public TaxonNameBase createEntity(Object key, String text) {
+ public TaxonName createEntity(Object key, String text) {
return ParseHandler.parseName(text, (Rank) key);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#getClassLabelPairs()
- */
/**
* <p>getKeyLabelPairs</p>
*
import eu.etaxonomy.cdm.model.agent.Person;\r
import eu.etaxonomy.cdm.model.agent.Team;\r
import eu.etaxonomy.cdm.model.name.Rank;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.name.TaxonName;\r
import eu.etaxonomy.cdm.model.taxon.Synonym;\r
import eu.etaxonomy.cdm.model.taxon.Taxon;\r
import eu.etaxonomy.cdm.model.taxon.TaxonBase;\r
import eu.etaxonomy.cdm.model.description.PolytomousKeyNode;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.cdm.model.molecular.Sequence;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
try {
if (objectClass.getSuperclass().equals(TeamOrPersonBase.class) ){
referencedObject = CdmStore.getService(IAgentService.class).load(entity);
- } else if (objectClass.getSuperclass().equals(NonViralName.class)){
+ } else if (objectClass.getSuperclass().equals(TaxonName.class)){
referencedObject = CdmStore.getService(INameService.class).load(entity);
} else if (objectClass.getSuperclass().equals(TaxonBase.class)){
referencedObject = CdmStore.getService(ITaxonService.class).load(entity);
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
protected void setPartName() {
String partName = null;
- TaxonNameBase<?, ?> name = getTaxon().getName();
+ TaxonName name = getTaxon().getName();
if (name != null) {
partName = name.getTitleCache();
import org.apache.log4j.Logger;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent;
for(CdmDataChangeEvent event : events){
// update editor title
- if(event.getEntity() instanceof TaxonNameBase){
+ if(event.getEntity() instanceof TaxonName){
if(input.getTaxon().getName().equals(event.getEntity())){
// set the name of the editor window
source.setPartName();
package eu.etaxonomy.taxeditor.editor;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
/**
*
* @author n.hoffmann
* @created Sep 27, 2010
- * @version 1.0
*/
public class OpenEditorConfiguration {
private TaxonNode parentNode;
- private NonViralName nonViralName;
+ private INonViralName nonViralName;
private boolean openInEditor;
*
* @return the nonViralName
*/
- public NonViralName getNonViralName() {
+ public INonViralName getNonViralName() {
return nonViralName;
}
*
* @param nonViralName the nonViralName to set
*/
- public void setNonViralName(NonViralName nonViralName) {
+ public void setNonViralName(INonViralName nonViralName) {
this.nonViralName = nonViralName;
}
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
private void initForParentTaxonNode(UUID parentNodeUuid){
- TaxonNameBase<?, ?> name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
+ TaxonName name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
ITaxonTreeNode parentNode = CdmStore.getService(IClassificationService.class).getTreeNodeByUuid(parentNodeUuid);
Taxon newTaxon = Taxon.NewInstance(name, parentNode.getReference());
if(getTaxon() == null){
return null;
}
- TaxonNameBase<?, ?> name = getTaxon().getName();
+ TaxonName name = getTaxon().getName();
if (name == null || name.getTitleCache() == null) {
return Messages.TaxonEditorInput_NEW_TAXON;
} else {
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.name.NameRelationship;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
import eu.etaxonomy.taxeditor.editor.CdmDataTransfer;
// parse the text
String text = nameViewer.getTextWidget().getText();
- TaxonNameBase<?,?> name = (TaxonNameBase<?,?>)parseHandler.parse(text);
+ TaxonName name = (TaxonName)parseHandler.parse(text);
getTaxonBase().setName(name);
getTaxonBase().setTitleCache((getTaxonBase().generateTitle()));
*
*/
private void showNameRelations() {
- TaxonNameBase<?, ?> name = getName();
+ TaxonName name = getName();
if (name == null) {
return;
}
}
// for (NameRelationship nameRelation : nameRelations) {
// String typeLabel = null;
- // TaxonNameBase<?, ?> relatedName = null;
+ // TaxonName relatedName = null;
//
// if (name.equals(nameRelation.getFromName())) {
// typeLabel = labelProvider.getNameRelationTypeLabel(
*/
protected void handleSplitText(String text) {
// Create a synonym in a new homotypic group using text as name
- TaxonNameBase synonymName = ParseHandler
- .parseReferencedName(text, null);
+ TaxonName synonymName = TaxonName.castAndDeproxy(
+ ParseHandler.parseReferencedName(text, null));
EditorUtil.executeOperation(new CreateSynonymInNewGroupOperation(
Messages.AbstractGroupedContainer_NEW_HETERO_SYNONYM, getEditor().getUndoContext(),
* @return
*/
private boolean isFreetextEditingAllowed() {
- NonViralName name = (NonViralName) HibernateProxyHelper
+ INonViralName name = (INonViralName) HibernateProxyHelper
.deproxy(getName());
boolean enableFreetext = true;
}
private boolean isNameParsable() {
- TaxonNameBase name = getName();
+ TaxonName name = getName();
boolean isParsable = true;
isParsable &= CdmUtils.isEmpty(name.getAppendedPhrase()); // taxonFieldsEmpty();
- if (name instanceof NonViralName) {
- NonViralName nonViralName = (NonViralName) name;
- isParsable &= !nonViralName.isProtectedAuthorshipCache();
- isParsable &= !nonViralName.isProtectedNameCache();
- }
+ isParsable &= !name.isProtectedAuthorshipCache();
+ isParsable &= !name.isProtectedNameCache();
return isParsable;
}
*
* @return a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
*/
- public TaxonNameBase getName() {
+ public TaxonName getName() {
return HibernateProxyHelper.deproxy(getTaxonBase()
.getName());
}
// @Override
// protected IStatus run(IProgressMonitor monitor) {
//
- final TaxonNameBase<?,?> name = (TaxonNameBase<?,?>)parseHandler
+ final TaxonName name = (TaxonName)parseHandler
.parseAndResolveDuplicates(unparsedNameString);
//
// Display.getDefault().asyncExec(new Runnable(){
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.editor.l10n.Messages;
}
protected void updateIcon(){
- TaxonNameBase name = getName();
+ TaxonName name = getName();
if(! name.getStatus().isEmpty()){
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
*
* @author n.hoffmann
* @created 21.04.2009
- * @version 1.0
*/
public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler implements IPostOperationEnabled {
private static final Logger logger = Logger
TaxonNode parentNode = (TaxonNode) HibernateProxyHelper.deproxy(((TaxonEditorInput) input).getTaxonNode().getParent());
- List<UUID> excludeTaxa = new ArrayList<UUID>();
+ List<UUID> excludeTaxa = new ArrayList<>();
//excludeTaxa.add(taxon.getUuid());//there are some cases where the accepted taxon should be the parent of the new created accepted taxon
TaxonNode newParentNode = TaxonNodeSelectionDialog.select(HandlerUtil.getActiveShell(event), editor.getConversationHolder(), Messages.ChangeSynonymToAcceptedTaxonHandler_SELECT_PARENT, null, null, ((TaxonEditorInput) input).getTaxonNode().getClassification());
// TODO get synonyms from homotypical group and add them as homotypic synonyms to new accepted taxon
// apply confirmation dialog
HomotypicalGroup group = synonym.getHomotypicGroup();
- Set<TaxonNameBase> namesInGroup = group.getTypifiedNames();
+ Set<TaxonName> namesInGroup = group.getTypifiedNames();
// FIXME with this implementation we can not create a taxonNode that is a direct child of the classification node
AbstractPostOperation operation = new ChangeSynonymToAcceptedTaxonOperation(Messages.ChangeSynonymToAcceptedTaxonHandler_CHANGE_SYN_TO_ACC_TAXON, EditorUtil.getUndoContext(),
taxon, newParentNode, synonym, namesInGroup, this, editor, (ICdmEntitySessionEnabled)editor.getEditorInput()); //$NON-NLS-1$
return null;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.operations.IPostOperationEnabled#postOperation(eu.etaxonomy.cdm.model.common.CdmBase)
- */
/** {@inheritDoc} */
@Override
public boolean postOperation(CdmBase objectAffectedByOperation) {
import org.eclipse.core.commands.IHandler;
import org.eclipse.core.commands.common.NotDefinedException;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.editor.Page;
import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor;
*
* @author n.hoffmann
* @created 06.02.2009
- * @version 1.0
*/
public class CreateHeterotypicSynonymHandler extends AbstractHandler implements
IHandler {
private static final Logger logger = Logger
.getLogger(CreateHeterotypicSynonymHandler.class);
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- */
/** {@inheritDoc} */
public Object execute(ExecutionEvent event) throws ExecutionException {
TaxonNameEditor editor = (TaxonNameEditor) EditorUtil.getActiveEditorPage(
Page.NAME);
- TaxonNameBase newSynonymName = ParseHandler.createEmptyName();
+ TaxonName newSynonymName = ParseHandler.createEmptyName();
- AbstractPostOperation operation;
+ AbstractPostOperation<?> operation;
try {
operation = new CreateSynonymInNewGroupOperation(event.getCommand().getName(),
editor.getUndoContext(), editor.getTaxon(), newSynonymName, editor);
import org.eclipse.core.commands.common.NotDefinedException;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.INonViralName;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.editor.Page;
*
* @author n.hoffmann
* @created 06.02.2009
- * @version 1.0
*/
public class CreateHomotypicSynonymHandler extends AbstractHandler implements
IHandler {
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- */
/** {@inheritDoc} */
@Override
public Object execute(ExecutionEvent event) throws ExecutionException {
Page.NAME);
Taxon taxon = editor.getTaxon();
HomotypicalGroup group = taxon.getHomotypicGroup();
- TaxonNameBase<?,?> newSynonymName = ParseHandler.createEmptyName();
+ TaxonName newSynonymName = ParseHandler.createEmptyName();
- AbstractPostOperation operation;
+ AbstractPostOperation<?> operation;
try {
operation = new CreateSynonymInExistingHomotypicalGroupOperation(event.getCommand().getName(),
editor.getUndoContext(), taxon, group, newSynonymName, editor);
import org.eclipse.core.commands.ExecutionException;
import org.eclipse.core.commands.common.NotDefinedException;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
*
* @author n.hoffmann
* @created 16.04.2009
- * @version 1.0
*/
public class CreateMisapplicationHandler extends AbstractHandler {
private static final Logger logger = Logger
.getLogger(CreateMisapplicationHandler.class);
- /* (non-Javadoc)
- * @see org.eclipse.core.commands.IHandler#execute(org.eclipse.core.commands.ExecutionEvent)
- */
/** {@inheritDoc} */
public Object execute(ExecutionEvent event) throws ExecutionException {
TaxonNameEditor editor = (TaxonNameEditor) EditorUtil.getActiveEditorPage(
Page.NAME);
- TaxonNameBase conceptName = ParseHandler.createEmptyName();
+ TaxonName conceptName = ParseHandler.createEmptyName();
Taxon concept = Taxon.NewInstance(conceptName, null);
TaxonRelationshipType type = TaxonRelationshipType.MISAPPLIED_NAME_FOR();
- AbstractPostOperation operation;
+ AbstractPostOperation<?> operation;
try {
operation = new CreateConceptRelationOperation(event.getCommand().getName(),
editor.getUndoContext(), editor.getTaxon(), concept, type, editor);
import org.eclipse.ui.handlers.HandlerUtil;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.INonViralName;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.taxeditor.editor.EditorUtil;
import eu.etaxonomy.taxeditor.editor.Page;
HomotypicalGroup group = synonym.getHomotypicGroup();
- TaxonNameBase<?,?> newSynonymName = ParseHandler.createEmptyName();
+ TaxonName newSynonymName = ParseHandler.createEmptyName();
- AbstractPostOperation operation;
+ AbstractPostOperation<?> operation;
try {
operation = new CreateSynonymInExistingHomotypicalGroupOperation(event.getCommand().getName(), editor.getUndoContext(),
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonRelationship;
throws ExecutionException {
// Create new synonym using concept name
- TaxonNameBase<?, ?> synonymName = concept.getName();
+ TaxonName synonymName = concept.getName();
Synonym synonym = null;
try {
synonym =
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.SynonymType;
import eu.etaxonomy.cdm.model.taxon.Taxon;
throws ExecutionException {
// Get synonym name
- TaxonNameBase<?, ?> synonymName = synonym.getName();
+ TaxonName synonymName = synonym.getName();
monitor.worked(20);
// TODO pass in homotypical group's taxon in case we are dragging from one editor to another
throws ExecutionException {
// Get synonym name
- TaxonNameBase<?, ?> synonymName = this.synonym.getName();
+ TaxonName synonymName = this.synonym.getName();
if(synonymName == null){
// TODO
}
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
*
* @author p.ciardelli
* @created 15.01.2009
- * @version 1.0
*/
public class ChangeHomotypicalGroupBasionymOperation extends
AbstractPostTaxonOperation {
+
private final TaxonBase taxonBase;
/**
this.taxonBase = taxonBase;
}
- /* (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 {
- TaxonNameBase<?, ?> name = taxonBase.getName();
+ TaxonName name = taxonBase.getName();
monitor.worked(20);
- name = HibernateProxyHelper.deproxy(name, TaxonNameBase.class);
+ name = HibernateProxyHelper.deproxy(name);
HomotypicalGroup group = HibernateProxyHelper.deproxy(name.getHomotypicalGroup(), HomotypicalGroup.class);
- TaxonNameBase oldBasionym = name.getBasionym();
+ TaxonName oldBasionym = name.getBasionym();
name.setAsGroupsBasionym();
monitor.worked(40);
- oldBasionym = HibernateProxyHelper.deproxy(oldBasionym, TaxonNameBase.class);
+ oldBasionym = HibernateProxyHelper.deproxy(oldBasionym);
if (oldBasionym != null){
Set<TaxonBase> taxonBases = oldBasionym.getTaxonBases();
if (!taxonBases.isEmpty()){
return postExecute(taxonBase);
}
- /* (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)
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)
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.api.service.UpdateResult;
import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
*
* @author n.hoffmann
* @created 16.01.2009
- * @version 1.0
*/
public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPostOperation {
- private Taxon newTaxon;
private final Synonym synonym;
private final ITaxonTreeNode parentNode;
private TaxonNode newNode;
- //private final Set<TaxonNameBase> namesInHomotypicGroup;
+ //private final Set<TaxonName> namesInHomotypicGroup;
/**
* <p>Constructor for ChangeSynonymToAcceptedTaxonOperation.</p>
Taxon taxon,
ITaxonTreeNode parentNode,
Synonym synonym,
- Set<TaxonNameBase> namesInHomotypicalGroup,
+ Set<TaxonName> namesInHomotypicalGroup,
IPostOperationEnabled postOperationEnabled,
IConversationEnabled conversationEnabled,
ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
import org.eclipse.core.runtime.IStatus;
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
*
* @author n.hoffmann
* @created Mar 30, 2010
- * @version 1.0
*/
public class CreateNameRelationOperation extends AbstractPostTaxonOperation {
private TaxonBase taxonBase;
- private TaxonNameBase relatedName;
+ private TaxonName relatedName;
private NameRelationshipType type;
/**
* @param type a {@link eu.etaxonomy.cdm.model.name.NameRelationshipType} object.
* @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
*/
- public CreateNameRelationOperation(String label, IUndoContext undoContext, TaxonBase taxonBase, TaxonNameBase relatedName, NameRelationshipType type, IPostOperationEnabled postOperationEnabled) {
+ public CreateNameRelationOperation(String label, IUndoContext undoContext, TaxonBase taxonBase, TaxonName relatedName, NameRelationshipType type, IPostOperationEnabled postOperationEnabled) {
super(label, undoContext, postOperationEnabled);
this.taxonBase = taxonBase;
this.relatedName = relatedName;
this.type = type;
}
- /* (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 {
- TaxonNameBase fromName = taxonBase.getName();
+ TaxonName fromName = taxonBase.getName();
fromName.addRelationshipToName(relatedName, type, null);
return postExecute(taxonBase);
}
- /* (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)
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 {
- TaxonNameBase fromName = taxonBase.getName();
+ TaxonName fromName = taxonBase.getName();
fromName.removeRelationToTaxonName(relatedName);
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
import eu.etaxonomy.cdm.model.name.INonViralName;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
AbstractPostTaxonOperation {
private final HomotypicalGroup group;
- private final TaxonNameBase<?,?> newSynonymName;
+ private final TaxonName newSynonymName;
private Synonym synonym;
*/
public CreateSynonymInExistingHomotypicalGroupOperation(String label,
IUndoContext undoContext, Taxon taxon, HomotypicalGroup group,
- TaxonNameBase<?,?> newSynonymName, IPostOperationEnabled postOperationEnabled) {
+ TaxonName newSynonymName, IPostOperationEnabled postOperationEnabled) {
super(label, undoContext, taxon, postOperationEnabled);
this.group = group;
this.newSynonymName = newSynonymName;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
*/
public class CreateSynonymInNewGroupOperation extends AbstractPostTaxonOperation {
- private final TaxonNameBase newSynonymName;
+ private final TaxonName newSynonymName;
private Synonym newSynonym;
/**
* @param postOperationEnabled a {@link eu.etaxonomy.taxeditor.operation.IPostOperationEnabled} object.
*/
public CreateSynonymInNewGroupOperation(String label,
- IUndoContext undoContext, Taxon taxon, TaxonNameBase newSynonymName, IPostOperationEnabled postOperationEnabled) {
+ IUndoContext undoContext, Taxon taxon, TaxonName newSynonymName, IPostOperationEnabled postOperationEnabled) {
super(label, undoContext, taxon, postOperationEnabled);
this.newSynonymName = newSynonymName;
import org.eclipse.core.runtime.IStatus;
import eu.etaxonomy.cdm.model.name.NameRelationship;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
*
* @author n.hoffmann
* @created Mar 30, 2010
- * @version 1.0
*/
public class DeleteNameRelationOperation extends AbstractPostTaxonOperation {
this.nameRelationship = nameRelationship;
}
- /* (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 {
- TaxonNameBase fromName = nameRelationship.getFromName();
+ TaxonName fromName = nameRelationship.getFromName();
fromName.removeRelationToTaxonName(nameRelationship.getToName());
return postExecute(null);
}
- /* (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)
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)
import eu.etaxonomy.cdm.api.service.ITaxonService;\r
import eu.etaxonomy.cdm.api.service.UpdateResult;\r
import eu.etaxonomy.cdm.api.service.exception.HomotypicalGroupChangeException;\r
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;\r
+import eu.etaxonomy.cdm.model.name.TaxonName;\r
import eu.etaxonomy.cdm.model.taxon.Synonym;\r
import eu.etaxonomy.cdm.model.taxon.Taxon;\r
import eu.etaxonomy.taxeditor.editor.EditorUtil;\r
throws ExecutionException {\r
\r
// Get synonym name\r
- TaxonNameBase<?, ?> synonymName = synonym.getName();\r
+ TaxonName synonymName = synonym.getName();\r
monitor.worked(20);\r
\r
// Switch groups\r
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.core.runtime.IStatus;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
*
* @author p.ciardelli
* @created 15.01.2009
- * @version 1.0
*/
public class RemoveHomotypicalGroupBasionymOperation extends
AbstractPostTaxonOperation {
this.taxonBase = taxonBase;
}
- /* (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 {
- TaxonNameBase<?, ?> name = taxonBase.getName();
+ TaxonName name = taxonBase.getName();
monitor.worked(20);
name.removeAsGroupsBasionym();
return postExecute(taxonBase);
}
- /* (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)
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)
import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
import eu.etaxonomy.cdm.model.description.Distribution;
import eu.etaxonomy.cdm.model.description.TaxonDescription;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Taxon;
-import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
*
* @author a.oppermann
* @created 30.04.2014
- * @version 1.0
*/
public class ChecklistLabelProvider extends LabelProvider implements ITableLabelProvider {
return null;
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.viewers.ITableLabelProvider#getColumnText(java.lang
- * .Object, int)
- */
/** {@inheritDoc} */
@Override
public String getColumnText(Object element, int columnIndex) {
// List<TaxonDescription> listTaxonDescriptions = descriptionService.listTaxonDescriptions(taxon, null, null, null, null, null, DESC_INIT_STRATEGY);;
Set<TaxonDescription> listTaxonDescriptions = taxon.getDescriptions();
- NonViralName<?> nonViralName = HibernateProxyHelper.deproxy(taxon.getName(), NonViralName.class);
+ TaxonName nonViralName = HibernateProxyHelper.deproxy(taxon.getName());
switch (columnIndex) {
case 0:
}
public SortedSet<DefinedTermBase> getTermsOrderedByLabels(List<DefinedTermBase> listTerm,Language language){
- TermLanguageComparator comp = new TermLanguageComparator();
+ TermLanguageComparator<?> comp = new TermLanguageComparator<>();
comp.setCompareLanguage(language);
- SortedSet result = new TreeSet(comp);
+ SortedSet<DefinedTermBase> result = new TreeSet(comp);
if(listTerm != null){
result.addAll(listTerm);
}
* @return
*/
public SortedSet<DefinedTermBase> getTermsOrderedByIdInVocabulary(List<DefinedTermBase> namedAreas) {
- TermIdInVocabularyComparator comp = new TermIdInVocabularyComparator();
+ TermIdInVocabularyComparator<?> comp = new TermIdInVocabularyComparator<>();
- SortedSet result = new TreeSet(comp);
+ SortedSet<DefinedTermBase> result = new TreeSet(comp);
if(namedAreas != null){
result.addAll(namedAreas);
}
import org.eclipse.jface.viewers.ViewerFilter;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.reference.Reference;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Taxon;
public class ChecklistEditorFilter extends ViewerFilter {
return true;
}
Taxon taxon = (Taxon) element;
- NonViralName<?> nonVirlaName = HibernateProxyHelper.deproxy(taxon.getName(), NonViralName.class);
+ TaxonName nonVirlaName = HibernateProxyHelper.deproxy(taxon.getName());
// Reference reference = HibernateProxyHelper.deproxy(nonVirlaName.getNomenclaturalReference(), Reference.class);
// String rank = taxon.getName().getRank().toString();
//TaxonName
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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.Taxon;
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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.Taxon;
import org.junit.Test;
import eu.etaxonomy.cdm.model.common.ICdmBase;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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;
import org.junit.Test;
import eu.etaxonomy.cdm.model.common.ICdmBase;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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;
import org.junit.Test;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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.SynonymType;
import eu.etaxonomy.cdm.model.taxon.Taxon;
*/
public class CreateSynonymInExisitingHomotypicalGroupOperationTest extends AbstractTaxeditorOperationTestBase {
- private NonViralName<?> newSynonymName;
+ private TaxonName newSynonymName;
private HomotypicalGroup homotypicalGroup;
- private NonViralName<?> taxonName;
+ private TaxonName taxonName;
/**
* @throws java.lang.Exception
import org.junit.BeforeClass;
import org.junit.Test;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInNewGroupOperation;
*/
public class CreateSynonymInNewGroupOperationTest extends AbstractTaxeditorOperationTestBase {
- private static TaxonNameBase newSynonymName;
+ private static TaxonName newSynonymName;
/**
* @throws java.lang.Exception
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.description.TaxonDescription;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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;
private static Taxon taxon;
- private static Taxon parentTaxon;
-
- private static Synonym homotypicSynonym;
+// private static Taxon parentTaxon;
+//
+// private static Synonym homotypicSynonym;
private static Synonym oldHeterotypicSynonym;
private static TaxonRelationshipType conceptRelationshipType;
- private static Taxon childTaxon;
+// private static Taxon childTaxon;
private static TaxonDescription description;
- private static NonViralName<?> oldSynonymName;
+ private static INonViralName oldSynonymName;
- private static NonViralName<?> oldTaxonName;
+ private static INonViralName oldTaxonName;
/**
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.model.common.ICdmBase;
import eu.etaxonomy.cdm.model.description.PolytomousKey;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
* @param selectedObject a {@link eu.etaxonomy.cdm.model.common.CdmBase} object.
*/
public static void openEditor(UuidAndTitleCache uuidAndTitleCache){
- Class type = uuidAndTitleCache.getType();
+ Class<?> type = uuidAndTitleCache.getType();
ICdmBase cdmBase = null;
if(type.equals(Classification.class)){
cdmBase = CdmStore.getService(IClassificationService.class).load(uuidAndTitleCache.getUuid());
else if(TaxonBase.class.isAssignableFrom(type)){
cdmBase = CdmStore.getService(ITaxonService.class).load(uuidAndTitleCache.getUuid());
}
- else if(type.equals(TaxonNameBase.class)){
+ else if(type.equals(TaxonName.class)){
cdmBase = CdmStore.getService(INameService.class).load(uuidAndTitleCache.getUuid());
}
else{
else{
EditorUtil.openTaxonBase(entityUuid);
}
- }else if(selectedObject instanceof TaxonNameBase){
+ }else if(selectedObject instanceof TaxonName){
openInBulkEditor(selectedObject);
}else if(selectedObject instanceof PolytomousKey){
EditorUtil.openPolytomousKey(entityUuid);
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeEvent;
}
// name updates of the accepted taxon of open editors are relevant
- if(eventType == EventType.UPDATE && event.getEntity() instanceof TaxonNameBase){
- TaxonNameBase name = null;
- if(eventEntity instanceof TaxonNameBase){
- name = (TaxonNameBase) eventEntity;
+ if(eventType == EventType.UPDATE && event.getEntity() instanceof TaxonName){
+ TaxonName name = null;
+ if(eventEntity instanceof TaxonName){
+ name = (TaxonName) eventEntity;
}else if(eventEntity instanceof Taxon){
name = ((Taxon) eventEntity).getName();
}else{
if(eventType == EventType.UPDATE && event.getEntity() instanceof Taxon){
- TaxonNameBase name = null;
+ TaxonName name = null;
if(eventEntity instanceof Taxon){
name = ((Taxon) eventEntity).getName();
}else{
// }
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.store.model.IDataChangeBehavior#reactOnDataChange(java.lang.Object, eu.etaxonomy.cdm.persistence.hibernate.CdmCrudEvent)
- */
/** {@inheritDoc} */
@Override
public void reactOnDataChange(CdmDataChangeMap events) {
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
*/
public CreateTaxonNode(String label,
IUndoContext undoContext,
- ITaxonTreeNode parentNode, TaxonNameBase<?, ?> name,
+ ITaxonTreeNode parentNode, TaxonName name,
IPostOperationEnabled postOperationEnabled,
IConversationEnabled conversationEnabled,
ICdmEntitySessionEnabled cdmEntitySessionEnabled) {
import eu.etaxonomy.cdm.io.common.CacheUpdaterConfigurator;
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.l10n.Messages;
Button checkBoxTaxonName = new Button(composite, SWT.CHECK);
- checkBoxTaxonName.setSelection(config.getClassList().contains(TaxonNameBase.class));
+ checkBoxTaxonName.setSelection(config.getClassList().contains(TaxonName.class));
checkBoxTaxonName.setText(Messages.DatabaseRepairPage_updateTaxonName);
checkBoxTaxonName
.setToolTipText(Messages.DatabaseRepairPage_toolTip_TaxonName);
@Override
public void widgetSelected(SelectionEvent e) {
List<Class<? extends IdentifiableEntity>> classList = config.getClassList();
- classList.add(TaxonNameBase.class);
+ classList.add(TaxonName.class);
}
});
import eu.etaxonomy.cdm.io.common.CacheUpdaterConfigurator;
import eu.etaxonomy.cdm.io.common.SortIndexUpdaterConfigurator;
import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.l10n.Messages;
composite_1.setLayout(new GridLayout(1, false));
Button checkBoxTaxonName = new Button(composite_1, SWT.CHECK);
- checkBoxTaxonName.setSelection(config.getClassList().contains(TaxonNameBase.class));
+ checkBoxTaxonName.setSelection(config.getClassList().contains(TaxonName.class));
checkBoxTaxonName.setText(Messages.DatabaseRepairPage_updateTaxonName);
checkBoxTaxonName
.setToolTipText(Messages.DatabaseRepairPage_toolTip_TaxonName);
@Override
public void widgetSelected(SelectionEvent e) {
List<Class<? extends IdentifiableEntity>> classList = config.getClassList();
- classList.add(TaxonNameBase.class);
+ classList.add(TaxonName.class);
}
});
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
/**
* @param name a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
* @return a {@link eu.etaxonomy.taxeditor.labels.ILabelImageStrategy} object.
*/
- public static ILabelImageStrategy getLabelStrategy(TaxonNameBase name) {
+ public static ILabelImageStrategy getLabelStrategy(TaxonName name) {
if (name == null) {
if (PreferencesUtil.getPreferredNomenclaturalCode().
equals(NomenclaturalCode.ICZN)) {
import eu.etaxonomy.cdm.model.name.NameRelationship;
import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
import eu.etaxonomy.cdm.model.name.TypeDesignationStatusBase;
import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
mainElementLabel = specimen.getTitleCache();
}
}else if (descr.isInstanceOf(TaxonNameDescription.class)){
- TaxonNameBase<?, ?> name = CdmBase.deproxy(descr, TaxonNameDescription.class).getTaxonName();
+ TaxonName name = CdmBase.deproxy(descr, TaxonNameDescription.class).getTaxonName();
if (name != null){
mainElementLabel = name.getTitleCache();
}
private static String getCache(DeterminationEvent detEvent) {
//taxon
String taxonStr = null;
- TaxonNameBase<?,?> taxonName = detEvent.getTaxonName();
+ TaxonName taxonName = detEvent.getTaxonName();
TaxonBase<?> taxon = detEvent.getTaxon();
if (taxonName != null){
taxonStr = taxonName.getTitleCache();
if (parentTaxon == null){
parentStr = "no parent taxon";
}else{
- TaxonNameBase<?,?> parentName = parentTaxon.getName();
+ TaxonName parentName = parentTaxon.getName();
if (parentName == null){
parentStr = "child of " + parentTaxon.getTitleCache();
}else{
private static String getCache(TypeDesignationBase<?> designation) {
designation = CdmBase.deproxy(designation);
TypeDesignationStatusBase<?> status = designation.getTypeStatus();
- Set<TaxonNameBase> from;
+ Set<TaxonName> from;
IdentifiableEntity<?> to;
from = designation.getTypifiedNames();
if (designation.isInstanceOf(SpecimenTypeDesignation.class)){
typeLabel = "->";
}
String fromString = "";
- for (TaxonNameBase<?,?> name : from){
+ for (TaxonName name : from){
CdmUtils.concat(",", fromString, name.getTitleCache());
}
String result = CdmUtils.concat(" ", new String[]{from == null ? null : fromString,
private static String getCache(HomotypicalGroup hg) {
String result = "";
- for (TaxonNameBase<?,?> tnb : hg.getTypifiedNames()){
+ for (TaxonName tnb : hg.getTypifiedNames()){
result = CdmUtils.concat(", ", result, tnb.getTitleCache());
}
if (StringUtils.isBlank(result)){
package eu.etaxonomy.taxeditor.model;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
/**
* @param name a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
* @return a {@link java.lang.String} object.
*/
- public static String getDisplayName(TaxonNameBase name){
+ public static String getDisplayName(TaxonName name){
return name.getTitleCache();
}
* @return a {@link java.lang.String} object.
*/
public static String getDisplayNameWithRef(TaxonBase taxonBase) {
- TaxonNameBase name = (TaxonNameBase) HibernateProxyHelper.deproxy(taxonBase.getName());
+ TaxonName name = HibernateProxyHelper.deproxy(taxonBase.getName());
if (name != null) {
String fullTitle = name.generateFullTitle();
if (fullTitle != null){ //should never be null
package eu.etaxonomy.taxeditor.newWizard;
import eu.etaxonomy.cdm.api.service.INameService;
-import eu.etaxonomy.cdm.model.name.BotanicalName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
-import eu.etaxonomy.cdm.model.name.ZoologicalName;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.ui.section.name.NonViralNameWizardPage;
*
* @author n.hoffmann
* @created Jun 1, 2010
- * @version 1.0
*/
-public class NewNonViralNameWizard extends AbstractNewEntityWizard<NonViralName> {
+public class NewNonViralNameWizard extends AbstractNewEntityWizard<TaxonName> {
/** {@inheritDoc} */
@Override
/** {@inheritDoc} */
@Override
- protected NonViralName createNewEntity() {
+ protected TaxonName createNewEntity() {
NomenclaturalCode code = PreferencesUtil.getPreferredNomenclaturalCode();
if(code.equals(NomenclaturalCode.ICNAFP )){
return TaxonNameFactory.NewBotanicalInstance(null);
package eu.etaxonomy.taxeditor.newWizard;
import eu.etaxonomy.cdm.api.service.ITaxonService;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.taxeditor.store.CdmStore;
@Override
public void addPages() {
addPage(new TaxonWizardPage(formFactory, getConversationHolder(), getEntity()));
- addPage(new NonViralNameWizardPage(formFactory, getConversationHolder(), (NonViralName) getEntity().getName()));
+ addPage(new NonViralNameWizardPage(formFactory, getConversationHolder(), getEntity().getName()));
}
/** {@inheritDoc} */
package eu.etaxonomy.taxeditor.parser;
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.strategy.match.IMatchStrategy;
import eu.etaxonomy.cdm.strategy.match.MatchException;
* @return a {@link eu.etaxonomy.cdm.strategy.match.IMatchStrategy} object.
*/
public static IMatchStrategy getDefaultNonViralNameMatchStrategy() throws MatchException{
- IMatchStrategy strategy = PreferencesUtil.getDefaultMatchStrategy(NonViralName.class);
+ IMatchStrategy strategy = PreferencesUtil.getDefaultMatchStrategy(TaxonName.class);
strategy.setMatchMode("nomenclaturalReference", MatchMode.IGNORE);
strategy.setMatchMode("combinationAuthorship", MatchMode.IGNORE);
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.name.ITaxonNameBase;
-import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.Rank;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.strategy.match.MatchException;
* <p>ParseHandler class.</p>
*
* @author n.hoffmann
- * @version $Id: $
*/
public class ParseHandler{
- private TaxonNameBase taxonNameBase;
+ private TaxonName taxonName;
private class MatchMatrix {
- List<TaxonNameBase> duplicateNames = new ArrayList<TaxonNameBase>();
+ List<TaxonName> duplicateNames = new ArrayList<>();
List<INomenclaturalReference> duplicateReferences = new ArrayList<INomenclaturalReference>();
List<INomenclaturalReference> duplicateInReferences = new ArrayList<INomenclaturalReference>();
* @param textWidget
* @param name
*/
- private ParseHandler(TaxonNameBase name){
+ private ParseHandler(TaxonName name){
if(name == null){
this.name = nonViralNameParser.getNonViralNameInstance("", PreferencesUtil.getPreferredNomenclaturalCode());
}else{
- this.name = (NonViralName) HibernateProxyHelper.deproxy(name);
+ this.name = (INonViralName) HibernateProxyHelper.deproxy(name);
}
}
* @param name An initial NonViralName or null when creating a new name
* @return An instance of this class
*/
- public static ParseHandler NewInstance(TaxonNameBase name){
+ public static ParseHandler NewInstance(TaxonName name){
return new ParseHandler(name);
}
* @param unparsedNameString a {@link java.lang.String} object.
* @return a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
*/
- public static NonViralName parseReferencedName(String unparsedNameString, Rank rank){
- NonViralName name = nonViralNameParser.parseReferencedName(unparsedNameString,
+ public static INonViralName parseReferencedName(String unparsedNameString, Rank rank){
+ INonViralName name = nonViralNameParser.parseReferencedName(unparsedNameString,
PreferencesUtil.getPreferredNomenclaturalCode(), rank);
// if (name.hasProblem()) {
return name;
}
- public static TaxonNameBase<?,?> parseName(String unparsedNameString, Rank rank){
+ public static TaxonName parseName(String unparsedNameString, Rank rank){
INonViralName name = nonViralNameParser.parseFullName(unparsedNameString,
PreferencesUtil.getPreferredNomenclaturalCode(), rank);
- return (TaxonNameBase<?,?>)name;
+ return (TaxonName)name;
}
/**
*
* @return a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
*/
- public static TaxonNameBase<?,?> createEmptyName(){
- return (TaxonNameBase<?,?>)nonViralNameParser.getNonViralNameInstance("", PreferencesUtil.getPreferredNomenclaturalCode());
+ public static TaxonName createEmptyName(){
+ return (TaxonName)nonViralNameParser.getNonViralNameInstance("", PreferencesUtil.getPreferredNomenclaturalCode());
}
/**
}
/**
- * @param taxonNameBase The TaxonNameBase to find matches for.
+ * @param taxonName The TaxonNameBase to find matches for.
* @return A <code>List</code> of possibly matching TaxonNameBase's.
*/
- private List<TaxonNameBase> findMatchingLatinNames(ITaxonNameBase taxonNameBase) {
+ private List<TaxonName> findMatchingLatinNames(ITaxonNameBase taxonName) {
try {
- return CdmStore.getCommonService().findMatching(TaxonNameBase.castAndDeproxy(taxonNameBase), MatchStrategy.NonViralName);
+ return CdmStore.getCommonService().findMatching(TaxonName.castAndDeproxy(taxonName), MatchStrategy.NonViralName);
} catch (MatchException e) {
import org.eclipse.ui.IWorkbench;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.strategy.match.IMatchStrategy;
import eu.etaxonomy.cdm.strategy.match.MatchException;
import eu.etaxonomy.cdm.strategy.match.MatchStrategyConfigurator;
*
* @author n.hoffmann
* @created Jan 22, 2010
- * @version 1.0
*/
-public class NonViralNameMatchingPreference extends AbstractMatchingPreferences<NonViralName>{
+public class NonViralNameMatchingPreference extends AbstractMatchingPreferences<TaxonName>{
/** {@inheritDoc} */
@Override
public void init(IWorkbench workbench) {
super.init(workbench);
- clazz = NonViralName.class;
+ clazz = TaxonName.class;
try {
matchStrategy = MatchStrategyConfigurator.NonViralNameMatchStrategy();
import eu.etaxonomy.cdm.model.description.PolytomousKey;
import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.Primer;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.Collection;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.model.reference.Reference;
else if (cdmBase.isInstanceOf(AgentBase.class)){
service = (IService<T>) getService(IAgentService.class);
}
- else if (cdmBase instanceof NonViralName) {
+ else if (cdmBase instanceof TaxonName) {
service = (IService<T>) getService(INameService.class);
}
else if (cdmBase instanceof SpecimenOrObservationBase) {
import eu.etaxonomy.cdm.model.common.User;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.cdm.model.name.NameRelationship;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
/**
* @author n.hoffmann
* @created Dec 8, 2010
- * @version 1.0
*/
public class SearchManager {
// TODO make this configurable via preferences
private static final int MAX_RESULTS_BEFORE_WARNING = 500;
- public List<TaxonNameBase> findNames(IIdentifiableEntityServiceConfigurator configurator, ConversationHolder conversation){
+ public List<TaxonName> findNames(IIdentifiableEntityServiceConfigurator configurator, ConversationHolder conversation){
if(checkLargeResult(CdmStore.getService(INameService.class).countByTitle(configurator))){
- List<TaxonNameBase> records = CdmStore.getService(INameService.class).findByTitle(configurator).getRecords();
+ List<TaxonName> records = CdmStore.getService(INameService.class).findByTitle(configurator).getRecords();
addUuidSearchResults(records, configurator, INameService.class);
return records;
}
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.service.INameService;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard;
import eu.etaxonomy.taxeditor.newWizard.NewNonViralNameWizard;
import eu.etaxonomy.taxeditor.store.CdmStore;
/**
* @author n.hoffmann
* @created 04.06.2009
- * @version 1.0
*/
-public class NameSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonNameBase> {
+public class NameSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonName> {
- public static TaxonNameBase select(Shell shell, ConversationHolder conversation, TaxonNameBase name) {
+ public static TaxonName select(Shell shell, ConversationHolder conversation, TaxonName name) {
NameSelectionDialog dialog = new NameSelectionDialog(shell, conversation,
"Choose a name", false, name);
return getSelectionFromDialog(dialog);
}
- protected NameSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonNameBase name) {
+ protected NameSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, TaxonName name) {
super(shell, conversation, title, multi, NameSelectionDialog.class.getCanonicalName(), name);
}
/** {@inheritDoc} */
@Override
- protected TaxonNameBase getPersistentObject(UUID cdmUuid) {
+ protected TaxonName getPersistentObject(UUID cdmUuid) {
return CdmStore.getService(INameService.class).load(cdmUuid);
}
import eu.etaxonomy.cdm.model.media.Rights;
import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.Primer;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.Collection;
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
return (T) ReferenceSelectionDialog.select(shell, conversation, (Reference) currentSelection);
}
- if(clazz.equals(TaxonNameBase.class)){
- return (T) NameSelectionDialog.select(shell, conversation, (TaxonNameBase) currentSelection);
+ if(clazz.equals(TaxonName.class)){
+ return (T) NameSelectionDialog.select(shell, conversation, (TaxonName) currentSelection);
}
if(clazz.equals(Team.class)){
return (T) TeamSelectionDialog.select(shell, conversation, (Team) currentSelection);
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD;
*
* @author n.hoffmann
* @created Feb 26, 2010
- * @version 1.0
*/
public abstract class AbstractCdmDetailElement<T> extends AbstractCdmFormElement implements ICdmDetailElement<T>, Observer {
}
protected void handleTitleCacheRelevantChange(PropertyChangeEvent event) {
- boolean isRelevant = getEntity() instanceof TaxonNameBase
+ boolean isRelevant = getEntity() instanceof TaxonName
|| getEntity() instanceof TaxonBase;
isRelevant &= this instanceof AbstractIdentifiableEntityDetailElement;
*
* @author n.hoffmann
* @created Feb 26, 2010
- * @version 1.0
*/
-public abstract class AbstractCdmDetailSection<ENTITY> extends AbstractFormSection<ENTITY> implements IEnableableFormElement, IExpansionListener {
+public abstract class AbstractCdmDetailSection<ENTITY>
+ extends AbstractFormSection<ENTITY>
+ implements IEnableableFormElement, IExpansionListener {
protected ICdmDetailElement<ENTITY> detailElement;
import eu.etaxonomy.cdm.common.CdmUtils;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.INonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
private boolean complete;
- private EntitySelectionElement<TaxonNameBase> selection_reuseExistingName;
+ private EntitySelectionElement<TaxonName> selection_reuseExistingName;
public TaxonNodeDetailElement(CdmFormFactory formFactory,
ICdmFormElement formElement, boolean isCreateNew) {
EntitySelectionElement.DELETABLE, style);
selection_reuseExistingName = formFactory
- .createSelectionElement(TaxonNameBase.class,
+ .createSelectionElement(TaxonName.class,
getConversationHolder(), formElement,
"Reuse existing name", null,
EntitySelectionElement.DELETABLE, style);
TaxonNode node = (TaxonNode)getEntity();
if(node.getTaxon()!=null){
Taxon taxon = HibernateProxyHelper.deproxy(node.getTaxon(), Taxon.class);
- if(taxon.getName()!=null && taxon.getName().isInstanceOf(NonViralName.class)){
- NonViralName<?> name = HibernateProxyHelper.deproxy(node.getTaxon().getName(), NonViralName.class);
+ if(taxon.getName()!=null){
+ TaxonName name = HibernateProxyHelper.deproxy(node.getTaxon().getName());
if (!isCreateNew()){
textNewTaxonName.setText(name.getNameCache());
} else if( ! name.isSupraGeneric() && name.getRank() != null){
selection_SecRef.setEntity(taxon.getSec());
}
- private void setTaxon(TaxonNameBase taxonName) {
+ private void setTaxon(TaxonName taxonName) {
Reference secundum = null;
if (getParentTreeNode() != null) {
if (this.selection_SecRef.getEntity() != null){
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.Taxon;
*
* @author n.hoffmann
* @created Sep 15, 2009
- * @version 1.0
*/
public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<ITaxonTreeNode> implements Listener{
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#createElement
- * (eu.etaxonomy.taxeditor.forms.ICdmFormElement)
- */
/** {@inheritDoc} */
@Override
public TaxonNodeDetailElement createElement(ICdmFormElement rootElement) {
return ((TaxonNodeDetailElement) getDetailElement()).isOpenInEditor();
}
- /*
- * (non-Javadoc)
- *
- * @see
- * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse
- * .jface.util.PropertyChangeEvent)
- */
/** {@inheritDoc} */
@Override
public void propertyChange(PropertyChangeEvent event) {
if (((TaxonNodeDetailElement) getDetailElement()).getTaxon() == null){
String taxonName = ((TaxonNodeDetailElement) getDetailElement()).getTaxonName();
Reference reference = ((TaxonNodeDetailElement) getDetailElement()).getReference();
- NonViralName parseReferencedName = ParseHandler.parseReferencedName(taxonName, null);
+ INonViralName parseReferencedName = ParseHandler.parseReferencedName(taxonName, null);
return Taxon.NewInstance(parseReferencedName, reference);
} else{
return ((TaxonNodeDetailElement) getDetailElement()).getTaxon();
}
}
- /*
- * (non-Javadoc)
- *
- * @see eu.etaxonomy.taxeditor.forms.AbstractCdmEntityWizardPage#dispose()
- */
/** {@inheritDoc} */
@Override
public void dispose() {
import org.eclipse.swt.events.SelectionListener;
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
AbstractOriginalSourceElement<DescriptionElementSource> implements
IEntityElement<DescriptionElementSource> {
- private EntitySelectionElement<TaxonNameBase> selection_name;
+ private EntitySelectionElement<TaxonName> selection_name;
public DescriptionElementSourceElement(CdmFormFactory cdmFormFactory,
- AbstractFormSection formElement, DescriptionElementSource element,
+ AbstractFormSection<?> formElement, DescriptionElementSource element,
SelectionListener removeListener, int style) {
super(cdmFormFactory, formElement, element, removeListener, style);
formFactory.createSelectionArbitrator(this);
public void createControls(ICdmFormElement formElement, int style) {
super.createControls(formElement, style);
selection_name = formFactory
- .createSelectionElement(TaxonNameBase.class,
+ .createSelectionElement(TaxonName.class,
getConversationHolder(), formElement, "Name in Source",
null, EntitySelectionElement.ALL, SWT.NULL);
}
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.api.service.IUserService;
-import eu.etaxonomy.cdm.model.reference.IPersonalCommunication;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority;
-
-import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmPermissionClass;
import eu.etaxonomy.taxeditor.store.CdmStore;
public class GrantedAuthorityLabelTextProvider {
case REFERENCE:
targetText = CdmStore.getService(IReferenceService.class).load(uuid).getTitleCache();
break;
- case TAXONNAMEBASE:
+ case TAXONNAME:
targetText = CdmStore.getService(INameService.class).load(uuid).getTitleCache();
break;
case TEAMORPERSONBASE:
import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
-import eu.etaxonomy.cdm.model.name.ZoologicalName;
+import eu.etaxonomy.cdm.model.name.IZoologicalName;
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
* @version 1.0
*/
public class AuthorshipDetailElement extends
- AbstractIdentifiableEntityDetailElement<NonViralName> {
+ AbstractIdentifiableEntityDetailElement<INonViralName> {
private EntitySelectionElement<TeamOrPersonBase> selectionExBasionymAuthor;
private EntitySelectionElement<TeamOrPersonBase> selectionBasionymAuthor;
/** {@inheritDoc} */
@Override
protected void createControls(ICdmFormElement formElement,
- NonViralName entity, int style) {
+ INonViralName entity, int style) {
if (isAdvancedView || PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_NAME_DETAILS_SECTION_AUTHORSHIP_CACHE)){
toggleable_cache = formFactory.createToggleableTextField(this,
"Authorship Cache", entity.getAuthorshipCache(),
addElement(selectionExCombinationAuthor);
if (code != null){
if (code.equals(NomenclaturalCode.ICZN)){
- text_publicationYear = formFactory.createNumberTextWithLabelElement(formElement, "Publication Year", ((ZoologicalName)entity).getPublicationYear(), style);
+ text_publicationYear = formFactory.createNumberTextWithLabelElement(formElement, "Publication Year", ((IZoologicalName)entity).getPublicationYear(), style);
}
}
if (code != null){
if (code.equals(NomenclaturalCode.ICZN)){
- text_originalPublicationYear = formFactory.createNumberTextWithLabelElement(formElement, "Orig. Publication Year", ((ZoologicalName)entity).getOriginalPublicationYear(), style);
+ text_originalPublicationYear = formFactory.createNumberTextWithLabelElement(formElement, "Orig. Publication Year", ((IZoologicalName)entity).getOriginalPublicationYear(), style);
}
}
getEntity().setExBasionymAuthorship(
selectionExBasionymAuthor.getSelection());
} else if (eventSource == text_originalPublicationYear) {
- ((ZoologicalName)getEntity()).setOriginalPublicationYear(text_originalPublicationYear.getInteger());
+ ((IZoologicalName)getEntity()).setOriginalPublicationYear(text_originalPublicationYear.getInteger());
} else if (eventSource == text_publicationYear) {
- ((ZoologicalName)getEntity()).setPublicationYear(text_publicationYear.getInteger());
+ ((IZoologicalName)getEntity()).setPublicationYear(text_publicationYear.getInteger());
}
// if (eventSource != toggleable_cache) {
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
* @created 05.06.2009
* @version 1.0
*/
-public class AuthorshipDetailSection extends AbstractCdmDetailSection<NonViralName> implements ITaxonBaseDetailSection {
+public class AuthorshipDetailSection extends AbstractCdmDetailSection<INonViralName> implements ITaxonBaseDetailSection {
private TaxonBase taxonBase;
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
- NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(entity.getName());
+ INonViralName name = (INonViralName) HibernateProxyHelper.deproxy(entity.getName());
setEntity(name);
}
}
@Override
- protected AbstractCdmDetailElement<NonViralName> createCdmDetailElement(AbstractCdmDetailSection<NonViralName> parentElement, int style) {
+ protected AbstractCdmDetailElement<INonViralName> createCdmDetailElement(
+ AbstractCdmDetailSection<INonViralName> parentElement, int style) {
return formFactory.createAuthorshipDetailElement(parentElement, style);
}
package eu.etaxonomy.taxeditor.ui.section.name;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.CheckboxElement;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
/**
* @author n.hoffmann
* @created Jan 5, 2011
- * @version 1.0
*/
-public class HybridDetailElement extends AbstractCdmDetailElement<NonViralName<?>> {
+public class HybridDetailElement extends AbstractCdmDetailElement<INonViralName> {
private CheckboxElement checkboxMonomHybrid;
private CheckboxElement checkboxBinomHybrid;
}
@Override
- protected void createControls(ICdmFormElement formElement, NonViralName<?> entity,
+ protected void createControls(ICdmFormElement formElement, INonViralName entity,
int style) {
checkboxMonomHybrid = formFactory.createCheckbox(formElement, "Monom hybrid", entity.isMonomHybrid(), style);
checkboxBinomHybrid = formFactory.createCheckbox(formElement, "Binom hybrid", entity.isBinomHybrid(), style);
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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.element.ICdmFormElement;
/**
* @author n.hoffmann
* @created Jan 5, 2011
- * @version 1.0
*/
-public class HybridDetailSection extends AbstractCdmDetailSection<TaxonNameBase> implements
+public class HybridDetailSection extends AbstractCdmDetailSection<TaxonName> implements
ITaxonBaseDetailSection {
private TaxonBase taxonBase;
super(formFactory, conversation, parentElement, selectionProvider, style);
}
-
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection#setTaxonBase(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
@Override
public void setTaxonBase(TaxonBase taxon) {
taxonBase = taxon;
- NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(taxon.getName());
+ TaxonName name = HibernateProxyHelper.deproxy(taxon.getName());
setEntity(name);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonBaseDetailSection#getTaxonBase()
- */
@Override
public TaxonBase getTaxonBase() {
return taxonBase;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#getHeading()
- */
@Override
public String getHeading() {
return "Hybrid";
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailSection#setSectionTitle()
- */
@Override
protected void setSectionTitle() {
setText(getHeading());
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
@Override
- protected AbstractCdmDetailElement createCdmDetailElement(AbstractCdmDetailSection<TaxonNameBase> parentElement, int style) {
+ protected AbstractCdmDetailElement createCdmDetailElement(
+ AbstractCdmDetailSection<TaxonName> parentElement, int style) {
//FIXME generic
return formFactory.createHybridDetailElement(parentElement);
}
import org.eclipse.swt.SWT;
import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.name.BotanicalName;
+import eu.etaxonomy.cdm.model.name.IFungusName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
+import eu.etaxonomy.cdm.model.name.IZoologicalName;
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.NonViralName;
import eu.etaxonomy.cdm.model.name.Rank;
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
-import eu.etaxonomy.cdm.model.name.ZoologicalName;
import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
*
* @author n.hoffmann
* @created Feb 26, 2010
- * @version 1.0
*/
-public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<NonViralName> implements ISelectableElement, IEnableableFormElement{
+public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<INonViralName> implements ISelectableElement, IEnableableFormElement{
private final Logger logger = Logger.getLogger(NameDetailElement.class);
/** {@inheritDoc} */
@Override
- protected void createControls(ICdmFormElement formElement, NonViralName nonViralName, int style) {
+ protected void createControls(ICdmFormElement formElement, INonViralName nonViralName, int style) {
if (isAdvancedView){
toggleable_cache = formFactory.createToggleableTextField(this, "Name Cache", nonViralName.getNameCache(), nonViralName.isProtectedNameCache(), style);
private void createSpecificNameParts(ICdmFormElement formElement,
- NonViralName nonViralName, int style) {
+ INonViralName nonViralName, int style) {
NomenclaturalCode code = nonViralName.getNomenclaturalCode();
if (code != null){
switch(nonViralName.getNomenclaturalCode()){
case ICNAFP :
- // TODO RL
- if(isAdvancedView)
- {
- createBotanicalNameParts(formElement, nonViralName, style);
+ //nothing do add
+ createBotanicalNameParts(formElement, nonViralName, style);
+ break;
+ case Fungi :
+ if (isAdvancedView){
+ createFungusNameParts(formElement, nonViralName, style);
}
break;
case ICZN:
}
}
- private void createBotanicalNameParts(ICdmFormElement formElement, NonViralName nonViralName, int style){
- BotanicalName botanicalName = (BotanicalName) nonViralName;
- checkbox_anamorphic = formFactory.createCheckbox(formElement, "Anamorphic", botanicalName.isAnamorphic(), style);
+
+ private void createBotanicalNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style){
+ //nothing to do
+ }
+
+ private void createFungusNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style){
+ IFungusName fungusName = (IFungusName)nonViralName;
+ checkbox_anamorphic = formFactory.createCheckbox(formElement, "Anamorphic", fungusName.isAnamorphic(), style);
}
- private void createZoologicalNameParts(ICdmFormElement formElement, NonViralName nonViralName, int style){
- ZoologicalName zoologicalName = (ZoologicalName) nonViralName;
+ private void createZoologicalNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style){
+ IZoologicalName zoologicalName = (IZoologicalName) nonViralName;
if (isAdvancedView){
text_breed = formFactory.createTextWithLabelElement(formElement, "Breed", zoologicalName.getBreed(), style);
}
}
- private void createGenusOrUninomialControls(ICdmFormElement element, NonViralName nonViralName, int style){
+ private void createGenusOrUninomialControls(ICdmFormElement element, INonViralName nonViralName, int style){
String title = "Genus";
Rank rank = nonViralName.getRank();
if(rank != null && rank.isSupraGeneric()){
text_uninomial = formFactory.createTextWithLabelElement(element, title, nonViralName.getGenusOrUninomial(), style);
}
- private void createInfragenerericEpithetControls(ICdmFormElement element, NonViralName nonViralName, int style){
+ private void createInfragenerericEpithetControls(ICdmFormElement element, INonViralName nonViralName, int style){
if (nonViralName.getNomenclaturalCode() == null || nonViralName.getNomenclaturalCode().equals(NomenclaturalCode.ICZN)){
if(nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS()) ){
text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
}
}
- private void createSpecificEpithetControls(ICdmFormElement element, NonViralName nonViralName, int style){
+ private void createSpecificEpithetControls(ICdmFormElement element, INonViralName nonViralName, int style){
if(nonViralName.getRank() != null && (nonViralName.getRank().isSpecies() || nonViralName.getRank().isInfraSpecific() || nonViralName.getRank().isSpeciesAggregate())){
text_specificEpithet = formFactory.createTextWithLabelElement(element, "Specific Epithet", nonViralName.getSpecificEpithet(), SWT.NULL);
}
}
- private void createInfraSpecificEpithetControls(ICdmFormElement element, NonViralName nonViralName, int style){
+ private void createInfraSpecificEpithetControls(ICdmFormElement element, INonViralName nonViralName, int style){
if(nonViralName.getRank() != null && nonViralName.getRank().isInfraSpecific()){
text_infraspecificEpithet = formFactory.createTextWithLabelElement(element, "Infraspecific Epithet", nonViralName.getInfraSpecificEpithet(), SWT.NULL);
}
getEntity().setGenusOrUninomial(text_uninomial.getText());
}
else if(eventSource == checkbox_anamorphic){
- ((BotanicalName)getEntity()).setAnamorphic(checkbox_anamorphic.getSelection());
+ ((IFungusName)getEntity()).setAnamorphic(checkbox_anamorphic.getSelection());
}else if(eventSource == text_breed){
- ((ZoologicalName)getEntity()).setBreed(text_breed.getText());
+ ((IZoologicalName)getEntity()).setBreed(text_breed.getText());
}
}
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
*
* @author n.hoffmann
* @created 05.06.2009
- * @version 1.0
*/
-public class NameDetailSection extends AbstractCdmDetailSection<NonViralName> implements ITaxonBaseDetailSection{
+public class NameDetailSection extends AbstractCdmDetailSection<INonViralName> implements ITaxonBaseDetailSection{
private TaxonBase taxonBase;
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
- NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(entity.getName());
+ INonViralName name = (INonViralName) HibernateProxyHelper.deproxy(entity.getName());
setEntity(name);
}
protected void setSectionTitle() {
if(!isDisposed()){
String title = "";
- if(getEntity() != null && (getEntity() instanceof NonViralName)){
+ if(getEntity() != null){
title = ": " + getEntity().getNameCache();
}
this.setText(getHeading() + title);
}
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
@Override
public TaxonBase getTaxonBase() {
return taxonBase;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
@Override
- protected AbstractCdmDetailElement<NonViralName> createCdmDetailElement(AbstractCdmDetailSection<NonViralName> parentElement, int style) {
+ protected AbstractCdmDetailElement<INonViralName> createCdmDetailElement(
+ AbstractCdmDetailSection<INonViralName> parentElement, int style) {
return formFactory.createNameDetailElement(parentElement, style);
}
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.name.NameRelationship;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.store.StoreUtil;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
*
* @author n.hoffmann
* @created Mar 18, 2010
- * @version 1.0
*/
-public class NameRelationshipDetailSection extends AbstractEntityCollectionSection<TaxonNameBase, NameRelationship> implements ITaxonBaseDetailSection{
+public class NameRelationshipDetailSection extends AbstractEntityCollectionSection<TaxonName, NameRelationship> implements ITaxonBaseDetailSection{
private TaxonBase taxonBase;
/** {@inheritDoc} */
@Override
- public Collection<NameRelationship> getCollection(TaxonNameBase entity) {
+ public Collection<NameRelationship> getCollection(TaxonName entity) {
Collection<NameRelationship> allNameRelationships = entity.getRelationsFromThisName();
allNameRelationships.addAll(entity.getRelationsToThisName());
return allNameRelationships;
getEntity().removeNameRelationship(element);
}
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#setTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
/** {@inheritDoc} */
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
- NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(entity.getName());
+ TaxonName name = HibernateProxyHelper.deproxy(entity.getName());
setEntity(name);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
@Override
public TaxonBase getTaxonBase() {
return taxonBase;
import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.name.NameRelationship;
import eu.etaxonomy.cdm.model.name.NameRelationshipType;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.ui.AbstractEntityCollectionElementWizardPage;
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
public class NameRelationshipWizardPage extends AbstractEntityCollectionElementWizardPage implements
IPropertyChangeListener {
- private EntitySelectionElement<TaxonNameBase> selection_relatedTo;
+ private EntitySelectionElement<TaxonName> selection_relatedTo;
private TermComboElement<NameRelationshipType> combo_relationshipType;
- private final TaxonNameBase entity;
+ private final TaxonName entity;
private NameRelationshipType type;
- private TaxonNameBase toName;
+ private TaxonName toName;
/**
* <p>
rootElement, "Name Relationship Type", null, SWT.NULL);
selection_relatedTo = formFactory
- .createSelectionElement(TaxonNameBase.class,
+ .createSelectionElement(TaxonName.class,
((NameRelationshipWizard) getWizard())
.getConversationHolder(), rootElement,
"Related to",this.entity, EntitySelectionElement.ALL,
import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
import eu.etaxonomy.cdm.model.name.NameTypeDesignationStatus;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
private CheckboxElement checkbox_rejectedType;
private CheckboxElement checkbox_conservedType;
- private EntitySelectionElement<TaxonNameBase> selection_typeName;
+ private EntitySelectionElement<TaxonName> selection_typeName;
private TermComboElement<NameTypeDesignationStatus> combo_typeStatus;
public NameTypeDesignationElement(CdmFormFactory formFactory,
checkbox_conservedType = formFactory.createCheckbox(formElement,
"Conserved Type", false, style);
selection_typeName = formFactory
- .createSelectionElement(TaxonNameBase.class,
+ .createSelectionElement(TaxonName.class,
getConversationHolder(), formElement, "Name", null,
EntitySelectionElement.ALL, style);
combo_typeStatus = formFactory.createDefinedTermComboElement(TermType.NameTypeDesignationStatus, formElement,
checkbox_conservedType.setSelection(entity.isConservedType());
checkbox_rejectedType.setSelection(entity.isRejectedType());
- selection_typeName.setEntity((TaxonNameBase) HibernateProxyHelper.deproxy(entity.getTypeName()));
+ selection_typeName.setEntity((TaxonName) HibernateProxyHelper.deproxy(entity.getTypeName()));
combo_typeStatus.setSelection(HibernateProxyHelper.deproxy(entity.getTypeStatus(), NameTypeDesignationStatus.class));
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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.element.ICdmFormElement;
* <p>NomenclaturalStatusSection class.</p>
*
* @author n.hoffmann
- * @created Nov 5, 2009
- * @version 1.0
*/
-public class NomenclaturalStatusSection extends AbstractEntityCollectionSection<TaxonNameBase, NomenclaturalStatus> implements ITaxonBaseDetailSection{
+public class NomenclaturalStatusSection extends AbstractEntityCollectionSection<TaxonName, NomenclaturalStatus> implements ITaxonBaseDetailSection{
private TaxonBase taxonBase;
/** {@inheritDoc} */
@Override
- public Collection<NomenclaturalStatus> getCollection(TaxonNameBase entity) {
+ public Collection<NomenclaturalStatus> getCollection(TaxonName entity) {
return entity.getStatus();
}
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
- NonViralName nonViralName = (NonViralName) HibernateProxyHelper.deproxy(entity.getName());
+ TaxonName nonViralName = HibernateProxyHelper.deproxy(entity.getName());
setEntity(nonViralName);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
@Override
public TaxonBase getTaxonBase() {
return taxonBase;
import org.eclipse.ui.forms.widgets.ExpandableComposite;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement;
/**
* @author n.hoffmann
* @created May 20, 2010
- * @version 1.0
*/
-public class NonViralNameDetailElement extends
- AbstractIdentifiableEntityDetailElement<NonViralName> {
+public class NonViralNameDetailElement
+ extends AbstractIdentifiableEntityDetailElement<TaxonName> {
private NameDetailSection section_name;
private AuthorshipDetailSection section_author;
/** {@inheritDoc} */
@Override
- protected void createControls(ICdmFormElement formElement, final NonViralName entity, int style) {
+ protected void createControls(ICdmFormElement formElement, final TaxonName entity, int style) {
if (isAdvancedView){
/** {@inheritDoc} */
@Override
- public void setEntity(NonViralName entity) {
+ public void setEntity(TaxonName entity) {
super.setEntity(entity);
if (section_name!=null) {
section_name.setEntity(entity);
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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.model.ImageResources;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
/**
* @author n.hoffmann
* @created May 20, 2010
- * @version 1.0
*/
-public class NonViralNameDetailSection extends AbstractCdmDetailSection<NonViralName>
+public class NonViralNameDetailSection extends AbstractCdmDetailSection<TaxonName>
implements ITaxonBaseDetailSection {
private TaxonBase taxonBase;
Action chooseNameAction = new Action("Choose Name", IAction.AS_PUSH_BUTTON){
@Override
public void run() {
- TaxonNameBase taxonName = NameSelectionDialog.select(getShell(), getConversationHolder(), getEntity());
+ TaxonName taxonName = NameSelectionDialog.select(getShell(), getConversationHolder(), getEntity());
if(taxonName!=null){
- if(taxonName.isInstanceOf(NonViralName.class)){
- NonViralName nonViralName = HibernateProxyHelper.deproxy(taxonName, NonViralName.class);
- taxonBase.setName(nonViralName);
- // taxonBase.getTitleCache();
- setEntity(nonViralName);
- firePropertyChangeEvent(NonViralNameDetailSection.this);
- }
- else{
- MessagingUtils.warningDialog("Invalid name", this, "The selected name can not be used for this taxon.");
- }
+ TaxonName nonViralName = HibernateProxyHelper.deproxy(taxonName);
+ taxonBase.setName(nonViralName);
+ // taxonBase.getTitleCache();
+ setEntity(nonViralName);
+ firePropertyChangeEvent(NonViralNameDetailSection.this);
}
}
};
boolean confirm = MessagingUtils.confirmDialog("Confirm cloning", "Do you really want to clone the name?");
if(confirm){
- NonViralName clonedName;
- clonedName = (NonViralName) getEntity().clone();
+ TaxonName clonedName;
+ clonedName = (TaxonName) getEntity().clone();
setEntity(clonedName);
taxonBase.setName(clonedName);
taxonBase.generateTitle();
}
- private boolean checkForMultipleNameUsages(NonViralName nonViralName) {
+ private boolean checkForMultipleNameUsages(INonViralName nonViralName) {
return nonViralName.getTaxonBases().size() != 1;
}
@Override
public void setTaxonBase(TaxonBase taxon) {
taxonBase = taxon;
- NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(taxon.getName());
+ TaxonName name = HibernateProxyHelper.deproxy(taxon.getName());
setEntity(name);
}
}
@Override
- protected AbstractCdmDetailElement<NonViralName> createCdmDetailElement(AbstractCdmDetailSection<NonViralName> parentElement, int style) {
+ protected AbstractCdmDetailElement<TaxonName> createCdmDetailElement(
+ AbstractCdmDetailSection<TaxonName> parentElement, int style) {
return formFactory.createNonViralNameDetailElement(parentElement);
}
}
package eu.etaxonomy.taxeditor.ui.section.name;
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.ui.element.AbstractCdmEntityWizardPage;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
*
* @author n.hoffmann
* @created Jun 1, 2010
- * @version 1.0
*/
-public class NonViralNameWizardPage extends AbstractCdmEntityWizardPage<NonViralName> {
+public class NonViralNameWizardPage extends AbstractCdmEntityWizardPage<TaxonName> {
private NonViralNameDetailElement nameElement;
* @param entity a {@link eu.etaxonomy.cdm.model.name.NonViralName} object.
*/
public NonViralNameWizardPage(CdmFormFactory formFactory, ConversationHolder conversation,
- NonViralName entity) {
+ TaxonName entity) {
super(formFactory, conversation, entity);
setTitle("Name");
}
/** {@inheritDoc} */
@Override
- public AbstractCdmDetailElement<NonViralName> createElement(ICdmFormElement rootElement) {
+ public AbstractCdmDetailElement<TaxonName> createElement(ICdmFormElement rootElement) {
nameElement = formFactory.createNonViralNameDetailElement(rootElement);
nameElement.setEntity(entity);
return nameElement;
import eu.etaxonomy.cdm.model.media.Media;
import eu.etaxonomy.cdm.model.media.MediaRepresentation;
import eu.etaxonomy.cdm.model.media.MediaRepresentationPart;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
* @param cdmFormFactory a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
* @param formElement a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection} object.
*/
- public ProtologueElement(CdmFormFactory cdmFormFactory, AbstractFormSection formElement, DescriptionElementBase element,
+ public ProtologueElement(CdmFormFactory cdmFormFactory, AbstractFormSection<?> formElement, DescriptionElementBase element,
SelectionListener removeListener, int style) {
super(cdmFormFactory, formElement, element, removeListener, null, style);
selectionArbitrator = cdmFormFactory.createSelectionArbitrator(this);
return getName().getNomenclaturalMicroReference();
}
- private TaxonNameBase getName(){
+ private TaxonName getName(){
TaxonNameDescription description = (TaxonNameDescription) entity.getInDescription();
- TaxonNameBase taxonName = description.getTaxonName();
+ TaxonName taxonName = description.getTaxonName();
return taxonName;
}
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.description.TaxonNameDescription;
import eu.etaxonomy.cdm.model.description.TextData;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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.element.ICdmFormElement;
* @author n.hoffmann
* @created Nov 5, 2009
*/
-public class ProtologueSection extends AbstractEntityCollectionSection<TaxonNameBase, DescriptionElementBase> implements ITaxonBaseDetailSection{
+public class ProtologueSection extends AbstractEntityCollectionSection<TaxonName, DescriptionElementBase> implements ITaxonBaseDetailSection{
private TaxonBase taxonBase;
/** {@inheritDoc} */
@Override
- public Collection<DescriptionElementBase> getCollection(TaxonNameBase entity) {
- Collection<DescriptionElementBase> result = new ArrayList<DescriptionElementBase>();
+ public Collection<DescriptionElementBase> getCollection(TaxonName entity) {
+ Collection<DescriptionElementBase> result = new ArrayList<>();
List<TaxonNameDescription> descriptions = getTaxonNameDescriptions(entity);
for (TaxonNameDescription desc : descriptions){
result.addAll(desc.getElements());
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
- NonViralName name = HibernateProxyHelper.deproxy(entity.getName(), NonViralName.class);
+ TaxonName name = HibernateProxyHelper.deproxy(entity.getName());
setEntity(name);
}
* @param name
* @return
*/
- private TaxonNameDescription getTaxonNameDescription(TaxonNameBase name){
+ private TaxonNameDescription getTaxonNameDescription(TaxonName name){
if(name.getDescriptions().size() == 0){
name.addDescription(TaxonNameDescription.NewInstance(name));
}
* @param name
* @return
*/
- private List<TaxonNameDescription> getTaxonNameDescriptions(TaxonNameBase<?,?> name){
- List<TaxonNameDescription> result = new ArrayList<TaxonNameDescription>();
+ private List<TaxonNameDescription> getTaxonNameDescriptions(TaxonName name){
+ List<TaxonNameDescription> result = new ArrayList<>();
if (name == null){
return result;
}
import eu.etaxonomy.cdm.api.service.INameService;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.name.NameTypeDesignation;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.name.Rank;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.name.TypeDesignationBase;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.preference.IPreferenceKeys;
*
* @author n.hoffmann
* @created May 17, 2010
- * @version 1.0
*/
-public class TypeDesignationSection extends AbstractEntityCollectionSection<TaxonNameBase, TypeDesignationBase> implements ITaxonBaseDetailSection {
+public class TypeDesignationSection extends AbstractEntityCollectionSection<TaxonName, TypeDesignationBase> implements ITaxonBaseDetailSection {
private TaxonBase taxonBase;
/** {@inheritDoc} */
@Override
- public Collection<TypeDesignationBase> getCollection(TaxonNameBase entity) {
+ public Collection<TypeDesignationBase> getCollection(TaxonName entity) {
if (entity == null){
return null;
}
@Override
public void removeElement(TypeDesignationBase element) {
boolean removeTypeDesignationFromAllTypifiedNames = PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.ADD_TYPES_TO_ALL_NAMES);
- TaxonNameBase entity = removeTypeDesignationFromAllTypifiedNames ? null : getEntity();
+ TaxonName entity = removeTypeDesignationFromAllTypifiedNames ? null : getEntity();
CdmStore.getService(INameService.class).deleteTypeDesignation(entity, element);
}
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#setTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
/** {@inheritDoc} */
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
- NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(entity.getName());
+ TaxonName name = (TaxonName) HibernateProxyHelper.deproxy(entity.getName());
setEntity(name);
}
return rank.isSpecies() || rank.isInfraSpecific();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
@Override
public TaxonBase getTaxonBase() {
return taxonBase;
import eu.etaxonomy.cdm.api.facade.MethodNotSupportedByDerivedUnitTypeException;
import eu.etaxonomy.cdm.model.common.DefinedTerm;
import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
import eu.etaxonomy.taxeditor.store.CdmStore;
private TextWithLabelElement text_catalogNumber;
- private EntitySelectionElement<TaxonNameBase> selection_storedUnder;
+ private EntitySelectionElement<TaxonName> selection_storedUnder;
private TextWithLabelElement text_exsicatum;
// we ignore this
MessagingUtils.info(e.getMessage());
}
- selection_storedUnder = formFactory.createSelectionElement(TaxonNameBase.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
+ selection_storedUnder = formFactory.createSelectionElement(TaxonName.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
try {
text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style);
import eu.etaxonomy.cdm.model.common.DefinedTerm;
import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
*
* @author n.hoffmann
* @created Oct 13, 2010
- * @version 1.0
*/
public class DeterminationEventDetailElement extends
AbstractEventDetailElement<DeterminationEvent> {
private TermComboElement<DefinedTerm> combo_determinationModifier;
private CheckboxElement checkbox_preferredFlag;
private EntitySelectionElement<TaxonBase> selection_taxonBase;
- private EntitySelectionElement<TaxonNameBase> selectionTaxonNameBase;
+ private EntitySelectionElement<TaxonName> selectionTaxonNameBase;
// private TODO a set of references
* a int.
*/
public DeterminationEventDetailElement(CdmFormFactory formFactory,
- AbstractFormSection section, DeterminationEvent entity,
+ AbstractFormSection<?> section, DeterminationEvent entity,
SelectionListener removeListener, int style) {
super(formFactory, section, entity, removeListener, style);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#setEntity
- * (eu.etaxonomy.cdm.model.common.IVersionableEntity)
- */
/** {@inheritDoc} */
@Override
public void setEntity(DeterminationEvent entity) {
super.setEntity(entity);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#createControls
- * (eu.etaxonomy.taxeditor.forms.ICdmFormElement, int)
- */
/** {@inheritDoc} */
@Override
public void createControls(ICdmFormElement element, int style) {
selectionTaxonNameBase = formFactory
- .createSelectionElement(TaxonNameBase.class,
+ .createSelectionElement(TaxonName.class,
getConversationHolder(), element, "Taxon Name", null,
EntitySelectionElement.NOTHING, style);
selection_taxonBase = formFactory
element, "Modifier", null, style);
}
- /*
- * (non-Javadoc)
- *
- * @see
- * eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent
- * (java.lang.Object)
- */
/** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
import eu.etaxonomy.cdm.model.common.TermType;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignationStatus;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.ui.combo.TermComboElement;
import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
* @author n.hoffmann
* @created May 17, 2010
*/
-public class DerivedUnitTypeDesignationElement extends AbstractTypeDesignationElement<SpecimenTypeDesignation> {
+public class DerivedUnitTypeDesignationElement
+ extends AbstractTypeDesignationElement<SpecimenTypeDesignation> {
private TermComboElement<SpecimenTypeDesignationStatus> combo_typeStatus;
private ICdmFormElement parentFormElement;
private int style;
- private EntitySelectionElement<TaxonNameBase> selectionTaxonName;
+ private EntitySelectionElement<TaxonName> selectionTaxonName;
public DerivedUnitTypeDesignationElement(CdmFormFactory formFactory,
- AbstractFormSection section, SpecimenTypeDesignation entity,
+ AbstractFormSection<?> section, SpecimenTypeDesignation entity,
SelectionListener removeListener, int style) {
super(formFactory, section, entity, removeListener, style);
}
@Override
public void setEntity(SpecimenTypeDesignation entity) {
super.setEntity(entity);
- Set<TaxonNameBase> typifiedNames = entity.getTypifiedNames();
+ Set<TaxonName> typifiedNames = entity.getTypifiedNames();
if(typifiedNames.size()==1){
selectionTaxonName.setEntity(typifiedNames.iterator().next());
}
this.style = style;
selectionTaxonName = formFactory.createSelectionElement(
- TaxonNameBase.class, getConversationHolder(), parentFormElement, "Scientific Name", null,
+ TaxonName.class, getConversationHolder(), parentFormElement, "Scientific Name", null,
EntitySelectionElement.EDITABLE | EntitySelectionElement.SELECTABLE, style);
combo_typeStatus = formFactory.createDefinedTermComboElement(TermType.SpecimenTypeDesignationStatus,
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionSection;
}
for (SpecimenTypeDesignation specimenTypeDesignation : toRemove) {
specimenTypeDesignation.removeType();
- Set<TaxonNameBase> names = specimenTypeDesignation.getTypifiedNames();
- for (TaxonNameBase taxonNameBase : names) {
+ Set<TaxonName> names = specimenTypeDesignation.getTypifiedNames();
+ for (TaxonName taxonNameBase : names) {
taxonNameBase.removeTypeDesignation(specimenTypeDesignation);
}
}
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.name.SpecimenTypeDesignation;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.DeterminationEvent;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
else if(element instanceof SpecimenTypeDesignation){
SpecimenTypeDesignation typeDesignation = (SpecimenTypeDesignation)element;
String label = typeDesignation.getTypeStatus()!=null?typeDesignation.getTypeStatus().getLabel()+" of ":"Type of ";
- Set<TaxonNameBase> typifiedNames = typeDesignation.getTypifiedNames();
- for (TaxonNameBase taxonNameBase : typifiedNames) {
+ Set<TaxonName> typifiedNames = typeDesignation.getTypifiedNames();
+ for (TaxonName taxonNameBase : typifiedNames) {
label += taxonNameBase+", ";
}
if(label.endsWith(", ")){
Object firstElement = ((IStructuredSelection) event.getSelection()).getFirstElement();
if(firstElement instanceof SpecimenTypeDesignation){
SpecimenTypeDesignation typeDesignation = (SpecimenTypeDesignation)firstElement;
- Set<TaxonNameBase> typifiedNames = typeDesignation.getTypifiedNames();
+ Set<TaxonName> typifiedNames = typeDesignation.getTypifiedNames();
if(typifiedNames.size()==1){
firstElement = typifiedNames.iterator().next();
}
import eu.etaxonomy.cdm.model.common.DefinedTerm;
import eu.etaxonomy.cdm.model.common.TermType;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
import eu.etaxonomy.cdm.model.occurrence.PreservationMethod;
import eu.etaxonomy.taxeditor.model.MessagingUtils;
private TextWithLabelElement text_catalogNumber;
- private EntitySelectionElement<TaxonNameBase> selection_storedUnder;
+ private EntitySelectionElement<TaxonName> selection_storedUnder;
private TextWithLabelElement text_exsicatum;
PreservationMethod preservationMethod = entity.getPreservation();
combo_preservationMethod = formFactory.createDefinedTermComboElement(TermType.MaterialOrMethod, formElement, "Preservation Method", preservationMethod==null?null:preservationMethod.getDefinedMaterialOrMethod(), style);
- selection_storedUnder = formFactory.createSelectionElement(TaxonNameBase.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
+ selection_storedUnder = formFactory.createSelectionElement(TaxonName.class, getConversationHolder(), formElement, "Stored Under", entity.getStoredUnder(), EntitySelectionElement.ALL, style);
text_exsicatum = formFactory.createTextWithLabelElement(formElement, "Exsiccatum", entity.getExsiccatum(), style);
package eu.etaxonomy.taxeditor.ui.section.reference;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
*
* @author n.hoffmann
* @created Mar 12, 2010
- * @version 1.0
*/
public class NomenclaturalReferenceDetailElement extends
- AbstractCdmDetailElement<TaxonNameBase> {
+ AbstractCdmDetailElement<TaxonName> {
private EntitySelectionElement<Reference> selection_nomenclaturalReference;
private TextWithLabelElement text_referenceDetail;
/** {@inheritDoc} */
@Override
protected void createControls(ICdmFormElement formElement,
- TaxonNameBase entity, int style) {
+ TaxonName entity, int style) {
selection_nomenclaturalReference = formFactory
.createSelectionElementWithAbbreviatedTitle(Reference.class,
getConversationHolder(), formElement, "Reference",
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
*
* @author n.hoffmann
* @created Mar 12, 2010
- * @version 1.0
*/
public class NomenclaturalReferenceDetailSection extends
- AbstractCdmDetailSection<TaxonNameBase> implements ITaxonBaseDetailSection{
+ AbstractCdmDetailSection<TaxonName> implements ITaxonBaseDetailSection{
private TaxonBase taxonBase;
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
- TaxonNameBase name = (TaxonNameBase) HibernateProxyHelper.deproxy(entity.getName());
+ TaxonName name = (TaxonName) HibernateProxyHelper.deproxy(entity.getName());
setEntity(name);
}
this.setText(getHeading() + title);
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
@Override
public TaxonBase getTaxonBase() {
return taxonBase;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
@Override
- protected AbstractCdmDetailElement<TaxonNameBase> createCdmDetailElement(AbstractCdmDetailSection<TaxonNameBase> parentElement, int style) {
+ protected AbstractCdmDetailElement<TaxonName> createCdmDetailElement(
+ AbstractCdmDetailSection<TaxonName> parentElement, int style) {
return formFactory.createNomenclaturalReferenceDetailElement(parentElement, style);
}
}
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.reference.Reference;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.taxeditor.model.AbstractUtility;
super(cdmFormFactory, conversation, parentElement, selectionProvider, style);
}
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#setTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
/** {@inheritDoc} */
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
- NonViralName name = (NonViralName) HibernateProxyHelper.deproxy(entity.getName());
+ TaxonName name = HibernateProxyHelper.deproxy(entity.getName());
Reference reference = (Reference) HibernateProxyHelper.deproxy(name.getNomenclaturalReference());
setEntity(reference);
}
- /*
- * (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.forms.section.cdmdetail.AbstractCdmDetailSection#getHeading()
- */
/** {@inheritDoc} */
@Override
public String getHeading() {
AbstractUtility.refreshDetailsViewer();
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
@Override
public TaxonBase getTaxonBase() {
return taxonBase;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
@Override
protected AbstractCdmDetailElement<Reference> createCdmDetailElement(AbstractCdmDetailSection<Reference> parentElement, int style) {
return formFactory.createReferenceDetailElement(parentElement, style, false);
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
*
* @author n.hoffmann
* @created Mar 3, 2010
- * @version 1.0
*/
-public class ParsingMessagesSection extends AbstractCdmDetailSection<NonViralName> implements ITaxonBaseDetailSection {
+public class ParsingMessagesSection
+ extends AbstractCdmDetailSection<INonViralName>
+ implements ITaxonBaseDetailSection {
/** Constant <code>HEADING_SUCCESS=""</code> */
public static final String HEADING_SUCCESS = "";
@Override
public void setTaxonBase(TaxonBase entity) {
this.taxonBase = entity;
- setEntity((NonViralName) HibernateProxyHelper.deproxy(entity.getName()));
+ setEntity(HibernateProxyHelper.deproxy(entity.getName()));
destroyParsingProblemComposites();
if(getEntity().hasProblem()){
displayParsingProblems();
return HEADING_SUCCESS;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.section.ITaxonDetailSection#getTaxon(eu.etaxonomy.cdm.model.taxon.TaxonBase)
- */
@Override
public TaxonBase getTaxonBase() {
return taxonBase;
}
- /* (non-Javadoc)
- * @see eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection#createCdmDetailElement(eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection, int)
- */
@Override
- protected AbstractCdmDetailElement<NonViralName> createCdmDetailElement(AbstractCdmDetailSection<NonViralName> parentElement, int style) {
+ protected AbstractCdmDetailElement<INonViralName> createCdmDetailElement(
+ AbstractCdmDetailSection<INonViralName> parentElement, int style) {
//no detail element
return null;
}
import eu.etaxonomy.cdm.model.description.PolytomousKey;
import eu.etaxonomy.cdm.model.molecular.Amplification;
import eu.etaxonomy.cdm.model.molecular.Primer;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.Collection;
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
} else if (rootElement.isInstanceOf(Person.class)) {
addPage(new PersonWizardPage(formFactory,
selectionElement.getConversationHolder(), HibernateProxyHelper.deproxy(rootElement, Person.class)));
- } else if (rootElement.isInstanceOf(NonViralName.class)) {
+ } else if (rootElement.isInstanceOf(TaxonName.class)) {
addPage(new NonViralNameWizardPage(formFactory,
selectionElement.getConversationHolder(),
- HibernateProxyHelper.deproxy(rootElement, NonViralName.class)));
+ HibernateProxyHelper.deproxy(rootElement, TaxonName.class)));
} else if (rootElement.isInstanceOf(SpecimenOrObservationBase.class)) {
DerivedUnitFacade facade;
import eu.etaxonomy.cdm.model.molecular.DnaSample;
import eu.etaxonomy.cdm.model.molecular.Sequence;
import eu.etaxonomy.cdm.model.molecular.SingleRead;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
import eu.etaxonomy.cdm.model.occurrence.FieldUnit;
import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
createTaxonSections(rootElement);
}
- } else if (input instanceof NonViralName) {
+ } else if (input instanceof TaxonName) {
createNameSections(rootElement);
} else if (input instanceof Reference) {
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
import eu.etaxonomy.cdm.model.common.DefaultTermInitializer;
-import eu.etaxonomy.cdm.model.name.NonViralName;
+import eu.etaxonomy.cdm.model.name.INonViralName;
import eu.etaxonomy.cdm.model.name.Rank;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
import eu.etaxonomy.cdm.model.name.TaxonNameFactory;
/**
* @author n.hoffmann
* @created 17.03.2009
- * @version 1.0
*/
//@Transactional(TransactionMode.DISABLED)
public class NameProtectTitleCacheTest /*extends CdmIntegrationTest */{
@SuppressWarnings("unused")
private ConversationHolder conversation;
- private NonViralName<?> name;
+ private INonViralName name;
/**
* @throws java.lang.Exception
import eu.etaxonomy.cdm.model.agent.Person;
import eu.etaxonomy.cdm.model.agent.Team;
import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.name.BotanicalName;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.IBotanicalName;
+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.Classification;
import eu.etaxonomy.cdm.model.taxon.Taxon;
String taxonTitle = taxon.getTitleCache();
logger.info("Taxon : " + taxonTitle);
- TaxonNameBase name = taxon.getName();
+ TaxonName name = taxon.getName();
Assert.assertNotNull(name);
String nameTitle = name.getTitleCache();
public void testCDMEntitySaveLazyNew() {
Team combAuthor = Team.NewInstance();
combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
- BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
+ IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
name.setCombinationAuthorship(combAuthor);
Taxon tax1 = Taxon.NewInstance(name, null);
UUID taxonUuid1 = taxonService.save(tax1).getUuid();
Taxon taxon = (Taxon)taxonService.find(taxonUuid1);
- NonViralName nvn = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+ INonViralName nvn = CdmBase.deproxy(taxon.getName());
String oldTitleCache = nvn.getTitleCache();
logger.info("Taxon Name Title : " + oldTitleCache);
nvn.setTitleCache(oldTitleCache + ":updated",false);
taxonService.update(taxon);
Taxon taxonNew = (Taxon)taxonService.find(taxonUuid1);
- NonViralName nvnNew = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+ INonViralName nvnNew = CdmBase.deproxy(taxon.getName());
logger.info("New Taxon Name Title : " + nvnNew.getTitleCache());
Assert.assertTrue("Title caches should not be equal",oldTitleCache.equals(nvnNew.getTitleCache()));
taxonService.update(taxon);
Taxon taxonOld = (Taxon)taxonService.find(taxonUuid1);
- NonViralName nvnOld = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+ INonViralName nvnOld = CdmBase.deproxy(taxon.getName());
logger.info("Old Taxon Name Title : " + nvnNew.getTitleCache());
- Assert.assertEquals("Title caches should be equal",oldTitleCache,nvnOld.getTitleCache());
+ Assert.assertEquals("Title caches should be equal",oldTitleCache, nvnOld.getTitleCache());
}
@Ignore
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Synonym;
import eu.etaxonomy.cdm.model.taxon.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
for(TaxonRelationship rel : taxonRelations) {
rel.getFromTaxon().getName().getStatus().size();
}
- Set<TaxonNameBase> typifiedNames = taxon.getName().getHomotypicalGroup().getTypifiedNames();
- for(TaxonNameBase name : typifiedNames) {
+ Set<TaxonName> typifiedNames = taxon.getName().getHomotypicalGroup().getTypifiedNames();
+ for(TaxonName name : typifiedNames) {
Set<TaxonBase> taxonBases = name.getTaxonBases();
for(TaxonBase tb : taxonBases) {
//TODO needs to be adapted after synonym relationship removal
import eu.etaxonomy.cdm.model.agent.Person;
import eu.etaxonomy.cdm.model.agent.Team;
import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.name.BotanicalName;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.IBotanicalName;
+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.Taxon;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
String taxonTitle = taxon.getTitleCache();
logger.info("Taxon : " + taxonTitle);
- TaxonNameBase name = taxon.getName();
+ TaxonName name = taxon.getName();
Assert.assertNotNull(name);
String nameTitle = name.getTitleCache();
Team combAuthor = Team.NewInstance();
combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
- BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
+ IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
name.setCombinationAuthorship(combAuthor);
Taxon taxon = Taxon.NewInstance(name, null);
UUID taxonUuid = taxonService.save(taxon).getUuid();
"name"
});
Taxon taxonNew = (Taxon)taxonService.findTaxonByUuid(taxonUuid,TAXON_INIT_STRATEGY);
- NonViralName nvn = CdmBase.deproxy(taxonNew.getName(),NonViralName.class);
+ TaxonName nvn = CdmBase.deproxy(taxonNew.getName());
Team team = CdmBase.deproxy(nvn.getCombinationAuthorship(),Team.class);
String oldTitleCache = nvn.getTitleCache();
System.out.println("Taxon Name Title : " + oldTitleCache);
public void testCDMEntitySaveLazy() {
Taxon taxon = (Taxon)taxonService.find(taxonUuid1);
- NonViralName nvn = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+ INonViralName nvn = CdmBase.deproxy(taxon.getName());
String oldTitleCache = nvn.getTitleCache();
System.out.println("Taxon Name Title : " + oldTitleCache);
nvn.setTitleCache(oldTitleCache + ":updated", true);
public void testCDMEntitySaveLazyNew() {
Team combAuthor = Team.NewInstance();
combAuthor.addTeamMember(Person.NewTitledInstance("test member"));
- BotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
+ IBotanicalName name = TaxonNameFactory.NewBotanicalInstance(null, "Test1", null, null, null, null, null, null, null);
name.setCombinationAuthorship(combAuthor);
Taxon tax1 = Taxon.NewInstance(name, null);
UUID taxonUuid1 = taxonService.save(tax1).getUuid();
Taxon taxon = (Taxon)taxonService.find(taxonUuid1);
- NonViralName nvn = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+ INonViralName nvn = CdmBase.deproxy(taxon.getName());
String oldTitleCache = nvn.getTitleCache();
logger.info("Taxon Name Title : " + oldTitleCache);
nvn.setTitleCache(oldTitleCache + ":updated",false);
taxonService.update(taxon);
Taxon taxonNew = (Taxon)taxonService.find(taxonUuid1);
- NonViralName nvnNew = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+ INonViralName nvnNew = CdmBase.deproxy(taxon.getName());
logger.info("New Taxon Name Title : " + nvnNew.getTitleCache());
Assert.assertTrue("Title caches should not be equal",oldTitleCache.equals(nvnNew.getTitleCache()));
taxonService.update(taxon);
Taxon taxonOld = (Taxon)taxonService.find(taxonUuid1);
- NonViralName nvnOld = CdmBase.deproxy(taxon.getName(),NonViralName.class);
+ INonViralName nvnOld = CdmBase.deproxy(taxon.getName());
logger.info("Old Taxon Name Title : " + nvnNew.getTitleCache());
Assert.assertEquals("Title caches should be equal",oldTitleCache,nvnOld.getTitleCache());
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.description.TaxonDescription;
import eu.etaxonomy.cdm.model.description.TextData;
-import eu.etaxonomy.cdm.model.name.BotanicalName;
import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
-import eu.etaxonomy.cdm.model.name.NonViralName;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+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.Taxon;
@DataSet
public class TaxonNameEditorTest extends BaseOperationTest {
- private static final Logger logger = Logger.getLogger(TaxonNameEditorTest.class);
+ @SuppressWarnings("unused")
+ private static final Logger logger = Logger.getLogger(TaxonNameEditorTest.class);
ITaxonNodeService taxonNodeService = getRemoteApplicationController().getTaxonNodeService();
ITaxonService taxonService = getRemoteApplicationController().getTaxonService();
TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
Taxon taxon = taxonNode.getTaxon();
HomotypicalGroup group = taxon.getHomotypicGroup();
- BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
+ TaxonName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
newSynonymName.setTitleCache("New Synonym", true);
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
undoContext, taxon, group, newSynonymName, postOperation);
TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
Taxon taxon = taxonNode.getTaxon();
HomotypicalGroup group = taxon.getHomotypicGroup();
- BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
+ TaxonName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
newSynonymName.setTitleCache("New Synonym", true);
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
undoContext, taxon, group, newSynonymName, postOperation);
TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
Taxon taxon = taxonNode.getTaxon();
HomotypicalGroup group = taxon.getHomotypicGroup();
- BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
+ TaxonName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
newSynonymName.setTitleCache("New Synonym", true);
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
undoContext, taxon, group, newSynonymName, postOperation);
TaxonNode taxonNode = taxonNodeService.load(taxonNodeUuid);
Taxon taxon = taxonNode.getTaxon();
HomotypicalGroup group = taxon.getHomotypicGroup();
- BotanicalName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
+ TaxonName newSynonymName = TaxonNameFactory.NewBotanicalInstance(null);
newSynonymName.setTitleCache("New Synonym", true);
operation = new CreateSynonymInExistingHomotypicalGroupOperation("Create Synonym In Existing Homotypical Group",
undoContext, taxon, group, newSynonymName, postOperation);
UUID taxonUuid = UUID.fromString("9763e5f0-6cd4-4d96-b8a4-4420854f7727");
Taxon taxon = (Taxon)taxonService.load(taxonUuid);
- TaxonNameBase taxonName = taxon.getName();
+ TaxonName taxonName = taxon.getName();
UUID synonymUuid = UUID.fromString("1eb173bd-b174-4162-8ff5-5136d8f1e746");
Synonym synonym = (Synonym)taxonService.load(synonymUuid);
- TaxonNameBase synonymName = synonym.getName();
+ TaxonName synonymName = synonym.getName();
taxonService.swapSynonymAndAcceptedTaxon(synonym.getUuid(), taxon.getUuid());
@Test
public void addTaxon() {
- NonViralName taxonName = TaxonNameFactory.NewNonViralInstance(null);
+ INonViralName taxonName = TaxonNameFactory.NewNonViralInstance(null);
Taxon taxon = Taxon.NewInstance(taxonName, null);
taxonService.merge(taxon);
}
import eu.etaxonomy.cdm.model.common.CdmBase;
import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.description.TaxonDescription;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode;
import eu.etaxonomy.cdm.model.taxon.Taxon;
UUID newAcceptedTaxonNodeUuid = UUID.fromString("6ad8e9e2-f5f6-41ad-aa30-f62a903650db");
TaxonNode oldTaxonNode = taxonNodeService.load(oldTaxonNodeNodeUuid);
- TaxonNameBase name = oldTaxonNode.getTaxon().getName();
+ TaxonName name = oldTaxonNode.getTaxon().getName();
TaxonNode newAcceptedTaxonNode = taxonNodeService.load(newAcceptedTaxonNodeUuid);
import eu.etaxonomy.cdm.io.specimen.excel.in.SpecimenCdmExcelImportConfigurator;
import eu.etaxonomy.cdm.io.tcsxml.in.TcsXmlImportConfigurator;
import eu.etaxonomy.cdm.model.name.NomenclaturalCode;
-import eu.etaxonomy.cdm.model.name.TaxonNameBase;
+import eu.etaxonomy.cdm.model.name.TaxonName;
import eu.etaxonomy.taxeditor.httpinvoker.BaseRemotingTest;
/**
config.setDbSchemaValidation(DbSchemaValidation.CREATE);
ImportResult result = ioService.importData(config, fileToByteArray(importFilePath), SOURCE_TYPE.URI);
Assert.assertTrue(result.isSuccess());
- List<TaxonNameBase> list = nameService.list(TaxonNameBase.class, null, null, null, null);
+ List<TaxonName> list = nameService.list(TaxonName.class, null, null, null, null);
Assert.assertEquals(9,list.size());
}
Assert.assertTrue(result.isSuccess());
Assert.assertTrue(!result.getReports().isEmpty());
saveToFile("target/importAbcdReport.txt", result.getReports().get(0));
- List<TaxonNameBase> list = nameService.list(TaxonNameBase.class, null, null, null, null);
+ List<TaxonName> list = nameService.list(TaxonName.class, null, null, null, null);
Assert.assertEquals(2,list.size());
}
config.setDbSchemaValidation(DbSchemaValidation.CREATE);
ImportResult result = ioService.importData(config, fileToByteArray(importFilePath), SOURCE_TYPE.URI);
Assert.assertTrue(result.isSuccess());
- List<TaxonNameBase> list = nameService.list(TaxonNameBase.class, null, null, null, null);
+ List<TaxonName> list = nameService.list(TaxonName.class, null, null, null, null);
Assert.assertEquals(9,list.size());
}
config.setDbSchemaValidation(DbSchemaValidation.CREATE);
ImportResult result = ioService.importData(config, fileToByteArray(importFilePath), SOURCE_TYPE.URI);
Assert.assertTrue(result.isSuccess());
- List<TaxonNameBase> list = nameService.list(TaxonNameBase.class, null, null, null, null);
+ List<TaxonName> list = nameService.list(TaxonName.class, null, null, null, null);
Assert.assertEquals(16,list.size());
}
BGBM BDI Projects / taxeditor.git / commitdiff