i18n + code clean up

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
index 88ad2da27aa7d06e9b871469782aa1fcf65e8bae..91da3303c7609a67a44e0aff5bfd5929cbf8d720 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/DeleteTermBaseOperation.java
@@ -14,7 +14,6 @@ import org.eclipse.core.runtime.IAdaptable;
 import org.eclipse.core.runtime.IProgressMonitor;\r
 import org.eclipse.core.runtime.IStatus;\r
 import org.eclipse.core.runtime.Status;\r
-import org.eclipse.jface.dialogs.MessageDialog;\r
 \r
 import eu.etaxonomy.cdm.api.service.DeleteResult;\r
 import eu.etaxonomy.cdm.api.service.ITermService;\r
@@ -23,6 +22,7 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase;
 import eu.etaxonomy.cdm.model.common.TermBase;\r
 import eu.etaxonomy.cdm.model.common.TermVocabulary;\r
 import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput;\r
+import eu.etaxonomy.taxeditor.l10n.Messages;\r
 import eu.etaxonomy.taxeditor.model.MessagingUtils;\r
 import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;\r
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;\r
@@ -55,14 +55,14 @@ public class DeleteTermBaseOperation extends AbstractPostTaxonOperation {
                        throws ExecutionException {\r
                if (termBase instanceof TermVocabulary) {\r
                        if (((TermVocabulary)termBase).getCreatedBy() == null) {\r
-                               IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "This is a CDM system vocabulary");\r
-                               MessagingUtils.warningDialog("Cannot delete vocabulary", termBase, status);\r
+                               IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), Messages.DeleteTermBaseOperation_SYSTEM_VOC);\r
+                               MessagingUtils.warningDialog(Messages.DeleteTermBaseOperation_CANNOT_DELETE_VOC, termBase, status);\r
                                return status;\r
                        }\r
 \r
                        if (!((TermVocabulary)termBase).getTerms().isEmpty()) {\r
-                               IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "Delete all terms from this vocaulary before deleting the vocabulary.");\r
-                               MessagingUtils.warningDialog("Vocabulary not empty", termBase, status);\r
+                               IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), Messages.DeleteTermBaseOperation_DELETE_ALL_TERMS_BEFORE);\r
+                               MessagingUtils.warningDialog(Messages.DeleteTermBaseOperation_VOC_NOT_EMPTY, termBase, status);\r
                                return status;\r
                        }\r
 \r
@@ -70,20 +70,8 @@ public class DeleteTermBaseOperation extends AbstractPostTaxonOperation {
 \r
                        DeleteResult result =   CdmStore.getService(IVocabularyService.class).delete(termBase.getUuid());\r
                        if (!result.isOk()){\r
-                StringBuffer errorString = new StringBuffer();\r
-                for (Exception e:result.getExceptions()){\r
-                    errorString.append(e.getMessage() + System.lineSeparator());\r
-                }\r
-                if (result.isAbort()){\r
-                    MessageDialog.openWarning(null, "Delete failed", errorString.toString());\r
-                }else{\r
-                    if (result.getExceptions().iterator().hasNext()){\r
-                        MessagingUtils.errorDialog("Delete failed", this.getClass(),null, TaxeditorStorePlugin.PLUGIN_ID, result.getExceptions().iterator().next(), true);\r
-                    }else{\r
-                        MessageDialog.openWarning(null, "Delete failed", errorString.toString());\r
-                    }\r
-                }\r
-            }\r
+                           return showErrorMessage(result);\r
+                       }\r
 \r
                } else if (termBase instanceof DefinedTermBase) {\r
 \r
@@ -91,49 +79,53 @@ public class DeleteTermBaseOperation extends AbstractPostTaxonOperation {
                        DefinedTermBase definedTermBase = (DefinedTermBase) termBase;\r
 \r
                        if (((DefinedTermBase)termBase).getCreatedBy() == null) {\r
-                               IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "This is a CDM system defined term");\r
-                               MessagingUtils.warningDialog("Cannot delete defined term", termBase, status);\r
+                               IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), Messages.DeleteTermBaseOperation_SYSTEM_TERM);\r
+                               MessagingUtils.warningDialog(Messages.DeleteTermBaseOperation_CANNOT_DELETE_TERM, termBase, status);\r
                                return status;\r
                        }\r
                        if(!definedTermBase.getIncludes().isEmpty()){\r
-                               IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "This term includes other terms. Please delete the included terms before deleting this term.");\r
-                               MessagingUtils.warningDialog("Term has included terms", termBase, status);\r
+                               IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), Messages.DeleteTermBaseOperation_TERM_INCLUDES_OTHERS);\r
+                               MessagingUtils.warningDialog(Messages.DeleteTermBaseOperation_TERM_INLCUDES, termBase, status);\r
                                return status;\r
                        }\r
 \r
                        DeleteResult result =   CdmStore.getService(ITermService.class).delete(termBase.getUuid());\r
-\r
                        if (!result.isOk()){\r
-                StringBuffer errorString = new StringBuffer();\r
-                for (Exception e:result.getExceptions()){\r
-                    errorString.append(e.getMessage() + System.lineSeparator());\r
-                }\r
-                if (result.isAbort()){\r
-                    MessageDialog.openWarning(null, "Delete failed", errorString.toString());\r
-                }else{\r
-                    if (result.getExceptions().iterator().hasNext()){\r
-                        MessagingUtils.errorDialog("Delete failed", this.getClass(),null, TaxeditorStorePlugin.PLUGIN_ID, result.getExceptions().iterator().next(), true);\r
-                    }else{\r
-                        MessageDialog.openWarning(null, "Delete failed", errorString.toString());\r
-                    }\r
-                }\r
+                           return showErrorMessage(result);\r
             }\r
                }\r
 \r
                return postExecute(termBase);\r
        }\r
 \r
-       @Override\r
+       private IStatus showErrorMessage(DeleteResult result) {\r
+           StringBuffer errorString = new StringBuffer();\r
+        for (Exception e:result.getExceptions()){\r
+            errorString.append(e.getMessage() + System.lineSeparator());\r
+        }\r
+        IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), errorString.toString());\r
+        String delete_failed = Messages.DeleteTermBaseOperation_DELETE_FAILED;\r
+        if (result.isAbort()){\r
+            MessagingUtils.warningDialog(delete_failed, this, status);\r
+        }else{\r
+            if (result.getExceptions().iterator().hasNext()){\r
+                MessagingUtils.errorDialog(delete_failed, this.getClass(),null, TaxeditorStorePlugin.PLUGIN_ID, result.getExceptions().iterator().next(), true);\r
+            }else{\r
+                MessagingUtils.warningDialog(delete_failed, this, status);\r
+            }\r
+        }\r
+        return status;\r
+    }\r
+\r
+    @Override\r
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
-               // TODO Auto-generated method stub\r
                return null;\r
        }\r
 \r
        @Override\r
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
-               // TODO Auto-generated method stub\r
                return null;\r
        }\r
 \r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
index 5e057c228784ecbec0f34b7bf39b5cdf9238e432..c832de57e1ca8e297c884d8eb25b7b117dc34b88 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/l10n/Messages.java
@@ -208,7 +208,34 @@ public class Messages extends NLS {
 
 
     public static String DeleteResultMessagingUtils_SUCCES;
-       public static String NewGrantedAuthority_AlreadyInDb;
+       public static String DeleteTermBaseOperation_CANNOT_DELETE_TERM;
+
+
+    public static String DeleteTermBaseOperation_CANNOT_DELETE_VOC;
+
+
+    public static String DeleteTermBaseOperation_DELETE_ALL_TERMS_BEFORE;
+
+
+    public static String DeleteTermBaseOperation_DELETE_FAILED;
+
+
+    public static String DeleteTermBaseOperation_SYSTEM_TERM;
+
+
+    public static String DeleteTermBaseOperation_SYSTEM_VOC;
+
+
+    public static String DeleteTermBaseOperation_TERM_INCLUDES_OTHERS;
+
+
+    public static String DeleteTermBaseOperation_TERM_INLCUDES;
+
+
+    public static String DeleteTermBaseOperation_VOC_NOT_EMPTY;
+
+
+    public static String NewGrantedAuthority_AlreadyInDb;
 
     public static String SetSecundumConfiguration_IncludeAcceptedTaxa;
     public static String SetSecundumConfiguration_IncludeSynonyms;

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 3b63d006c2ad313f790076a23409a2fdb4ab4452..b43d3f4d5e4837ff56bffe08eddf35e87edc3941 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
@@ -162,6 +162,15 @@ DeleteConfiguration_media_deleteIfUsedSomeWhereElse=Delete the media also if it
 DeleteConfiguration_media_delete=Remove the media from the image gallery and delete the media completely, if possible
 DeleteResultMessagingUtils_ABORT=Delete was aborted
 DeleteResultMessagingUtils_SUCCES=Delete was successful
+DeleteTermBaseOperation_CANNOT_DELETE_TERM=Cannot delete defined term
+DeleteTermBaseOperation_CANNOT_DELETE_VOC=Cannot delete vocabulary
+DeleteTermBaseOperation_DELETE_ALL_TERMS_BEFORE=Delete all terms from this vocaulary before deleting the vocabulary.
+DeleteTermBaseOperation_DELETE_FAILED=Delete failed
+DeleteTermBaseOperation_SYSTEM_TERM=This is a CDM system defined term
+DeleteTermBaseOperation_SYSTEM_VOC=This is a CDM system vocabulary
+DeleteTermBaseOperation_TERM_INCLUDES_OTHERS=This term includes other terms. Please delete the included terms before deleting this term.
+DeleteTermBaseOperation_TERM_INLCUDES=Term has included terms
+DeleteTermBaseOperation_VOC_NOT_EMPTY=Vocabulary not empty
 
 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 ac6cdac8e06affd90b516e6c716884ad656faeea..2b9608cdd80de372dda4b2a821ec328abbf70c54 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
@@ -162,6 +162,15 @@ DeleteConfiguration_media_deleteIfUsedSomeWhereElse=L
 DeleteConfiguration_media_delete=Entferne die Mediendaten aus der Gallerie und lösche sie aus der Datenbank, wenn sie nicht anderweitig verwendet werden.
 DeleteResultMessagingUtils_ABORT=Löschen wurde abgebrochen
 DeleteResultMessagingUtils_SUCCES=Löschen war erfolgreich
+DeleteTermBaseOperation_CANNOT_DELETE_TERM=Term konnte nicht gelöscht werden
+DeleteTermBaseOperation_CANNOT_DELETE_VOC=Vokabular konnte nicht gelöscht werden
+DeleteTermBaseOperation_DELETE_ALL_TERMS_BEFORE=Es müssen alle Terme dieses Vokabulars gelöscht werden, bevor das Vokabular gelöscht werden kann.
+DeleteTermBaseOperation_DELETE_FAILED=Löschen fehlgeschlagen
+DeleteTermBaseOperation_SYSTEM_TERM=Das ist ein CDM system-interner Term
+DeleteTermBaseOperation_SYSTEM_VOC=Das ist ein CDM system-internes Vokabular
+DeleteTermBaseOperation_TERM_INCLUDES_OTHERS=Der Term enthält weitere Terme. Es müssen zuerst alle enthaltenen Terme gelöscht werden.
+DeleteTermBaseOperation_TERM_INLCUDES=Der Term enthält weitere Terme
+DeleteTermBaseOperation_VOC_NOT_EMPTY=Vokabular ist nicht leer
 
 NewGrantedAuthority_AlreadyInDb=Die GrantedAuthority ist bereits in der DB enthalten.