/**
* @author cmathew
* @date 29 Jun 2015
- *
*/
public class EditPolytomousKeyNodesHandlerE4 {
public class TaxonNodeNavigatorComparator extends ViewerComparator{
- Comparator<TaxonNodeDto> comparator;
+ private Comparator<TaxonNodeDto> comparator;
public TaxonNodeNavigatorComparator(Comparator<TaxonNodeDto> comparator){
- super();
this.comparator = comparator;
}
-
-
@Override
public int compare(Viewer viewer, Object e1, Object e2){
if ((e1 instanceof Classification && e2 instanceof Classification) ){
}else{
return comparator.compare((TaxonNodeDto)e1, (TaxonNodeDto)e2);
}
-
}
}
-}
+}
\ No newline at end of file
import org.eclipse.e4.ui.workbench.modeling.EModelService;
import org.eclipse.e4.ui.workbench.modeling.EPartService;
import org.eclipse.e4.ui.workbench.modeling.ESelectionService;
-import org.eclipse.jface.util.IPropertyChangeListener;
import org.eclipse.jface.util.LocalSelectionTransfer;
-import org.eclipse.jface.util.PropertyChangeEvent;
import org.eclipse.jface.viewers.IElementComparer;
import org.eclipse.jface.viewers.ISelection;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import eu.etaxonomy.cdm.model.taxon.Classification;
import eu.etaxonomy.cdm.model.taxon.TaxonNode;
import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
-import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByNameComparator;
-import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByRankAndNameComparator;
-import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoNaturalComparator;
import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
import eu.etaxonomy.taxeditor.editor.ITaxonEditor;
import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4;
import eu.etaxonomy.taxeditor.navigation.navigator.Root;
import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNodeNavigatorComparator;
import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
-import eu.etaxonomy.taxeditor.preference.NavigatorOrderEnum;
import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
import eu.etaxonomy.taxeditor.store.CdmStore;
import eu.etaxonomy.taxeditor.store.LoginManager;
protected IAdaptable getInitialInput() {
Comparator<TaxonNodeDto> comparator = PreferencesUtil.getNodeComparator();
-
+
TaxonNodeNavigatorComparator viewerComparator = new TaxonNodeNavigatorComparator(comparator);
viewer.setComparator(viewerComparator);
viewer.setComparer(new IElementComparer() {
- @Override
- public int hashCode(Object element) {
- if (element instanceof TaxonNodeDto){
- TaxonNodeDto nodeDto = (TaxonNodeDto)element;
-
- String s = nodeDto.getUuid().toString();
- if (s != null) {
- return s.hashCode();
+ @Override
+ public int hashCode(Object element) {
+ if (element instanceof TaxonNodeDto){
+ TaxonNodeDto nodeDto = (TaxonNodeDto)element;
+
+ String s = nodeDto.getUuid().toString();
+ if (s != null) {
+ return s.hashCode();
+ }
+ return element.hashCode();
+ }else{
+ return element.toString().hashCode();
}
- return element.hashCode();
- }else{
- return element.toString().hashCode();
- }
- }
-
- @Override
- public boolean equals(Object element1, Object element2) {
- if (element1 instanceof TaxonNodeDto && element2 instanceof TaxonNodeDto){
- TaxonNodeDto node1 = (TaxonNodeDto)element1;
- TaxonNodeDto node2 = (TaxonNodeDto)element2;
- return (node1.getUuid().equals(node2.getUuid()));
- }else {
- return element1.equals(element2);
+ }
+
+ @Override
+ public boolean equals(Object element1, Object element2) {
+ if (element1 instanceof TaxonNodeDto && element2 instanceof TaxonNodeDto){
+ TaxonNodeDto node1 = (TaxonNodeDto)element1;
+ TaxonNodeDto node2 = (TaxonNodeDto)element2;
+ return (node1.getUuid().equals(node2.getUuid()));
+ }else {
+ return element1.equals(element2);
+ }
}
- }
- }
+ }
);
if (CdmStore.isActive()) {
viewer.setExpandedElements(expandedElements);
}
}
-
-
}
\ No newline at end of file
-// $Id$
/**
* Copyright (C) 2017 EDIT
* European Distributed Institute of Taxonomy
/**
* @author pplitzner
* @date 05.09.2017
- *
*/
-public class TaxonNavigatorLabelProviderE4 extends TaxonTreeNodeLabelProvider
-implements IDescriptionProvider {
+public class TaxonNavigatorLabelProviderE4
+ extends TaxonTreeNodeLabelProvider
+ implements IDescriptionProvider {
- /**
- * {@inheritDoc}
- */
@Override
public String getText(Object element) {
-
return super.getText(element);
}
+
// @Override
// public Font getFont(Object element) {
-//
// return new Font(null, "Arial Unicode MS", 10, SWT.NORMAL);
-//
// }
- /**
- * {@inheritDoc}
- */
@Override
public String getDescription(Object anElement) {
//classification
if (anElement instanceof Classification) {
- return "Taxonomic Tree: " + ((Classification) anElement).getTitleCache(); //$NON-NLS-1$
+ return "Classification: " + ((Classification) anElement).getTitleCache(); //$NON-NLS-1$
}
//FIXME E4 show synonym in navigator?
//synonym
return null;
}
- /**
- * {@inheritDoc}
- */
@Override
public StyledString getStyledText(Object element) {
return super.getStyledText(element);
}
return notGrantedStyler;
}
-
-
-}
+}
\ No newline at end of file
* Composite "around" the actual content. Is used for control action like e.g. remove button
*/
private final Composite box;
-
- private boolean isEnabled;
-
+ private boolean isEnabled;
private Button btnRemove;
- protected Button btnChooseEntity;
+
+ private Button btnChooseEntity;
private Color backgroundColor;
btnRemove.setEnabled(isEnabled);
}
-
+
setEntity(entity);
createControls(this, style);
warnForReferencedObjects.setVisible(isVisible);
}
}
-
+
@Override
public void setEnabled(boolean enabled) {
this.isEnabled = enabled;
if (btnChooseEntity != null){
btnChooseEntity.setEnabled(enabled);
}
-
+
for (ICdmFormElement element:this.getElements()){
if (element instanceof IEnableableFormElement){
((IEnableableFormElement)element).setEnabled(enabled);
import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
/**
- * <p>
- * DescriptionSourceElement class.
- * </p>
- *
* @author n.hoffmann
* @created Mar 18, 2010
- * @version 1.0
*/
public class DescriptionSourceElement extends
AbstractEntityCollectionElement<Reference> {
private EntitySelectionElement<Reference> selection_descriptionSource;
- /**
- * <p>
- * Constructor for DescriptionSourceElement.
- * </p>
- *
- * @param cdmFormFactory
- * a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
- * object.
- * @param formElement
- * a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection}
- * object.
- * @param element
- * a {@link eu.etaxonomy.cdm.model.reference.ReferenceBase}
- * object.
- * @param removeListener
- * a {@link org.eclipse.swt.events.SelectionListener} object.
- * @param style
- * a int.
- */
public DescriptionSourceElement(CdmFormFactory cdmFormFactory,
AbstractFormSection formElement, Reference element,
SelectionListener removeListener, int style) {
super(cdmFormFactory, formElement, element, removeListener, null, style);
}
- /** {@inheritDoc} */
@Override
public void createControls(ICdmFormElement element, int style) {
selection_descriptionSource = formFactory
}
}
- /** {@inheritDoc} */
@Override
public void setEntity(Reference element) {
this.entity = element;
}
}
- /** {@inheritDoc} */
@Override
public void handleEvent(Object eventSource) {
return children != null ? children : NO_CHILDREN;
}
-
-
@Override
public Object getParent(Object element) {
if (taxonNodeService == null){
-// $Id$
/**
* Copyright (C) 2017 EDIT
* European Distributed Institute of Taxonomy
/**
* @author pplitzner
* @date 05.09.2017
- *
*/
-public class TaxonTreeNodeLabelProvider extends ColumnLabelProvider
-implements IStyledLabelProvider {
+public class TaxonTreeNodeLabelProvider
+ extends ColumnLabelProvider
+ implements IStyledLabelProvider {
protected Styler notGrantedStyler = null;
- /**
- * {@inheritDoc}
- */
@Override
public String getText(Object element) {
//classification
if (taxonNode.isDoubtful()) {
text +=Character.toString((char)63) + " ";
}
+ //TODO if symbols contain non-ASCII this may create problems
+ // if so we may use ASCII like text +=Character.toString((char)248) + " ";
+
text += taxonNode.getTitleCache();
return text;
}
return new String();
}
- /**
- * {@inheritDoc}
- */
@Override
public StyledString getStyledText(Object element) {
//classification
}
return notGrantedStyler;
}
-}
+}
\ No newline at end of file
import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
import eu.etaxonomy.taxeditor.httpinvoker.RemotingSessionAwareTest;
-import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
-import eu.etaxonomy.taxeditor.operation.CdmUpdateOperation;
import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
import eu.etaxonomy.taxeditor.test.MockConversationEnabled;
public static final IAdaptable info = null;
public static final IPostOperationEnabled postOperation = null;
public static final IConversationEnabled conversationEnabled = new MockConversationEnabled();
- public static final ICdmEntitySessionEnabled cdmEntitySessionEnabled = null;
+ public static final ICdmEntitySessionEnabled<?> cdmEntitySessionEnabled = null;
protected static AbstractOperation operation;
import java.util.Set;
import java.util.UUID;
-import org.apache.logging.log4j.LogManager;import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
import org.eclipse.core.commands.ExecutionException;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
import org.unitils.dbunit.annotation.DataSet;
-import eu.etaxonomy.cdm.api.service.IClassificationService;
import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
import eu.etaxonomy.cdm.api.service.ITaxonService;
import eu.etaxonomy.cdm.api.service.UpdateResult;
import eu.etaxonomy.cdm.model.common.Annotation;
-import eu.etaxonomy.cdm.model.common.Language;
import eu.etaxonomy.cdm.model.description.DescriptionElementSource;
import eu.etaxonomy.cdm.model.description.Feature;
import eu.etaxonomy.cdm.model.description.TaxonDescription;
@SuppressWarnings("unused")
private static final Logger logger = LogManager.getLogger(TaxonNameEditorTest.class);
- ITaxonNodeService taxonNodeService = getRemoteApplicationController().getTaxonNodeService();
- ITaxonService taxonService = getRemoteApplicationController().getTaxonService();
- IClassificationService classificationService = getRemoteApplicationController().getClassificationService();
-
- Language english = Language.getLanguageFromUuid(Language.uuidEnglish);
+ private ITaxonNodeService taxonNodeService = getRemoteApplicationController().getTaxonNodeService();
+ private ITaxonService taxonService = getRemoteApplicationController().getTaxonService();
@Test
public void testAddHomotypicSynonym() throws ExecutionException {
BGBM BDI Projects / taxeditor.git / commitdiff