Project

General

Profile

« Previous | Next » 

Revision 48621fdd

Added by Katja Luther about 7 years ago

fix deletion of new created entities in bulk editor

View differences:

eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
168 168
		                MessagingUtils.REMOTE_ACCESS_FAILURE_MESSAGE + System.getProperty("line.separator"),
169 169
		                pluginId,
170 170
		                t,
171
		                true,
172
		                false);
171
		                false,
172
		                true);
173 173
		        return true;
174 174
		    }
175 175
		    return false;
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotation.java
14 14
import org.eclipse.jface.text.source.Annotation;
15 15

  
16 16
import eu.etaxonomy.cdm.api.service.config.DeleteConfiguratorBase;
17
import eu.etaxonomy.cdm.api.service.config.NameDeletionConfigurator;
18 17

  
19 18
/**
20 19
 * An <code>Annotation</code> which spans an entire line and holds an object associated
......
40 39
	private boolean markedAsNew;
41 40
	private T mergeTarget;
42 41
	private DeleteConfiguratorBase configurator= null;
42
	private boolean markAsDelete;
43 43

  
44 44

  
45 45
	/**
......
264 264

  
265 265
	public void setDeleteConfigurator(DeleteConfiguratorBase config) {
266 266
		this.configurator = config;
267
		
267

  
268 268
	}
269 269
}
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
151 151
	@Override
152 152
	public TeamOrPersonBase save(TeamOrPersonBase entity) {
153 153
	   return (TeamOrPersonBase) CdmStore.getService(IAgentService.class).merge(entity, true).getMergedEntity();
154
	   
154

  
155 155
	}
156 156

  
157 157
	@Override
158 158
	public boolean delete(TeamOrPersonBase entity, DeleteConfiguratorBase config)
159 159
			throws ReferencedObjectUndeletableException {
160
		return CdmStore.getService(IAgentService.class).delete(entity.getUuid()) != null;
160
	    if (entity.getUuid() != null){
161
	        return CdmStore.getService(IAgentService.class).delete(entity.getUuid()) != null;
162
	    }else{
163
	        return false;
164
	    }
161 165
	}
162 166

  
163 167
    /* (non-Javadoc)
eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
132 132
	 * @throws ReferencedObjectUndeletableException */
133 133
	@Override
134 134
    public boolean delete(Reference entity, DeleteConfiguratorBase config) throws ReferencedObjectUndeletableException {
135
		return CdmStore.getService(IReferenceService.class).delete(entity.getUuid()) != null;
135
	    if (entity.getUuid() != null){
136
	        return CdmStore.getService(IReferenceService.class).delete(entity.getUuid()) != null;
137
	    }else{
138
	        return false;
139
	    }
136 140
	}
137 141

  
138 142
	/** {@inheritDoc} */

Also available in: Unified diff