Project

General

Profile

« Previous | Next » 

Revision 381bdda4

Added by Patrick Plitzner almost 5 years ago

ref #6913 Remove IEditorInput dependency from bulk editor input

View differences:

eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
103 103
    protected ISourceViewer createSourceViewer(Composite parent,
104 104
			IVerticalRuler ruler, int styles) {
105 105
		ISourceViewer viewer = super.createSourceViewer(parent, ruler, styles);
106
		if (getEditorInput().isMergingEnabled()) {
107
			addToggleMergeCandidateListener(ruler.getControl());
108
		}
106
//		if (getEditorInput().isMergingEnabled()) {
107
//			addToggleMergeCandidateListener(ruler.getControl());
108
//		}
109 109
		return viewer;
110 110
	}
111 111

  
......
308 308
			//conversation.clear();
309 309
			//conversation.commit(true);
310 310

  
311
			getEditorInput().dispose();
312
			getEditorInput().bind();
313
			getEditorInput().performSearch(query);
311
//			getEditorInput().dispose();
312
//			getEditorInput().bind();
313
//			getEditorInput().performSearch(query);
314 314

  
315 315
			refresh();
316 316

  
......
333 333
		setInput(getEditorInput());
334 334
	}
335 335

  
336
	/** {@inheritDoc} */
337
	@Override
338
	public AbstractBulkEditorInput getEditorInput() {
339
		return (AbstractBulkEditorInput) super.getEditorInput();
340
	}
336
//	/** {@inheritDoc} */
337
//	@Override
338
//	public AbstractBulkEditorInput getEditorInput() {
339
//		return (AbstractBulkEditorInput) super.getEditorInput();
340
//	}
341 341

  
342 342
	@Override
343 343
    protected void editorContextMenuAboutToShow(IMenuManager menu) {
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorLineDisplay.java
9 9

  
10 10
package eu.etaxonomy.taxeditor.bulkeditor;
11 11

  
12
import java.util.ArrayList;
13
import java.util.List;
14

  
15
import org.apache.commons.lang.StringUtils;
16 12
import org.eclipse.jface.action.IStatusLineManager;
17 13
import org.eclipse.swt.graphics.Font;
18 14
import org.eclipse.swt.graphics.Image;
19 15
import org.eclipse.swt.widgets.Display;
20 16

  
21
import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
22 17
import eu.etaxonomy.cdm.model.agent.AgentBase;
23 18
import eu.etaxonomy.cdm.model.common.CdmBase;
24
import eu.etaxonomy.cdm.model.common.IAnnotatableEntity;
25
import eu.etaxonomy.cdm.model.common.Marker;
26 19
import eu.etaxonomy.cdm.model.name.TaxonName;
27 20
import eu.etaxonomy.cdm.model.reference.Reference;
28 21
import eu.etaxonomy.taxeditor.annotatedlineeditor.EntityListener;
29 22
import eu.etaxonomy.taxeditor.annotatedlineeditor.ILineDisplayStrategy;
30
import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
31 23

  
32 24
/**
33 25
 * <p>BulkEditorLineDisplay class.</p>
......
63 55
	/** {@inheritDoc} */
64 56
	@Override
65 57
    public String getText(Object entity) {
66
		return editor.getEditorInput().getText((CdmBase) entity);
58
		return "";//editor.getEditorInput().getText((CdmBase) entity);
67 59
	}
68 60

  
69 61
	/** {@inheritDoc} */
......
72 64

  
73 65
		String supplementalText = "";
74 66

  
75
		AbstractBulkEditorInput input = editor.getEditorInput();
76
		String typeText = input.getTypeText(entity);
77

  
78
		supplementalText += StringUtils.isBlank(typeText) ? "" : String.format(" [%s]", typeText);
79

  
80
		if (entity instanceof IAnnotatableEntity) {
81
			IAnnotatableEntity annotatableEntity = (IAnnotatableEntity) HibernateProxyHelper.deproxy(entity);
82

  
83
			String markerText = "";
84
			List<String> markers = new ArrayList<String>();
85
			for (Marker marker : annotatableEntity.getMarkers()) {
86
				String markerLabel = marker.getMarkerType() == null? " unknown marker " : marker.getMarkerType().getLabel();
87
				markers.add(String.format("%1s = %2s", markerLabel, marker.getFlag() ? "yes" : "no"));
88
			}
89
			if (! markers.isEmpty()) {
90
				markerText = StringUtils.join(markers, ", ");
91
			}
92

  
93
			supplementalText += StringUtils.isBlank(markerText) ? "" : String.format(" [%s]", markerText);
94
		}
67
//		AbstractBulkEditorInput input = editor.getEditorInput();
68
//		String typeText = input.getTypeText(entity);
69
//
70
//		supplementalText += StringUtils.isBlank(typeText) ? "" : String.format(" [%s]", typeText);
71
//
72
//		if (entity instanceof IAnnotatableEntity) {
73
//			IAnnotatableEntity annotatableEntity = (IAnnotatableEntity) HibernateProxyHelper.deproxy(entity);
74
//
75
//			String markerText = "";
76
//			List<String> markers = new ArrayList<String>();
77
//			for (Marker marker : annotatableEntity.getMarkers()) {
78
//				String markerLabel = marker.getMarkerType() == null? " unknown marker " : marker.getMarkerType().getLabel();
79
//				markers.add(String.format("%1s = %2s", markerLabel, marker.getFlag() ? "yes" : "no"));
80
//			}
81
//			if (! markers.isEmpty()) {
82
//				markerText = StringUtils.join(markers, ", ");
83
//			}
84
//
85
//			supplementalText += StringUtils.isBlank(markerText) ? "" : String.format(" [%s]", markerText);
86
//		}
95 87

  
96 88
		return supplementalText;
97 89
	}
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorSearch.java
87 87
	}
88 88

  
89 89
	private void createSortCombo(Composite parent, int style) {
90
		sortCombo = new BulkEditorSortCombo(parent, editor.getEditorInput().getSortProviders());
90
//		sortCombo = new BulkEditorSortCombo(parent, editor.getEditorInput().getSortProviders());
91 91

  
92 92
	}
93 93

  
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/command/DynamicNewObjectMenuE4.java
24 24
import org.eclipse.e4.ui.model.application.ui.menu.MMenuElement;
25 25
import org.eclipse.e4.ui.model.application.ui.menu.MMenuFactory;
26 26
import org.eclipse.e4.ui.services.IServiceConstants;
27
import org.eclipse.ui.IEditorInput;
28 27

  
29 28
import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
30 29
import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants;
......
81 80
	 */
82 81
	private Map<? extends Object, String> getClassLabelPairs() {
83 82
		if (editor != null){
84
			IEditorInput input = editor.getEditorInput();
85

  
86
			if(input instanceof AbstractBulkEditorInput){
87
				IEntityCreator<?> entityCreator = ((AbstractBulkEditorInput) input).getEntityCreator();
88
				if(entityCreator!=null){
89
				    return entityCreator.getKeyLabelPairs();
90
				}
91
			}
83
		    AbstractBulkEditorInput input = editor.getEditorInput();
84

  
85
		    IEntityCreator<?> entityCreator = input.getEntityCreator();
86
		    if(entityCreator!=null){
87
		        return entityCreator.getKeyLabelPairs();
88
		    }
92 89
		}
93 90

  
94 91
		return Collections.EMPTY_MAP;
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/OpenBulkEditorHandler.java
1 1
/**
2 2
* Copyright (C) 2007 EDIT
3
* European Distributed Institute of Taxonomy 
3
* European Distributed Institute of Taxonomy
4 4
* http://www.e-taxonomy.eu
5
* 
5
*
6 6
* The contents of this file are subject to the Mozilla Public License Version 1.1
7 7
* See LICENSE.TXT at the top of this package for the full license terms.
8 8
*/
......
11 11
import org.eclipse.core.commands.AbstractHandler;
12 12
import org.eclipse.core.commands.ExecutionEvent;
13 13
import org.eclipse.core.commands.ExecutionException;
14
import org.eclipse.ui.PartInitException;
15
import org.eclipse.ui.handlers.HandlerUtil;
16 14

  
17
import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor;
18 15
import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorConstants;
19
import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
20 16
import eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInputType;
21
import eu.etaxonomy.taxeditor.store.CdmStore;
22 17

  
23 18
/**
24 19
 * <p>OpenBulkEditorHandler class.</p>
......
28 23
 * @version 1.0
29 24
 */
30 25
public class OpenBulkEditorHandler extends AbstractHandler {
31
	private static final Logger logger = Logger.getLogger(OpenBulkEditorHandler.class);	
32
	
26
	private static final Logger logger = Logger.getLogger(OpenBulkEditorHandler.class);
27

  
33 28
	/* (non-Javadoc)
34 29
	 * @see org.eclipse.core.commands.AbstractHandler#execute(org.eclipse.core.commands.ExecutionEvent)
35 30
	 */
36 31
	/** {@inheritDoc} */
37
	public Object execute(ExecutionEvent event) throws ExecutionException {
32
	@Override
33
    public Object execute(ExecutionEvent event) throws ExecutionException {
38 34
		String inputTypeId = event.getParameter(IBulkEditorConstants.INPUT_TYPE_PARAMETER_ID);
39 35
		BulkEditorInputType inputType = BulkEditorInputType.getById(inputTypeId);
40
		try {
41
			HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().
42
					openEditor(AbstractBulkEditorInput.NewInstance(inputType), BulkEditor.ID);
43
		} catch (PartInitException e) {
44
			new RuntimeException(e);
45
			logger.error("Error opening bulk editor", e);
46
		}
36
//		try {
37
//			HandlerUtil.getActiveWorkbenchWindow(event).getActivePage().
38
//					openEditor(AbstractBulkEditorInput.NewInstance(inputType), BulkEditor.ID);
39
//		} catch (PartInitException e) {
40
//			new RuntimeException(e);
41
//			logger.error("Error opening bulk editor", e);
42
//		}
47 43
		return null;
48 44
	}
49 45
}
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
17 17
import java.util.Map.Entry;
18 18
import java.util.UUID;
19 19

  
20
import org.eclipse.jface.resource.ImageDescriptor;
21
import org.eclipse.ui.IEditorInput;
22
import org.eclipse.ui.IPersistableElement;
23

  
24 20
import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
25 21
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
26 22
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
......
48 44
 * @version 1.0
49 45
 * @param <T>
50 46
 */
51
public abstract class AbstractBulkEditorInput<T extends CdmBase> extends CdmEntitySessionInput implements IEditorInput ,
47
public abstract class AbstractBulkEditorInput<T extends CdmBase> extends CdmEntitySessionInput implements
52 48
    IEntityPersistenceService<T> {
53 49

  
54 50
	private UUID entityUuid;
......
84 80
		return editorInput;
85 81
	}
86 82

  
83
    public abstract String getName();
84

  
87 85
	protected abstract List<T> listEntities(IIdentifiableEntityServiceConfigurator configurator);
88 86

  
89 87
	protected abstract T loadEntity(UUID entityUuid);
......
124 122
		return entityUuid;
125 123
	}
126 124

  
127
	@Override
128
    public boolean exists() {
129
		// TODO Auto-generated method stub
130
		return false;
131
	}
132

  
133
	@Override
134
    public ImageDescriptor getImageDescriptor() {
135
		// TODO Auto-generated method stub
136
		return null;
137
	}
138

  
139
	@Override
140
    public IPersistableElement getPersistable() {
141
		return null;
142
	}
143

  
144
	/** {@inheritDoc} */
145
	@Override
146
    @SuppressWarnings("unchecked")
147
	public Object getAdapter(Class adapter) {
148
		return null;
149
	}
150

  
151 125
	public void performSearch(final BulkEditorQuery bulkEditorQuery) {
152 126

  
153 127
		List<T> entityList = new ArrayList<T>();
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
51 51
		return ID;
52 52
	}
53 53

  
54
	@Override
54
    @Override
55 55
    public String getName() {
56 56
		return BulkEditorInputType.AGENT.label;
57 57
	}
58 58

  
59 59

  
60
	@Override
61
    public String getToolTipText() {
62
		return getName();
63
	}
64

  
65 60
	public static AbstractBulkEditorInput getInstance() {
66 61
		if (instance == null) {
67 62
			instance = new AgentEditorInput();
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/GroupEditorInput.java
45 45
		return instance;
46 46
	}
47 47

  
48
	/* (non-Javadoc)
49
	 * @see org.eclipse.ui.IEditorInput#getName()
50
	 */
51
	@Override
48
    @Override
52 49
	public String getName() {
53 50
		return BulkEditorInputType.GROUP.label;
54 51
	}
55 52

  
56
	/* (non-Javadoc)
57
	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
58
	 */
59
	@Override
60
	public String getToolTipText() {
61
		return getName();
62
	}
63

  
64 53
	/* (non-Javadoc)
65 54
	 * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService#save(java.lang.Object)
66 55
	 */
67 56
	@Override
68 57
	public Group save(Group entity) {
69 58
	    return CdmStore.getService(IGroupService.class).merge(entity, true).getMergedEntity();
70
	    
59

  
71 60
	}
72 61

  
73 62
	/* (non-Javadoc)
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/MediaEditorInput.java
18 18
import eu.etaxonomy.cdm.api.service.config.MediaDeletionConfigurator;
19 19
import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException;
20 20
import eu.etaxonomy.cdm.model.media.Media;
21
import eu.etaxonomy.cdm.persistence.dao.hibernate.media.MediaDaoHibernateImpl;
22 21
import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
23 22
import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider;
24 23
import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.MediaCreator;
......
51 50
        return BulkEditorInputType.MEDIA.label;
52 51
    }
53 52

  
54
    @Override
55
    public String getToolTipText() {
56
        return getName();
57
    }
58

  
59 53
    @Override
60 54
    public Media save(Media entity) {
61 55
       return CdmStore.getService(IMediaService.class).merge(entity, true).getMergedEntity();
62
       
56

  
63 57
    }
64 58

  
65 59
    @Override
......
68 62
    	if (config instanceof MediaDeletionConfigurator){
69 63
    		mediaConfig = (MediaDeletionConfigurator) config;
70 64
    	} else{
71
    		
65

  
72 66
    	}
73 67
        return CdmStore.getService(IMediaService.class).delete(entity.getUuid(), mediaConfig) != null;
74 68
    }
......
97 91

  
98 92
        return sortProviders;
99 93
    }
100
    
94

  
101 95
	@Override
102 96
	protected Media loadEntity(UUID entityUuid) {
103 97
		List<String> propertyPaths = Arrays.asList(new String[]{});
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameEditorInput.java
50 50
		return instance;
51 51
	}
52 52

  
53
	/**
54
	 * <p>getName</p>
55
	 *
56
	 * @return a {@link java.lang.String} object.
57
	 */
58
	@Override
53
    @Override
59 54
    public String getName() {
60 55
		return BulkEditorInputType.NAME.label;
61 56
	}
62 57

  
63
	/**
64
	 * <p>getToolTipText</p>
65
	 *
66
	 * @return a {@link java.lang.String} object.
67
	 */
68
	@Override
69
    public String getToolTipText() {
70
		return getName();
71
	}
72

  
73 58
	/**
74 59
	 * <p>getID</p>
75 60
	 *
......
91 76
	/** {@inheritDoc} */
92 77
	@Override
93 78
	public List listEntities(IIdentifiableEntityServiceConfigurator configurator) {
94
		
79

  
95 80
		configurator.setPropertyPaths(getPropertyPaths());
96 81
		return CdmStore.getSearchManager().findNames(configurator, this.getConversation());
97 82
	}
......
109 94
		if (config instanceof NameDeletionConfigurator){
110 95
			nameConfig = (NameDeletionConfigurator) config;
111 96
		} else{
112
			
97

  
113 98
		}
114 99
		return CdmStore.getService(INameService.class).delete(entity.getUuid(), nameConfig) != null;
115 100
	}
116
	
101

  
117 102
	/** {@inheritDoc} */
118 103
	@Override
119 104
    public TaxonName save(TaxonName entity) {
120 105
		TaxonName mergedName = null;
121 106
		mergedName =  CdmStore.getService(INameService.class).merge(entity, true).getMergedEntity();
122 107
	   	return mergedName;
123
		
108

  
124 109
	}
125 110

  
126 111
	@Override
......
173 158
         "name.relationsToThisName",
174 159
         "name.homotypicalGroup.typifiedNames.taxonBases.synonymRelations.synonym.name.status",
175 160
         "name.homotypicalGroup.typifiedNames.relationsToThisName.fromName"});
176
    	 
161

  
177 162
    	 return nameBasePropertyPaths;
178 163
    }
179 164

  
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java
51 51
		return instance;
52 52
	}
53 53

  
54
	/* (non-Javadoc)
55
	 * @see org.eclipse.ui.IEditorInput#getName()
56
	 */
57
	/** {@inheritDoc} */
58
	@Override
54
    @Override
59 55
	public String getName() {
60 56
		return BulkEditorInputType.NAME_RELATIONSHIP.label;
61 57
	}
62 58

  
63
	/* (non-Javadoc)
64
	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
65
	 */
66
	/** {@inheritDoc} */
67
	@Override
68
	public String getToolTipText() {
69
		return getName();
70
	}
71

  
72 59
	/* (non-Javadoc)
73 60
	 * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService#save(java.lang.Object)
74 61
	 */
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/OccurrenceEditorInput.java
71 71
		return CdmStore.getService(IOccurrenceService.class).load(entityUuid, propertyPaths);
72 72
	}*/
73 73

  
74
	/**
75
	 * <p>getName</p>
76
	 *
77
	 * @return a {@link java.lang.String} object.
78
	 */
79
	@Override
74
    @Override
80 75
    public String getName() {
81 76
		return BulkEditorInputType.OCCURRENCE.label;
82 77
	}
83 78

  
84
	/**
85
	 * <p>getToolTipText</p>
86
	 *
87
	 * @return a {@link java.lang.String} object.
88
	 */
89
	@Override
90
    public String getToolTipText() {
91
		return getName();
92
	}
93

  
94 79
	@Override
95 80
	public String getTypeText(Object entity) {
96 81
        if(HibernateProxyHelper.isInstanceOf(entity, SpecimenOrObservationBase.class)){
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
53 53
		return ID;
54 54
	}
55 55

  
56
	/* (non-Javadoc)
57
	 * @see org.eclipse.ui.IEditorInput#getName()
58
	 */
59
	/**
60
	 * <p>getName</p>
61
	 *
62
	 * @return a {@link java.lang.String} object.
63
	 */
64
	@Override
56
    @Override
65 57
    public String getName() {
66 58
		return BulkEditorInputType.REFERENCE.label;
67 59
	}
68 60

  
69
	/* (non-Javadoc)
70
	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
71
	 */
72
	/**
73
	 * <p>getToolTipText</p>
74
	 *
75
	 * @return a {@link java.lang.String} object.
76
	 */
77
	@Override
78
    public String getToolTipText() {
79
		return getName();
80
	}
81

  
82 61
	/**
83 62
	 * <p>Getter for the field <code>instance</code>.</p>
84 63
	 *
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/TaxonEditorInput.java
7 7

  
8 8
import eu.etaxonomy.cdm.api.service.ITaxonService;
9 9
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
10
import eu.etaxonomy.cdm.api.service.config.FindTaxaAndNamesConfiguratorImpl;
11
import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator;
12 10
import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator;
13 11
import eu.etaxonomy.cdm.api.service.config.SynonymDeletionConfigurator;
14 12
import eu.etaxonomy.cdm.api.service.config.TaxonDeletionConfigurator;
......
17 15
import eu.etaxonomy.cdm.model.taxon.Synonym;
18 16
import eu.etaxonomy.cdm.model.taxon.Taxon;
19 17
import eu.etaxonomy.cdm.model.taxon.TaxonBase;
20
import eu.etaxonomy.cdm.persistence.query.MatchMode;
21 18
import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
22 19
import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.TaxonCreator;
23 20
import eu.etaxonomy.taxeditor.store.CdmStore;
......
43 40
		return instance;
44 41
	}
45 42

  
46

  
47
	@Override
43
    @Override
48 44
	public String getName() {
49 45
		return BulkEditorInputType.TAXON.label;
50 46
	}
51 47

  
52
	@Override
53
	public String getToolTipText() {
54
		return getName();
55
	}
56

  
57

  
58 48
	/**
59 49
	 * <p>getID</p>
60 50
	 *
......
85 75
//		IFindTaxaAndNamesConfigurator<TaxonBase> newConfig = new FindTaxaAndNamesConfiguratorImpl<TaxonBase>();
86 76
//		newConfig.setTitleSearchString(configurator.getTitleSearchStringSqlized());
87 77
//		newConfig.setMatchMode(MatchMode.ANYWHERE);
88
		
78

  
89 79
		List<TaxonBase> taxa =  CdmStore.getSearchManager().findTaxa(configurator);
90 80
		List<TaxonBase> taxaCopy = new ArrayList<TaxonBase>();
91 81
		for (TaxonBase taxon:taxa){
......
117 107
			if (config instanceof TaxonDeletionConfigurator){
118 108
				taxonConfig = (TaxonDeletionConfigurator)config;
119 109
			}else{
120
				
110

  
121 111
			}
122
			
112

  
123 113
			return CdmStore.getService(ITaxonService.class).deleteTaxon(entity.getUuid(), taxonConfig, null) != null;
124 114
		} else{
125 115
			SynonymDeletionConfigurator synConfig = null;
126 116
			if (config instanceof SynonymDeletionConfigurator){
127 117
				synConfig = (SynonymDeletionConfigurator)config;
128 118
			}else{
129
				
119

  
130 120
			}
131
			
121

  
132 122
			return CdmStore.getService(ITaxonService.class).deleteSynonym(entity.getUuid(), synConfig) != null;
133 123
		}
134 124
	}
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/UserEditorInput.java
43 43
		return instance;
44 44
	}
45 45

  
46
	/* (non-Javadoc)
47
	 * @see org.eclipse.ui.IEditorInput#getName()
48
	 */
49
	@Override
46
    @Override
50 47
	public String getName() {
51 48
		return BulkEditorInputType.USER.label;
52 49
	}
53 50

  
54
	/* (non-Javadoc)
55
	 * @see org.eclipse.ui.IEditorInput#getToolTipText()
56
	 */
57
	@Override
58
	public String getToolTipText() {
59
		return getName();
60
	}
61

  
62 51
	/* (non-Javadoc)
63 52
	 * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService#save(java.lang.Object)
64 53
	 */
......
117 106
    public void merge() {
118 107

  
119 108
    }
120
    
109

  
121 110

  
122 111
	@Override
123 112
	protected User loadEntity(UUID entityUuid) {

Also available in: Unified diff