Revision 75d68451
Added by Katja Luther about 8 years ago
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java | ||
|---|---|---|
| 166 | 166 |
} else if (object instanceof Media){
|
| 167 | 167 |
IMediaService service = controller.getMediaService(); |
| 168 | 168 |
//TeamOrPersonBase teamOrPerson = (TeamOrPersonBase)service.load(((TeamOrPersonBase) object).getUuid()); |
| 169 |
result = service.delete(((Media)object).getUuid()); |
|
| 169 |
result = service.delete(((Media)object).getUuid(), null);
|
|
| 170 | 170 |
errorMessage = "The media "; |
| 171 | 171 |
} |
| 172 | 172 |
|
| eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java | ||
|---|---|---|
| 45 | 45 |
import eu.etaxonomy.cdm.api.service.IAgentService; |
| 46 | 46 |
import eu.etaxonomy.cdm.api.service.IDescriptionService; |
| 47 | 47 |
import eu.etaxonomy.cdm.api.service.IGroupService; |
| 48 |
import eu.etaxonomy.cdm.api.service.IMediaService; |
|
| 48 | 49 |
import eu.etaxonomy.cdm.api.service.INameService; |
| 49 | 50 |
import eu.etaxonomy.cdm.api.service.IOccurrenceService; |
| 50 | 51 |
import eu.etaxonomy.cdm.api.service.IReferenceService; |
| ... | ... | |
| 57 | 58 |
import eu.etaxonomy.cdm.model.common.IdentifiableEntity; |
| 58 | 59 |
import eu.etaxonomy.cdm.model.common.User; |
| 59 | 60 |
import eu.etaxonomy.cdm.model.description.DescriptionBase; |
| 61 |
import eu.etaxonomy.cdm.model.media.Media; |
|
| 60 | 62 |
import eu.etaxonomy.cdm.model.description.DescriptionElementBase; |
| 61 | 63 |
import eu.etaxonomy.cdm.model.name.NonViralName; |
| 62 | 64 |
import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; |
| ... | ... | |
| 82 | 84 |
|
| 83 | 85 |
private String referencedObjectTitleCache; |
| 84 | 86 |
private ConversationHolder conversation; |
| 85 |
private ICdmEntitySession cdmEntitySession; |
|
| 87 |
private final ICdmEntitySession cdmEntitySession;
|
|
| 86 | 88 |
|
| 87 | 89 |
public ReferencingObjectsView() {
|
| 88 | 90 |
cdmEntitySession = CdmStore.getCurrentSessionManager().bindNullSession(); |
| ... | ... | |
| 223 | 225 |
referencedObject = CdmStore.getService(IUserService.class).load(entity); |
| 224 | 226 |
} else if (objectClass.isAssignableFrom(Group.class)){
|
| 225 | 227 |
referencedObject = CdmStore.getService(IGroupService.class).load(entity); |
| 228 |
} else if (objectClass.isAssignableFrom(Media.class)){
|
|
| 229 |
referencedObject = CdmStore.getService(IMediaService.class).load(entity); |
|
| 226 | 230 |
} else if (DescriptionBase.class.isAssignableFrom(objectClass)){
|
| 227 | 231 |
referencedObject = CdmStore.getService(IDescriptionService.class).load(entity); |
| 228 | 232 |
} else if (DescriptionElementBase.class.isAssignableFrom(objectClass)){
|
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListContentProvider.java | ||
|---|---|---|
| 69 | 69 |
|
| 70 | 70 |
private void getChildrenBreadthFirst(List<PolytomousKeyNode> result, |
| 71 | 71 |
PolytomousKeyNode node) {
|
| 72 |
if (node == null){
|
|
| 73 |
return; |
|
| 74 |
} |
|
| 72 | 75 |
if (!node.getChildren().isEmpty()) {
|
| 73 | 76 |
result.addAll(node.getChildren()); |
| 74 | 77 |
for (PolytomousKeyNode internalNode : node.getChildren()) {
|
| eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java | ||
|---|---|---|
| 74 | 74 |
Point point = new Point(event.x, event.y); |
| 75 | 75 |
|
| 76 | 76 |
int selectedColumn = getSelectedColumn(table, point); |
| 77 |
|
|
| 78 |
if (table == null || point == null ){
|
|
| 79 |
return; |
|
| 80 |
} |
|
| 81 |
|
|
| 77 | 82 |
PolytomousKeyNode node = (PolytomousKeyNode) getTableItem( |
| 78 | 83 |
table, point).getData(); |
| 79 | 84 |
|
Also available in: Unified diff
referencing objects view for media, NPE in polytomous key view