referencing objects view for media, NPE in polytomous key view

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
index 6936095c42db08efea30b44e5bbdf98b641df720..feb73fbe85423ac34b3ed842a69a90266e250e43 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/handler/DeleteHandler.java
@@ -166,7 +166,7 @@ public class DeleteHandler extends AbstractHandler {
                                        } else if (object instanceof Media){
                         IMediaService service = controller.getMediaService();
                         //TeamOrPersonBase teamOrPerson = (TeamOrPersonBase)service.load(((TeamOrPersonBase) object).getUuid());
                                        } else if (object instanceof Media){
                         IMediaService service = controller.getMediaService();
                         //TeamOrPersonBase teamOrPerson = (TeamOrPersonBase)service.load(((TeamOrPersonBase) object).getUuid());

-                        result = service.delete(((Media)object).getUuid());
+                        result = service.delete(((Media)object).getUuid(), null);

                         errorMessage = "The media ";
                     }
 
                         errorMessage = "The media ";
                     }
 

diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
index d1645a7019a67456c9de0a82249b36b83a06971c..a52d9df220b25d57197accd8d4a07bda506f3cef 100644 (file)
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsView.java
@@ -45,6 +45,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.api.service.IGroupService;
 import eu.etaxonomy.cdm.api.service.IAgentService;
 import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.api.service.IGroupService;

+import eu.etaxonomy.cdm.api.service.IMediaService;

 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;
 import eu.etaxonomy.cdm.api.service.INameService;
 import eu.etaxonomy.cdm.api.service.IOccurrenceService;
 import eu.etaxonomy.cdm.api.service.IReferenceService;


@@ -57,6 +58,7 @@ import eu.etaxonomy.cdm.model.common.Group;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.User;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;

+import eu.etaxonomy.cdm.model.media.Media;

 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
 import eu.etaxonomy.cdm.model.name.NonViralName;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;


@@ -82,7 +84,7 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
 
        private String referencedObjectTitleCache;
        private ConversationHolder conversation;
 
        private String referencedObjectTitleCache;
        private ConversationHolder conversation;

-       private ICdmEntitySession cdmEntitySession;
+       private final ICdmEntitySession cdmEntitySession;

 
        public ReferencingObjectsView() {
            cdmEntitySession = CdmStore.getCurrentSessionManager().bindNullSession();
 
        public ReferencingObjectsView() {
            cdmEntitySession = CdmStore.getCurrentSessionManager().bindNullSession();


@@ -223,6 +225,8 @@ public class ReferencingObjectsView extends AbstractCdmViewPart {
                        referencedObject = CdmStore.getService(IUserService.class).load(entity);
                } else if (objectClass.isAssignableFrom(Group.class)){
                        referencedObject = CdmStore.getService(IGroupService.class).load(entity);
                        referencedObject = CdmStore.getService(IUserService.class).load(entity);
                } else if (objectClass.isAssignableFrom(Group.class)){
                        referencedObject = CdmStore.getService(IGroupService.class).load(entity);

+               } else if (objectClass.isAssignableFrom(Media.class)){
+                   referencedObject = CdmStore.getService(IMediaService.class).load(entity);

                } else if (DescriptionBase.class.isAssignableFrom(objectClass)){
                    referencedObject = CdmStore.getService(IDescriptionService.class).load(entity);
                } else if (DescriptionElementBase.class.isAssignableFrom(objectClass)){
                } else if (DescriptionBase.class.isAssignableFrom(objectClass)){
                    referencedObject = CdmStore.getService(IDescriptionService.class).load(entity);
                } else if (DescriptionElementBase.class.isAssignableFrom(objectClass)){

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListContentProvider.java
index 90ed20b2b7386d3397d1ce2d2de13f45851709ee..2f2575378987ece8a1108cbe79a134f90e4efe27 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListContentProvider.java
@@ -69,6 +69,9 @@ public class PolytomousKeyListContentProvider implements
 
        private void getChildrenBreadthFirst(List<PolytomousKeyNode> result,
                        PolytomousKeyNode node) {
 
        private void getChildrenBreadthFirst(List<PolytomousKeyNode> result,
                        PolytomousKeyNode node) {

+           if (node == null){
+               return;
+           }

                if (!node.getChildren().isEmpty()) {
                        result.addAll(node.getChildren());
                        for (PolytomousKeyNode internalNode : node.getChildren()) {
                if (!node.getChildren().isEmpty()) {
                        result.addAll(node.getChildren());
                        for (PolytomousKeyNode internalNode : node.getChildren()) {

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java
index 56bd34ca6e2ce21118b42e42b59ea666f0689bd7..c86490eadfd07a4f1ed1113227534ab41cc353a3 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/PolytomousKeyListEditor.java
@@ -74,6 +74,11 @@ public class PolytomousKeyListEditor extends EditorPart implements
                        Point point = new Point(event.x, event.y);
 
                        int selectedColumn = getSelectedColumn(table, point);
                        Point point = new Point(event.x, event.y);
 
                        int selectedColumn = getSelectedColumn(table, point);

+
+                       if (table == null || point == null ){
+                           return;
+                       }
+

                        PolytomousKeyNode node = (PolytomousKeyNode) getTableItem(
                         table, point).getData();
 
                        PolytomousKeyNode node = (PolytomousKeyNode) getTableItem(
                         table, point).getData();