ref #6527: change the labels for media deletion config and remove undeletable media...

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
index d515f18494899f8a3f7503efacb6c51a3c107fca..4cf1d5931024474ce9f0ac331d788867b2ea42b6 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/l10n/messages_de.properties
@@ -202,7 +202,7 @@ OpenDerivativeEditorForDescriptionElement_NO_SPECIMENS_MESSAGE=Keine Specimens f
 OpenDerivativeEditorForTaxonNode_COULD_NOT_OPEN=Specimen-Editor konnte nicht geöffnet werden
 DeleteDescriptionElementOperation_DESC_NOT_FOUND=Beschreibung konnte nicht gefunden werden!
 DeleteHandler_CONFIRM_DELETION=Löschen bestätigen
-DeleteHandler_CONFIRM_DELETION_MESSAGE=Wollen sie wirklich das Medienobjekt löschen?
+DeleteHandler_CONFIRM_DELETION_MESSAGE=Wollen sie die Mediendaten wirklich löschen?
 DeleteHandler_DELETE=Löschen
 DeleteHandler_INVALID_SELECTION=Auswahl ungültig für den DeleteHandler
 DeleteHandler_SKIP=Überspringen

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
index bf1b1590a44bef5a0118d76ce27ea010b80375d2..7fa2b410ddf9ce8edf320c7ca6cab1648e4c13ba 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DeleteHandler.java
@@ -102,6 +102,8 @@ public class DeleteHandler extends AbstractHandler {
 
                                        // TODO use undo context specific to editor
                     MediaDeletionConfigurator config = new MediaDeletionConfigurator();
+                    config.setDeleteIfUsedInTaxonDescription(true);
+                    config.setOnlyRemoveFromGallery(false);
 
                     if (!DeleteConfiguratorDialog.openConfirmWithConfigurator(config, HandlerUtil.getActiveShell(event), Messages.DeleteHandler_CONFIRM_DELETION,  Messages.DeleteHandler_CONFIRM_DELETION_MESSAGE)){
                         return null;

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java
index 00507f9bb6ef43f4775e3fe123550d5a1906528f..3d6d0664c390b856641a40d7019cd1c178454f0f 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/DeleteMediaOperation.java
@@ -76,15 +76,14 @@ public class DeleteMediaOperation extends AbstractPostTaxonOperation {
                monitor.worked(20);
                DeleteResult result = CdmStore.getService(IMediaService.class).delete(media.getUuid(), config);
                String errorMessage = "The media ";
-               if (result.isOk()){
-                       ImagesUtility.removeMediaFromGallery(description, media);
-               } else{
+               ImagesUtility.removeMediaFromGallery(description, media);
+               if (!result.isOk()){
                        List<String> messages = new ArrayList<String>();
                        int i = result.getExceptions().size();
                        for (Exception e:result.getExceptions()){
                                messages.add(e.getMessage());
                        }
-                       errorMessage += "could not be deleted.";
+                       errorMessage += "could not be deleted from database. ";
                        //MessagingUtils.errorDialog("test", getClass(), "message", TaxeditorBulkeditorPlugin.PLUGIN_ID, result.getExceptions().iterator().next(),true);
                        DeleteResultMessagingUtils.messageDialogWithDetails(result,errorMessage, TaxeditorBulkeditorPlugin.PLUGIN_ID);
                }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
index 0a7c7e9614a6f34cf57c06ec10d51c027250b1cb..f17123ae3049d6032f491b0c5f1db638fe193aec 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages.properties
@@ -139,7 +139,7 @@ PresenceAbsenceTermDetailElement_LABEL_COLOR=Color
 DeleteConfiguration_media_removeFromGallery=Remove the media from the image gallery but leave it in database
 DeleteConfiguration_media_deleteIfUsedInTaxonDescription=Delete also if media is used in taxon description
 DeleteConfiguration_media_deleteIfUsedInSpecimenDescription=Delete also if media is used in specimen description        
-DeleteConfiguration_media_delete=Delete the media completely, if possible
+DeleteConfiguration_media_delete=Remove the media from the image gallery and delete the media completely, if possible
 
 NewGrantedAuthority_AlreadyInDb=The granted authority already exists.
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
index 00506a896cb9c02523c2e03eb39d705f9fb13164..b6afaef66246b3e80c656b8ea6931c9f20e68581 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/messages_de.properties
@@ -139,7 +139,7 @@ PresenceAbsenceTermDetailElement_LABEL_COLOR=Farbe
 DeleteConfiguration_media_removeFromGallery=Entferne Mediendaten aus der Gallerie, aber behalte es in der Datenbank
 DeleteConfiguration_media_deleteIfUsedInTaxonDescription=Lösche die Mediendaten, auch wenn es Teil einer Taxonbeschreibung ist
 DeleteConfiguration_media_deleteIfUsedInSpecimenDescription=Lösche die Mediendaten, auch wenn es Teil einer Specimenbeschreibung ist
-DeleteConfiguration_media_delete=Lösche die Mediendaten, wenn es nicht von anderen Daten referenziert wird.
+DeleteConfiguration_media_delete=Entferne die Mediendaten aus der Gallerie und lösche sie aus der Datenbank, wenn sie nicht anderweitig verwendet werden.
 
 NewGrantedAuthority_AlreadyInDb=Die GrantedAuthority ist bereits in der DB enthalten.
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/deleteConfigurator/DeleteMediaConfiguratorComposite.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/deleteConfigurator/DeleteMediaConfiguratorComposite.java
index 5e9d4f6968f71bf305dfe7f564ecc2ce25c537bf..11522e9cbece400d8d1d1a35d7229c058b12b177 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/deleteConfigurator/DeleteMediaConfiguratorComposite.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/deleteConfigurator/DeleteMediaConfiguratorComposite.java
@@ -84,8 +84,8 @@ public class DeleteMediaConfiguratorComposite extends Composite {
 //            });
             btnRemoveFromImageGallery = new Button(this, SWT.RADIO);
             btnRemoveFromImageGallery.setText(Messages.DeleteConfiguration_media_removeFromGallery);
-            btnDelete.setSelection(true);
-               btnRemoveFromImageGallery.setSelection(configurator.isOnlyRemoveFromGallery());
+            btnRemoveFromImageGallery.setSelection(configurator.isOnlyRemoveFromGallery());
+               btnDelete.setSelection(configurator.isDeleteIfUsedInTaxonDescription());
         }
 
         m_bindingContext = initDataBindings();