Project

General

Profile

« Previous | Next » 

Revision 2350872a

Added by Patrick Plitzner over 5 years ago

ref #6805 Only drop features from term editor to feature tree editor

View differences:

eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/e4/FeatureTreeDropAdapter.java
24 24

  
25 25
import eu.etaxonomy.cdm.api.service.IFeatureNodeService;
26 26
import eu.etaxonomy.cdm.api.service.ITermService;
27
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
27 28
import eu.etaxonomy.cdm.model.common.OrderedTermVocabulary;
28 29
import eu.etaxonomy.cdm.model.common.TermVocabulary;
29 30
import eu.etaxonomy.cdm.model.description.Feature;
......
128 129
		        AbstractUtility.executeOperation(operation, sync);
129 130
		    }
130 131
		    else if(droppedObject instanceof TermDto){
131
		        TermDto termDto = (TermDto) droppedObject;
132
                AddFeatureOperation operation = new AddFeatureOperation(
133
                        (Feature) CdmStore.getService(ITermService.class).load(termDto.getUuid()),
134
                        target, editor, editor);
135
                AbstractUtility.executeOperation(operation, sync);
132
		            TermDto termDto = (TermDto) droppedObject;
133
		            DefinedTermBase term = CdmStore.getService(ITermService.class).load(termDto.getUuid());
134
		            if(term.isInstanceOf(Feature.class)){
135
		                AddFeatureOperation operation = new AddFeatureOperation(
136
		                        (Feature)term,
137
		                        target, editor, editor);
138
		                AbstractUtility.executeOperation(operation, sync);
139
		            }
140
		            else{
141
		                MessagingUtils.warningDialog("Move failed", this, "Can only move Features");
142
		            }
136 143
		    }
137 144
		    else if(droppedObject instanceof OntologyTermWrapper){
138 145
		        OntologyTermWrapper wrapper = (OntologyTermWrapper)droppedObject;
......
164 171

  
165 172
    @Override
166 173
    public boolean validateDrop(Object target, int operation, TransferData transferData) {
167
        boolean isSupported = FeatureNodeTransfer.getInstance().isSupportedType(transferData);
174
        boolean
175
        isSupported = FeatureNodeTransfer.getInstance().isSupportedType(transferData);
168 176
        isSupported |= TermTransfer.getInstance().isSupportedType(transferData);
169 177
        isSupported |= LocalSelectionTransfer.getTransfer().isSupportedType(transferData);
170
        isSupported |= TermTransfer.getInstance().isSupportedType(transferData);
171 178
        isSupported &= getViewer().getInput()!=null;
172 179
        return isSupported;
173 180
    }

Also available in: Unified diff