From 41e2f69388ac599c1799405335998507ba6bf93b Mon Sep 17 00:00:00 2001 From: Cherian Mathew Date: Thu, 14 Aug 2014 10:32:48 +0000 Subject: [PATCH] Moved all logging and dialog functionality to the new class MessagingUtils. Refactoring code to adapt to above change. Added new custom error dialog - CdmErrorDialog Added runtime exception handling to the ApplicationWorkbenchAdvisor by adding a custom status handler --- .gitattributes | 1 + .../ApplicationWorkbenchAdvisor.java | 71 ++++ .../ApplicationWorkbenchWindowAdvisor.java | 7 +- .../taxeditor/TaxonomicEditorPlugin.java | 4 +- .../AnnotatedLineDocumentProvider.java | 10 +- .../LineAnnotationModel.java | 4 +- .../command/DynamicMarkerTypeEditingMenu.java | 10 +- ...tractAddDerivedUnitFacadeMediaHandler.java | 3 +- .../AddDerivedUnitFacadeMediaOperation.java | 4 +- .../bulkeditor/handler/DeleteHandler.java | 8 +- .../input/AbstractBulkEditorInput.java | 4 +- .../input/NameRelationshipEditorInput.java | 4 +- .../input/entitycreator/ReferenceCreator.java | 4 +- .../input/entitycreator/UserCreator.java | 4 +- .../taxeditor/editor/EditorStateManager.java | 3 +- .../editor/MultiPageTaxonEditor.java | 15 +- .../taxeditor/editor/TaxonEditorInput.java | 11 +- .../editor/TaxonEditorInputFactory.java | 5 +- .../taxeditor/editor/UseObjectManager.java | 6 +- .../handler/EditCdmAuthoritiesHandler.java | 3 +- .../handler/OpenChecklistEditorHandler.java | 9 +- .../handler/OpenDerivateViewHandler.java | 6 +- .../editor/handler/OpenParentHandler.java | 3 +- .../taxeditor/editor/key/KeyEditor.java | 4 +- .../polytomous/PolytomousKeyListEditor.java | 3 +- .../handler/CreateChildNodeHandler.java | 5 +- .../handler/CreateSiblingNodeHandler.java | 3 +- .../polytomous/handler/DeleteNodeHandler.java | 3 +- .../handler/RefreshNodeNumberingHandler.java | 3 +- .../name/container/SynonymContainer.java | 3 +- .../dnd/NameEditorDropTargetListener.java | 3 +- .../ChangeSynonymToAcceptedTaxonHandler.java | 3 +- .../CreateHomotypicSynonymHandler.java | 3 +- .../name/handler/DeleteTaxonBaseHandler.java | 3 +- .../SwapSynonymAndAcceptedHandler.java | 3 +- ...hangeConceptRelationshipTypeOperation.java | 6 +- .../ChangeConceptToSynonymOperation.java | 4 +- ...ChangeSynonymToAcceptedTaxonOperation.java | 6 +- .../SwapSynonymAndAcceptedOperation.java | 4 +- .../CreateDescriptionElementHandler.java | 5 +- .../handler/CreateDescriptionHandler.java | 5 +- .../AbstractDynamicConceptRelationMenu.java | 4 +- .../handler/CreateConceptRelationHandler.java | 3 +- .../handler/DeleteConceptRelationHandler.java | 3 +- .../handler/OpenRelatedConceptHandler.java | 3 +- .../view/derivate/DerivateDragListener.java | 4 +- .../view/derivate/DerivateDropListener.java | 6 +- .../derivate/DerivateViewEditorInput.java | 4 +- .../SingleReadSequenceContextMenu.java | 6 +- .../DescriptionElementDropAdapter.java | 4 +- .../CreateDescriptionElementHandler.java | 5 +- .../handler/CreateDescriptionHandler.java | 5 +- .../descriptive/handler/DeleteHandler.java | 5 +- .../handler/DynamicFeatureMenu.java | 3 +- .../MoveDescriptionElementsHandler.java | 3 +- .../MoveDescriptionToOtherTaxonHandler.java | 5 +- .../DeleteDescriptionElementOperation.java | 4 +- .../operation/EditInXper2Handler.java | 4 +- .../view/media/MediaContentProvider.java | 8 +- .../media/handler/AddImageGalleryHandler.java | 3 +- .../media/handler/CreateMediaHandler.java | 3 +- .../media/handler/DeleteMediaHandler.java | 3 +- .../handler/MoveImageDownInListHandler.java | 3 +- .../handler/MoveImageUpInListHandler.java | 3 +- .../operation/MoveMediaInListOperation.java | 6 +- .../taxeditor/navigation/NavigationUtil.java | 35 +- .../key/polytomous/PolytomousKeyViewPart.java | 6 +- .../key/polytomous/handler/DeleteHandler.java | 5 +- .../navigation/navigator/TaxonLinkHelper.java | 4 +- .../navigation/navigator/TaxonNavigator.java | 3 +- .../navigator/TaxonNodeLabelProvider.java | 8 +- .../ChangeAcceptedTaxonToSynonymHandler.java | 9 +- .../navigator/handler/CopyHandler.java | 3 +- .../navigator/handler/DeleteHandler.java | 5 +- .../operation/MoveTaxonOperation.java | 6 +- .../navigation/operation/CreateTaxonNode.java | 7 +- .../navigation/search/SearchBar.java | 7 +- .../ApplicationWorkbenchAdvisor.java | 8 + .../handler/GeneratePdfHandler.java | 4 +- .../wizard/AbstractPublishWizard.java | 4 +- .../wizard/SelectServiceWizardPage.java | 6 +- .../wizard/SelectStylesheetWizardPage.java | 4 +- .../wizard/SelectTaxaWizardPage.java | 6 +- .../datasource/CdmDataSourceRepository.java | 16 +- .../handler/CreateDefinedTermHandler.java | 3 +- .../handler/CreateTermVocabularyHandler.java | 3 +- .../handler/DeleteTermBaseHandler.java | 3 +- .../handler/OpenDefinedTermEditorHandler.java | 5 +- .../operation/CreateDefinedTermOperation.java | 3 +- .../operation/DeleteTermBaseOperation.java | 9 +- .../operation/MoveDefinedTermOperation.java | 5 +- .../EditFeatureTreeWizardPage.java | 4 +- .../handler/OpenPasswordWizzardHandler.java | 3 +- .../etaxonomy/taxeditor/io/ExportManager.java | 7 +- .../etaxonomy/taxeditor/io/ImportManager.java | 6 +- .../wizard/GenericConfiguratorWizardPage.java | 6 +- .../taxeditor/model/AbstractUtility.java | 353 +----------------- .../taxeditor/model/CdmErrorDialog.java | 44 +++ .../model/CdmProgressMonitorAdapter.java | 4 +- .../taxeditor/model/DescriptionHelper.java | 9 +- .../taxeditor/model/ImageResources.java | 2 +- .../taxeditor/model/MementoHelper.java | 7 +- .../newWizard/NewTaxonNodeWizard.java | 4 +- .../taxeditor/parser/ParseHandler.java | 12 +- .../taxeditor/preference/PreferencesUtil.java | 10 +- .../matching/AbstractMatchingPreferences.java | 6 +- .../NonViralNameMatchingPreference.java | 4 +- .../matching/ReferenceMatchingPreference.java | 4 +- .../TeamOrPersonMatchingPreference.java | 4 +- .../menu/AbstractMenuPreferences.java | 5 +- .../wizard/VocabularyTermWizard.java | 6 +- .../etaxonomy/taxeditor/store/CdmStore.java | 17 +- .../taxeditor/store/CdmStoreConnector.java | 9 +- .../taxeditor/store/ContextManager.java | 23 +- .../taxeditor/store/EditorManager.java | 3 +- .../taxeditor/store/LoginManager.java | 7 +- .../taxeditor/ui/combo/TermComboElement.java | 5 +- .../taxeditor/ui/dialog/UriDialog.java | 4 +- ...bstractFilteredCdmEnumSelectionDialog.java | 12 +- ...actFilteredCdmResourceSelectionDialog.java | 12 +- .../AmplificationSelectionDialog.java | 4 +- .../selection/DerivedUnitSelectionDialog.java | 4 +- .../selection/FieldUnitSelectionDialog.java | 4 +- .../selection/PrimerSelectionDialog.java | 4 +- .../selection/SelectionDialogFactory.java | 4 +- .../ui/element/AbstractCdmFormElement.java | 3 +- .../ui/element/AbstractFormSection.java | 5 +- .../taxeditor/ui/element/CdmFormFactory.java | 8 +- .../taxeditor/ui/element/ImageElement.java | 6 +- .../ui/element/MultilanguageTextElement.java | 4 +- .../ui/element/SelectionArbitrator.java | 4 +- .../CdmAuthorityCompositeViewer.java | 6 +- .../ui/openurl/OpenUrlReferencePage.java | 6 +- .../ui/openurl/OpenUrlSelectorElement.java | 4 +- .../taxeditor/ui/password/PasswordWizard.java | 4 +- .../ui/section/AbstractCdmDetailElement.java | 4 +- .../agent/TeamOrPersonBaseDetailSection.java | 4 +- .../DescriptionElementDetailSection.java | 3 +- .../media/MediaRepresentationElement.java | 6 +- .../name/NameRelationshipDetailElement.java | 4 +- .../name/NonViralNameDetailSection.java | 4 +- .../ui/section/name/ProtologueElement.java | 4 +- .../SynonymRelationshipDetailElement.java | 4 +- .../DerivedUnitBaseDetailElement.java | 12 +- .../DerivedUnitFacadeDetailElement.java | 4 +- .../PreservedSpecimenDetailElement.java | 4 +- .../dna/TissueSampleGeneralDetailElement.java | 4 +- .../reference/ReferenceDetailElement.java | 4 +- .../TermVocabularyDetailElement.java | 5 +- .../ui/selection/EditFromSelectionWizard.java | 4 +- .../ui/translation/TranslationWizardPage.java | 4 +- .../datasource/CdmDataSourceViewPart.java | 9 +- .../CdmMetaDataAwareDataSourceContainer.java | 4 +- .../handler/ChangeConnectionHandler.java | 10 +- .../handler/UpdateDataSourceHandler.java | 3 +- .../DerivateSearchCompositeController.java | 9 +- .../taxeditor/view/detail/CdmSectionPart.java | 4 +- .../taxeditor/view/detail/DetailsViewer.java | 4 +- 158 files changed, 584 insertions(+), 740 deletions(-) create mode 100644 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmErrorDialog.java diff --git a/.gitattributes b/.gitattributes index 713a46ecc..001ebc172 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1241,6 +1241,7 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/Zoologi eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractDataChangeBehaviour.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AuthorHelper.java -text +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmErrorDialog.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmObjectTransfer.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmProgressMonitorAdapter.java -text eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CommonHelper.java -text diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java index cac70d6a0..cb759ae74 100644 --- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java +++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java @@ -1,9 +1,24 @@ package eu.etaxonomy.taxeditor; + +import java.io.PrintWriter; +import java.io.StringWriter; +import java.rmi.activation.Activator; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.core.runtime.Status; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.swt.widgets.Shell; import org.eclipse.ui.application.IWorkbenchConfigurer; import org.eclipse.ui.application.IWorkbenchWindowConfigurer; import org.eclipse.ui.application.WorkbenchAdvisor; import org.eclipse.ui.application.WorkbenchWindowAdvisor; +import org.eclipse.ui.statushandlers.AbstractStatusHandler; +import org.eclipse.ui.statushandlers.StatusAdapter; +import org.eclipse.ui.statushandlers.StatusManager; + +import eu.etaxonomy.taxeditor.model.MessagingUtils; + /** @@ -14,6 +29,7 @@ import org.eclipse.ui.application.WorkbenchWindowAdvisor; */ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { + private CdmStatusHandler cdmStatusHandler; /* * (non-Javadoc) * @see org.eclipse.ui.application.WorkbenchAdvisor#createWorkbenchWindowAdvisor(org.eclipse.ui.application.IWorkbenchWindowConfigurer) @@ -96,6 +112,61 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { // return workspace.getRoot(); // } +// @Override +// public void eventLoopException(Throwable exception) { +// super.eventLoopException(exception); +// StoreUtil.messageDialog("Unexpected error", null, exception.getMessage(), exception); +// } + + + /* (non-Javadoc) + * @see org.eclipse.ui.application.WorkbenchAdvisor#getWorkbenchErrorHandler() + */ + @Override + public synchronized AbstractStatusHandler getWorkbenchErrorHandler() { + if (cdmStatusHandler == null) { + cdmStatusHandler = new CdmStatusHandler(); + } + return cdmStatusHandler; + } + + + /** + * Custom status handler for handling scenarios which are + * not handled by the editor (e.g. runtime exceptions) + * + * @author cmathew + * + */ + class CdmStatusHandler extends AbstractStatusHandler { + + /* (non-Javadoc) + * @see org.eclipse.ui.statushandlers.AbstractStatusHandler#handle(org.eclipse.ui.statushandlers.StatusAdapter, int) + */ + @Override + public void handle(StatusAdapter statusAdapter, int style) + { + if(statusAdapter.getStatus().matches(IStatus.ERROR)) { + + IStatus status = statusAdapter.getStatus(); + Throwable t = statusAdapter.getStatus().getException(); + // NOTE : Currently we only allow RuntimeExceptions since + // allowing all kinds of exceptions would also include + // those in generated status objects coming from from logging triggers + // leading to a recursive infinite loop of : + // initial exception thrown -> status handling -> dialog opening + logging of status -> + // status handling -> dialog opening + logging of status ... and so on + if(t != null && t instanceof RuntimeException) { + MessagingUtils.errorDialog("Unexpected error", + null, + MessagingUtils.UNEXPECTED_ERROR_MESSAGE + MessagingUtils.CONTACT_MESSAGE, + statusAdapter.getStatus().getPlugin(), + t); + } + } + } + } + } diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java index f7bcbe89b..00a48ec53 100644 --- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java +++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java @@ -13,6 +13,7 @@ import org.eclipse.ui.application.IWorkbenchWindowConfigurer; import org.eclipse.ui.application.WorkbenchWindowAdvisor; import org.osgi.framework.ServiceReference; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.ui.dialog.LoginDialog; @@ -84,15 +85,15 @@ public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor { try { agent = agentProvider.createAgent(null);//new URI("file:/Applications/eclipse36/p2")); if (agent == null) { - ApplicationUtil.error(this.getClass(), "No provisioning agent found. This application is not set up for updates.", null); + MessagingUtils.error(this.getClass(), "No provisioning agent found. This application is not set up for updates.", null); return; } IStatus status = P2Util.checkForUpdates(agent, null); - ApplicationUtil.info(status); + MessagingUtils.info(status); } catch (ProvisionException e) { - ApplicationUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } finally { if(agent != null) agent.stop(); } diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java index 521c2d1b3..50d279ef7 100644 --- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java +++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java @@ -8,6 +8,8 @@ import org.osgi.framework.ServiceReference; import org.osgi.framework.ServiceRegistration; import org.osgi.service.packageadmin.PackageAdmin; +import eu.etaxonomy.taxeditor.model.MessagingUtils; + /** * The activator class controls the plug-in life cycle * @@ -83,7 +85,7 @@ public class TaxonomicEditorPlugin extends AbstractUIPlugin { public void stop(BundleContext context) throws Exception { plugin = null; super.stop(context); - ApplicationUtil.info("Taxonomic Editor stopped."); + MessagingUtils.info("Taxonomic Editor stopped."); } /** diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java index cad73b3e0..5469cb069 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/AnnotatedLineDocumentProvider.java @@ -26,7 +26,7 @@ import org.eclipse.ui.IEditorInput; import org.eclipse.ui.texteditor.AbstractDocumentProvider; import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; @@ -113,7 +113,7 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider { try { createAnnotatedLine(input, entity); } catch (BadLocationException e) { - AbstractUtility.error(getClass(), "Problems creating annotated line: ", e); + MessagingUtils.error(getClass(), "Problems creating annotated line: ", e); } } } @@ -206,7 +206,7 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider { } document.replace(offset, lineLength, text); } catch (BadLocationException e) { - AbstractUtility.error(getClass(), "Problem updating annotated line: " ,e); + MessagingUtils.error(getClass(), "Problem updating annotated line: " ,e); } } @@ -363,13 +363,13 @@ public class AnnotatedLineDocumentProvider extends AbstractDocumentProvider { length += 2; } } catch (BadLocationException e1) { - AbstractUtility.error(getClass(), "Problems removing annotated line", e1); + MessagingUtils.error(getClass(), "Problems removing annotated line", e1); } try { document.replace(offset, length, ""); } catch (BadLocationException e) { - AbstractUtility.error(getClass(), "Problems removing annotated line", e); + MessagingUtils.error(getClass(), "Problems removing annotated line", e); } } } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotationModel.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotationModel.java index 6056d0c6d..f48b073e6 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotationModel.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/LineAnnotationModel.java @@ -26,7 +26,7 @@ import org.eclipse.jface.text.source.Annotation; import org.eclipse.jface.text.source.AnnotationModel; import org.eclipse.jface.text.source.AnnotationModelEvent; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * An AnnotationModel which holds LineAnnotation's. @@ -181,7 +181,7 @@ public class LineAnnotationModel extends AnnotationModel { *

printAnnotations

*/ public void printAnnotations() { - Logger logger = BulkEditorUtil.getLog4JLogger(getClass()); + Logger logger = MessagingUtils.getLog4JLogger(getClass()); logger.debug("------------------------"); logger.debug("Active annotations"); logger.debug("------------------------"); diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java index d244ab961..8444de4f4 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/DynamicMarkerTypeEditingMenu.java @@ -27,7 +27,7 @@ import org.eclipse.ui.actions.CompoundContributionItem; import org.eclipse.ui.handlers.IHandlerService; import eu.etaxonomy.cdm.model.common.MarkerType; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -88,13 +88,13 @@ public class DynamicMarkerTypeEditingMenu extends CompoundContributionItem { event.data = new Object[]{markerType, flag}; handlerService.executeCommand("taxeditor-bulkeditor.command.setMarkerFlag", event); } catch (ExecutionException e) { - BulkEditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } catch (NotDefinedException e) { - BulkEditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } catch (NotEnabledException e) { - BulkEditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } catch (NotHandledException e) { - BulkEditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java index a1b78438c..4402368b6 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/handler/AbstractAddDerivedUnitFacadeMediaHandler.java @@ -26,6 +26,7 @@ import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; import eu.etaxonomy.taxeditor.bulkeditor.derivedunit.operation.AddDerivedUnitFacadeMediaOperation; import eu.etaxonomy.taxeditor.bulkeditor.input.OccurrenceEditorInput; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -61,7 +62,7 @@ public abstract class AbstractAddDerivedUnitFacadeMediaHandler extends AbstractH AbstractPostOperation operation = new AddDerivedUnitFacadeMediaOperation(event.getCommand().getName(), BulkEditorUtil.getUndoContext(), (DerivedUnit) element, getMode(), postOperationEnabled); BulkEditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - BulkEditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java index e673e513c..41948253e 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/derivedunit/operation/AddDerivedUnitFacadeMediaOperation.java @@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.api.facade.DerivedUnitFacadeNotSupportedException; import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.description.SpecimenDescription; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -64,7 +64,7 @@ public class AddDerivedUnitFacadeMediaOperation extends createImageGallery(facade); } catch (DerivedUnitFacadeNotSupportedException e) { - BulkEditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } return postExecute(derivedUnit); 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 8e4759ab6..73c2c8022 100644 --- 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 @@ -46,7 +46,7 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityPersistenceService; import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotation; import eu.etaxonomy.taxeditor.annotatedlineeditor.LineAnnotationModel; import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -119,17 +119,17 @@ public class DeleteHandler extends AbstractHandler { result = service.delete((TeamOrPersonBase)object); } } catch (Exception e){ - BulkEditorUtil.errorDialog("Could not delete", getClass(), e.getMessage(), null); + MessagingUtils.messageDialog("Could not delete", getClass(), e.getMessage(), null); } if (result.isError()){ - BulkEditorUtil.errorDialog("Could not delete", getClass(), result.getExceptions().get(0).getMessage(), null); + MessagingUtils.messageDialog("Could not delete", getClass(), result.getExceptions().get(0).getMessage(), null); } ((BulkEditor) editor).removeAnnotatedLine(annotation); } } }else{ - BulkEditorUtil.warningDialog("Feature not enabled", getClass(), "Deletion is currently an experimental feature." + + MessagingUtils.warningDialog("Feature not enabled", getClass(), "Deletion is currently an experimental feature." + "Enable it via Preferences at your own risk."); } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java index 0e4206463..8936ca856 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java @@ -34,7 +34,7 @@ import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorQuery; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.CdmBaseSortProvider; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.TitleCacheComparator; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -226,7 +226,7 @@ public abstract class AbstractBulkEditorInput implements IEd try { CdmStore.getService(ICommonService.class).merge((IMergable)mergeTarget, (IMergable)entity, null); } catch (MergeException e) { - AbstractUtility.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } return true; diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java index 1956b9476..a317feca1 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/NameRelationshipEditorInput.java @@ -17,7 +17,7 @@ import java.util.UUID; import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; import eu.etaxonomy.cdm.model.name.NameRelationship; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -114,7 +114,7 @@ public class NameRelationshipEditorInput extends AbstractBulkEditorInput createEntityCreator() { - BulkEditorUtil.notImplementedMessage(getClass()); + MessagingUtils.notImplementedMessage(getClass()); return null; } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java index 92d94ee4a..0bdd381a6 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java @@ -17,7 +17,7 @@ import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.model.reference.ReferenceFactory; import eu.etaxonomy.cdm.model.reference.ReferenceType; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** *

ReferenceCreator class.

@@ -93,7 +93,7 @@ public class ReferenceCreator implements IEntityCreator { reference = ReferenceFactory.newWebPage(); } if (reference == null) { - BulkEditorUtil.warn(getClass(), "Reference type " + key + " not found. Creating reference with default type."); + MessagingUtils.warn(getClass(), "Reference type " + key + " not found. Creating reference with default type."); reference = ReferenceFactory.newGeneric(); } reference.setTitleCache(text, true); diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java index d092ce03a..aba437843 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/UserCreator.java @@ -18,7 +18,7 @@ import org.springframework.security.access.AccessDeniedException; import eu.etaxonomy.cdm.api.service.IUserService; import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; -import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -46,7 +46,7 @@ public class UserCreator implements IEntityCreator{ CdmStore.getService(IUserService.class).createUser(user); return user; } catch (AccessDeniedException e){ - BulkEditorUtil.errorDialog("Access denied", getClass(), e.getMessage(), e); + MessagingUtils.messageDialog("Access denied", getClass(), e.getMessage(), e); return null; } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java index 85682be0d..96defc845 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java @@ -25,6 +25,7 @@ import eu.etaxonomy.taxeditor.editor.view.concept.ConceptViewPart; import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart; import eu.etaxonomy.taxeditor.editor.view.media.MediaViewPart; import eu.etaxonomy.taxeditor.model.ContextListenerAdapter; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.view.AbstractCdmEditorViewPart; /** @@ -140,7 +141,7 @@ public class EditorStateManager extends ContextListenerAdapter { try { EditorUtil.open(input); } catch (PartInitException e) { - EditorUtil.error(getClass(), "Error opening an editor window", e); + MessagingUtils.error(getClass(), "Error opening an editor window", e); } } subProgressMonitor.worked(1); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java index 4c79beba1..a55a03de3 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/MultiPageTaxonEditor.java @@ -38,6 +38,7 @@ import eu.etaxonomy.taxeditor.model.IDataChangeBehavior; import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider; import eu.etaxonomy.taxeditor.model.IPartContentHasDetails; import eu.etaxonomy.taxeditor.model.IPartContentHasFactualData; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; /** @@ -109,7 +110,7 @@ public class MultiPageTaxonEditor extends FormEditor implements // EditorUtil.showPropertySheet(); } catch (PartInitException e) { - AbstractUtility.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } @@ -142,10 +143,10 @@ public class MultiPageTaxonEditor extends FormEditor implements monitor.worked(1); this.setDirty(false); - monitor.worked(1); + monitor.worked(1); } catch (Exception e) { setFocus(); - AbstractUtility.dialogForAbortedOperation(e, this, "saving a taxon", " Please close and reopen the taxon again."); + MessagingUtils.operationDialog(this, e, "saving a taxon", " Please close and reopen the taxon again."); disableEditor(true); } finally { monitor.done(); @@ -416,10 +417,10 @@ public class MultiPageTaxonEditor extends FormEditor implements if (editor instanceof IPostOperationEnabled) { ((IPostOperationEnabled) editor).postOperation(objectAffectedByOperation); } else { - AbstractUtility.warn(getClass(), "postOperation not enabled for editor " + editor); + MessagingUtils.warn(getClass(), "postOperation not enabled for editor " + editor); } } - AbstractUtility.warn(getClass(), "postOperation called on MultiPageTaxonEditor. Can you make it more specific?"); + MessagingUtils.warn(getClass(), "postOperation called on MultiPageTaxonEditor. Can you make it more specific?"); return false; } @@ -499,7 +500,7 @@ public class MultiPageTaxonEditor extends FormEditor implements */ public void reload() { if (isDirty()) { - AbstractUtility.warningDialog("Editor has unsaved data", getClass(), "This editor can not be " + MessagingUtils.warningDialog("Editor has unsaved data", getClass(), "This editor can not be " + "refreshed because it contains unsaved data. Refreshing " + "this editor would discard the changes. Please save this editor, " + "close and reopen it manually in order to get the latest content"); @@ -517,7 +518,7 @@ public class MultiPageTaxonEditor extends FormEditor implements editorPart.redraw(); } } catch (Exception e) { - AbstractUtility.errorDialog("Error refreshing editor", getClass(), "Could not refresh this editor", e); + MessagingUtils.messageDialog("Error refreshing editor", getClass(), "Could not refresh this editor", e); } } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java index 2dfc5b7d6..b331b88f5 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInput.java @@ -34,6 +34,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.model.DataChangeBridge; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -90,7 +91,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(taxonNodeUuid, null); if(taxonNode == null){ - EditorUtil.warningDialog("Not yet implemented", TaxonEditorInput.class, "Selected element is not type TaxonBase."); + MessagingUtils.warningDialog("Not yet implemented", TaxonEditorInput.class, "Selected element is not type TaxonBase."); return null; } @@ -111,14 +112,14 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).find(taxonBaseUuid); if (taxonBase != null){ if(taxonBase.isOrphaned()) { - EditorUtil.warningDialog("Orphaned Taxon", TaxonEditorInput.class, "This is an orphaned taxon i.e. a taxon that is not connected to a classification and not having any taxonomic relationships. Editing of orphaned taxon is currently not supported."); + MessagingUtils.warningDialog("Orphaned Taxon", TaxonEditorInput.class, "This is an orphaned taxon i.e. a taxon that is not connected to a classification and not having any taxonomic relationships. Editing of orphaned taxon is currently not supported."); } else if(taxonBase.isInstanceOf(Taxon.class)){ Taxon taxon = CdmBase.deproxy(taxonBase, Taxon.class); if (taxon.getTaxonNodes().size() == 0 && taxon.isMisapplication()){ // TODO get accepted taxon - EditorUtil.info("trying to open Mispplied Name "); + MessagingUtils.info("trying to open Mispplied Name "); Set acceptedTaxa = new HashSet(); Set relations = taxon.getRelationsFromThisTaxon(); @@ -158,7 +159,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe } }else if(taxonNodes.size() == 0){ // this is an undesired state - EditorUtil.warningDialog("Incorrect state", TaxonEditorInput.class, "The accepted taxon is not part of any classification. This should not have happened."); + MessagingUtils.warningDialog("Incorrect state", TaxonEditorInput.class, "The accepted taxon is not part of any classification. This should not have happened."); } return null; } @@ -176,7 +177,7 @@ public class TaxonEditorInput implements IEditorInput, IConversationEnabled, IPe return getInputForMultipleNodes(conversation, taxonNodes); }else if(taxa.size() == 0){ // this is an undesired state - EditorUtil.warningDialog("Incorrect state", TaxonEditorInput.class, "Trying to open accepted taxon for a synonym or misapplication but" + + MessagingUtils.warningDialog("Incorrect state", TaxonEditorInput.class, "Trying to open accepted taxon for a synonym or misapplication but" + " no accepted taxa are present. This should not have happened."); } return null; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java index c5457f4d1..7ee5da308 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/TaxonEditorInputFactory.java @@ -17,6 +17,7 @@ import org.eclipse.ui.IElementFactory; import org.eclipse.ui.IMemento; import eu.etaxonomy.cdm.api.service.IClassificationService; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -51,13 +52,13 @@ public class TaxonEditorInputFactory implements IElementFactory { return null; } if (taxonNodeUuid == null || CdmStore.getService(IClassificationService.class).getTaxonNodeByUuid(UUID.fromString(taxonNodeUuid)) == null) { - EditorUtil.warn(this.getClass(), "Couldn't find taxon node with UUID " + taxonNodeUuid); + MessagingUtils.warn(this.getClass(), "Couldn't find taxon node with UUID " + taxonNodeUuid); return null; } try { return TaxonEditorInput.NewInstance(UUID.fromString(taxonNodeUuid)); } catch (Exception e) { - EditorUtil.warningDialog("Could not create element", TaxonEditorInputFactory.class, e.getMessage()); + MessagingUtils.warningDialog("Could not create element", TaxonEditorInputFactory.class, e.getMessage()); } return null; } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java index d22a6a609..bbfd58800 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/UseObjectManager.java @@ -27,8 +27,8 @@ import eu.etaxonomy.cdm.model.description.FeatureNode; import eu.etaxonomy.cdm.model.description.FeatureTree; import eu.etaxonomy.cdm.model.description.State; import eu.etaxonomy.taxeditor.model.ContextListenerAdapter; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** * The context listener will call this class when the uses view is being loaded. @@ -47,7 +47,7 @@ public class UseObjectManager extends ContextListenerAdapter{ @Override public void contextRefresh(IProgressMonitor monitor) { monitor.subTask("Refreshing the Uses View"); - StoreUtil.warn(getClass(), "Refreshing Uses View warn"); + MessagingUtils.warn(getClass(), "Refreshing Uses View warn"); setupNecessaryItems(monitor); } @@ -55,7 +55,7 @@ public class UseObjectManager extends ContextListenerAdapter{ @Override public void contextStart(IMemento memento, IProgressMonitor monitor) { monitor.subTask("Starting the Uses View"); - StoreUtil.warn(getClass(), "Starting Uses View warn"); + MessagingUtils.warn(getClass(), "Starting Uses View warn"); setupNecessaryItems(monitor); } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/handler/EditCdmAuthoritiesHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/handler/EditCdmAuthoritiesHandler.java index 3d1940a64..71a9b0c77 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/handler/EditCdmAuthoritiesHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/handler/EditCdmAuthoritiesHandler.java @@ -23,6 +23,7 @@ import eu.etaxonomy.taxeditor.bulkeditor.BulkEditor; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.group.authority.CdmAuthorityEditor; import eu.etaxonomy.taxeditor.model.LineSelection; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** @@ -63,7 +64,7 @@ public class EditCdmAuthoritiesHandler extends AbstractHandler { try { EditorUtil.openCdmAuthorities(((Group)selectedObject).getUuid()); } catch (Exception e) { - EditorUtil.warningDialog("Could not open CDM Authority Editor", EditorUtil.class, e.getMessage()); + MessagingUtils.warningDialog("Could not open CDM Authority Editor", EditorUtil.class, e.getMessage()); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java index 5ffa7eec0..cc2bbf047 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenChecklistEditorHandler.java @@ -14,6 +14,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonNode; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditorInput; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; @@ -41,9 +42,9 @@ public class OpenChecklistEditorHandler extends AbstractHandler { try { EditorUtil.open(input); } catch (PartInitException e) { - AbstractUtility.error(OpenChecklistEditorHandler.class, "Could not open ChecklistView", e); + MessagingUtils.error(OpenChecklistEditorHandler.class, "Could not open ChecklistView", e); } catch (NullPointerException npe) { - AbstractUtility.errorDialog("Failed to open Editor", OpenChecklistEditorHandler.class, + MessagingUtils.messageDialog("Failed to open Editor", OpenChecklistEditorHandler.class, "Could not open ChecklistView. The hierarchy is corrupted!", npe); } } else if (selectedElement instanceof TaxonNode) { @@ -51,9 +52,9 @@ public class OpenChecklistEditorHandler extends AbstractHandler { try { EditorUtil.open(input); } catch (PartInitException e) { - AbstractUtility.error(OpenChecklistEditorHandler.class, "Could not open ChecklistView", e); + MessagingUtils.error(OpenChecklistEditorHandler.class, "Could not open ChecklistView", e); } catch (NullPointerException npe) { - AbstractUtility.errorDialog("Failed to open Editor", OpenChecklistEditorHandler.class, + MessagingUtils.messageDialog("Failed to open Editor", OpenChecklistEditorHandler.class, "Could not open ChecklistView. The hierarchy is corrupted!", npe); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java index a718ba5b0..d6f0df7e6 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenDerivateViewHandler.java @@ -11,7 +11,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateViewEditorInput; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; public class OpenDerivateViewHandler extends AbstractHandler { @@ -29,9 +29,9 @@ public class OpenDerivateViewHandler extends AbstractHandler { try { EditorUtil.open(input); } catch (PartInitException e) { - AbstractUtility.error(OpenDerivateViewHandler.class, "Could not open DerivateView", e); + MessagingUtils.error(OpenDerivateViewHandler.class, "Could not open DerivateView", e); } catch (NullPointerException npe){ - AbstractUtility.errorDialog("Failed to open Editor", OpenDerivateViewHandler.class, "Could not open DerivateView. The derivate hierarchy is corrupted!", npe); + MessagingUtils.messageDialog("Failed to open Editor", OpenDerivateViewHandler.class, "Could not open DerivateView. The derivate hierarchy is corrupted!", npe); } } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java index 2b562ca00..f8e3350a4 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/OpenParentHandler.java @@ -18,6 +18,7 @@ import org.eclipse.ui.PartInitException; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** *

OpenParentHandler class.

@@ -41,7 +42,7 @@ public class OpenParentHandler extends AbstractHandler implements IHandler { } catch (PartInitException e) { throw new RuntimeException("Error opening parent taxon", e); } catch (Exception e) { - EditorUtil.warningDialog("Could not create Taxon", this, e.getMessage()); + MessagingUtils.warningDialog("Could not create Taxon", this, e.getMessage()); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java index 0886e1fc2..51b81499f 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/KeyEditor.java @@ -19,12 +19,12 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.model.description.PolytomousKey; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; -import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyGraphEditor; import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyListEditor; import eu.etaxonomy.taxeditor.model.DataChangeBridge; import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider; import eu.etaxonomy.taxeditor.model.IPartContentHasDetails; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * @author n.hoffmann @@ -192,7 +192,7 @@ public class KeyEditor extends FormEditor implements IConversationEnabled, addPage(1, new PolytomousKeyGraphEditor(this), input); setPageText(1, "Graph"); } catch (PartInitException e) { - EditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } 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 35015c699..5ef5246d8 100644 --- 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 @@ -46,6 +46,7 @@ import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.key.KeyEditor; import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * @author n.hoffmann @@ -88,7 +89,7 @@ public class PolytomousKeyListEditor extends EditorPart implements try { EditorUtil.openTaxonBase((taxon).getUuid()); } catch (PartInitException e) { - EditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateChildNodeHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateChildNodeHandler.java index c65115942..e9df7653e 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateChildNodeHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateChildNodeHandler.java @@ -20,6 +20,7 @@ import eu.etaxonomy.taxeditor.editor.key.KeyEditor; import eu.etaxonomy.taxeditor.editor.key.polytomous.IPolytomousKeyEditorPage; import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyListEditor; import eu.etaxonomy.taxeditor.editor.key.polytomous.operation.CreateNodeOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; /** @@ -57,7 +58,7 @@ public class CreateChildNodeHandler extends AbstractHandler { label, undoContext, pk.getRoot(), editorPage); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } else { @@ -76,7 +77,7 @@ public class CreateChildNodeHandler extends AbstractHandler { label, undoContext, keyNode, editorPage); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } else { MessageDialog.openInformation( diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateSiblingNodeHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateSiblingNodeHandler.java index 74cd04b4a..f0c00125a 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateSiblingNodeHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/CreateSiblingNodeHandler.java @@ -17,6 +17,7 @@ import eu.etaxonomy.taxeditor.editor.key.KeyEditor; import eu.etaxonomy.taxeditor.editor.key.polytomous.IPolytomousKeyEditorPage; import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyListEditor; import eu.etaxonomy.taxeditor.editor.key.polytomous.operation.CreateNodeOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; /** @@ -60,7 +61,7 @@ public class CreateSiblingNodeHandler extends AbstractHandler { label, undoContext, keyNode.getParent(), editorPage); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } else { MessageDialog.openInformation( diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java index b027da92a..f65f3fdc4 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/DeleteNodeHandler.java @@ -25,6 +25,7 @@ import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.key.KeyEditor; import eu.etaxonomy.taxeditor.editor.key.polytomous.IPolytomousKeyEditorPage; import eu.etaxonomy.taxeditor.editor.key.polytomous.operation.DeleteNodeOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; /** @@ -66,7 +67,7 @@ public class DeleteNodeHandler extends AbstractHandler { } } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } else { MessageDialog.openInformation( diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/RefreshNodeNumberingHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/RefreshNodeNumberingHandler.java index 9ba957882..e077a60ae 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/RefreshNodeNumberingHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/polytomous/handler/RefreshNodeNumberingHandler.java @@ -17,6 +17,7 @@ import eu.etaxonomy.taxeditor.editor.key.polytomous.IPolytomousKeyEditorPage; import eu.etaxonomy.taxeditor.editor.key.polytomous.PolytomousKeyListEditor; import eu.etaxonomy.taxeditor.editor.key.polytomous.operation.CreateNodeOperation; import eu.etaxonomy.taxeditor.editor.key.polytomous.operation.RefreshNodeNumberingOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; public class RefreshNodeNumberingHandler extends AbstractHandler { @@ -46,7 +47,7 @@ public class RefreshNodeNumberingHandler extends AbstractHandler { label, undoContext, keyNode, editorPage); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/SynonymContainer.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/SynonymContainer.java index e69cf6ebd..a267b0cb0 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/SynonymContainer.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/SynonymContainer.java @@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.model.name.NomenclaturalStatusType; import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.taxeditor.editor.EditorUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.Resources; /** @@ -61,7 +62,7 @@ public class SynonymContainer extends AbstractGroupedContainer { setFont(getViewerFont()); if(getName() == null){ - EditorUtil.warn(getClass(), "Synonym with a null name detected. This should never happen."); + MessagingUtils.warn(getClass(), "Synonym with a null name detected. This should never happen."); } initTextViewer(); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDropTargetListener.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDropTargetListener.java index 18dd1c771..dc2f9bc37 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDropTargetListener.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/dnd/NameEditorDropTargetListener.java @@ -24,6 +24,7 @@ import eu.etaxonomy.taxeditor.editor.name.operation.ChangeConceptRelationshipTyp import eu.etaxonomy.taxeditor.editor.name.operation.ChangeConceptToSynonymOperation; import eu.etaxonomy.taxeditor.editor.name.operation.ChangeHomotypicGroupOperation; import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToMisapplicationOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; /** @@ -77,7 +78,7 @@ public class NameEditorDropTargetListener extends DropTargetAdapter { // Execute operation if it has been initiated if (operation == null) { - EditorUtil.warn(getClass(), "User unsuccessfully tried to drop: " + taxonBase.getClass() + + MessagingUtils.warn(getClass(), "User unsuccessfully tried to drop: " + taxonBase.getClass() + ". Target: " + target); dropTargetEvent.detail = DND.DROP_NONE; } else { diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java index 72a08ae9f..e76b8475e 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java @@ -35,6 +35,7 @@ import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; import eu.etaxonomy.taxeditor.editor.name.operation.ChangeSynonymToAcceptedTaxonOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.ui.dialog.selection.TaxonNodeSelectionDialog; @@ -133,7 +134,7 @@ public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler impleme // TODO Auto-generated catch block e.printStackTrace(); } catch (Exception e) { - EditorUtil.warningDialog("Could not create Taxon", this, e.getMessage()); + MessagingUtils.warningDialog("Could not create Taxon", this, e.getMessage()); } } return true; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateHomotypicSynonymHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateHomotypicSynonymHandler.java index 514d9dcae..9f76a0967 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateHomotypicSynonymHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/CreateHomotypicSynonymHandler.java @@ -22,6 +22,7 @@ import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.Page; import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor; import eu.etaxonomy.taxeditor.editor.name.operation.CreateSynonymInExistingHomotypicalGroupOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.parser.ParseHandler; @@ -52,7 +53,7 @@ public class CreateHomotypicSynonymHandler extends AbstractHandler implements editor.getUndoContext(), taxon, group, newSynonymName, editor); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/DeleteTaxonBaseHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/DeleteTaxonBaseHandler.java index ee188ef28..86240cb15 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/DeleteTaxonBaseHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/DeleteTaxonBaseHandler.java @@ -29,6 +29,7 @@ import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor; import eu.etaxonomy.taxeditor.editor.name.operation.DeleteMisapplicationOperation; import eu.etaxonomy.taxeditor.editor.name.operation.DeleteSynonymOperation; import eu.etaxonomy.taxeditor.editor.name.operation.DeleteTaxonOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -69,7 +70,7 @@ public class DeleteTaxonBaseHandler extends AbstractHandler implements IHandler, try { commandName = event.getCommand().getName(); } catch (NotDefinedException e) { - EditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } // synonym diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SwapSynonymAndAcceptedHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SwapSynonymAndAcceptedHandler.java index 55c685bdf..d8c0e370f 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SwapSynonymAndAcceptedHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/SwapSynonymAndAcceptedHandler.java @@ -26,6 +26,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor; import eu.etaxonomy.taxeditor.editor.name.operation.SwapSynonymAndAcceptedOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; /** @@ -102,7 +103,7 @@ public class SwapSynonymAndAcceptedHandler extends AbstractHandler implements EditorUtil.openTaxonBase(taxon.getUuid()); } catch (Exception e) { - EditorUtil.warningDialog("Could not open editor for taxon", this, e.getMessage()); + MessagingUtils.warningDialog("Could not open editor for taxon", this, e.getMessage()); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java index 850747b62..0b6fb5125 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java @@ -20,9 +20,9 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

ChangeConceptRelationshipTypeOperation class.

@@ -59,7 +59,7 @@ public class ChangeConceptRelationshipTypeOperation extends AbstractPostTaxonOpe Set taxonRelationships = taxon.getTaxonRelations(relatedTaxon); if(taxonRelationships.size() > 1){ - StoreUtil.warningDialog("Multiple relations between taxa", this, "There are multiple relations between the " + + MessagingUtils.warningDialog("Multiple relations between taxa", this, "There are multiple relations between the " + "accepted and the related taxon. This case is not handled by the software yet"); return; } @@ -108,7 +108,7 @@ public class ChangeConceptRelationshipTypeOperation extends AbstractPostTaxonOpe public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { // see FIXME in execute() - StoreUtil.warn(this.getClass(), "Not implemented yet. See developer documentation for details"); + MessagingUtils.warn(this.getClass(), "Not implemented yet. See developer documentation for details"); return null; } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java index 3219c650c..e36579916 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java @@ -26,10 +26,10 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

ChangeConceptToSynonymOperation class.

@@ -69,7 +69,7 @@ public class ChangeConceptToSynonymOperation extends Set taxonRelationships = taxon.getTaxonRelations(concept); if(taxonRelationships.size() > 1){ - StoreUtil.warningDialog("Multiple relations between taxa", this, "There are multiple relations between the " + + MessagingUtils.warningDialog("Multiple relations between taxa", this, "There are multiple relations between the " + "accepted and the related taxon. This case is not handled by the software yet"); return; } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java index 38a318d6f..316af1d4c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java @@ -25,7 +25,7 @@ import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonNode; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPersistentPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -80,7 +80,7 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos try { newTaxon = CdmStore.getService(ITaxonService.class).changeSynonymToAcceptedTaxon(synonym, element, true, true, null, null); } catch (HomotypicalGroupChangeException e) { - AbstractUtility.warningDialog("Operation may lead to inconsistent data", getClass(), e.getMessage()); + MessagingUtils.warningDialog("Operation may lead to inconsistent data", getClass(), e.getMessage()); return postExecute(null); } monitor.worked(20); @@ -120,7 +120,7 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos throws ExecutionException { // TODO implement - biggest problem is that any window open for new taxon must be closed first - AbstractUtility.warn(this.getClass(), "Not yet implemented"); + MessagingUtils.warn(this.getClass(), "Not yet implemented"); return postExecute(element); } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java index a30c1f9d3..1c7da40a8 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java @@ -20,10 +20,10 @@ import eu.etaxonomy.cdm.api.service.ITaxonService; import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.SynonymRelationshipType; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

SwapSynonymAndAcceptedOperation class.

@@ -89,7 +89,7 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostTaxonOperation @Override public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - StoreUtil.error(this.getClass(), "Not yet implemented", null); + MessagingUtils.error(this.getClass(), "Not yet implemented", null); return null; } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/handler/CreateDescriptionElementHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/handler/CreateDescriptionElementHandler.java index b358658e2..318a4468c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/handler/CreateDescriptionElementHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/handler/CreateDescriptionElementHandler.java @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateDescriptionElementOperation; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -76,10 +77,10 @@ public class CreateDescriptionElementHandler extends AbstractHandler { operation = operationCreationInstance(event.getCommand().getName(), event, description, postOperationEnabled); AbstractUtility.executeOperation(operation); } catch (NotDefinedException e) { - AbstractUtility.warn(getClass(), "Command name not set"); + MessagingUtils.warn(getClass(), "Command name not set"); } } else { - AbstractUtility.error(getClass(), new IllegalArgumentException("Could not determine the taxon description")); + MessagingUtils.error(getClass(), new IllegalArgumentException("Could not determine the taxon description")); return null; } return null; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/handler/CreateDescriptionHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/handler/CreateDescriptionHandler.java index 2ad00da8b..a95e327d1 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/handler/CreateDescriptionHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/handler/CreateDescriptionHandler.java @@ -27,6 +27,7 @@ import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateSpecimenDescriptionOperation; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateTaxonDescriptionOperation; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -62,7 +63,7 @@ public class CreateDescriptionHandler extends AbstractHandler { operation = createTaxonOperation(event.getCommand().getName(), taxon, postOperationEnabled); AbstractUtility.executeOperation(operation); } catch (NotDefinedException e) { - AbstractUtility.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } // specimen description @@ -73,7 +74,7 @@ public class CreateDescriptionHandler extends AbstractHandler { operation = new CreateSpecimenDescriptionOperation(event.getCommand().getName(), EditorUtil.getUndoContext(), (SpecimenOrObservationBase) viewerInput, postOperationEnabled); AbstractUtility.executeOperation(operation); } catch (NotDefinedException e) { - AbstractUtility.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/AbstractDynamicConceptRelationMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/AbstractDynamicConceptRelationMenu.java index defca9003..2d63caf0d 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/AbstractDynamicConceptRelationMenu.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/AbstractDynamicConceptRelationMenu.java @@ -12,8 +12,8 @@ import org.eclipse.swt.widgets.MenuItem; import org.eclipse.ui.handlers.IHandlerService; import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType; -import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -68,7 +68,7 @@ public abstract class AbstractDynamicConceptRelationMenu extends ContributionIte try { handlerService.executeCommand(getCommandName(), event); } catch (Exception e) { - EditorUtil.error(getClass(), "Error executing command", e); + MessagingUtils.error(getClass(), "Error executing command", e); } } }); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java index 533d3b886..976aaa42b 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/CreateConceptRelationHandler.java @@ -27,6 +27,7 @@ import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.Page; import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor; import eu.etaxonomy.taxeditor.editor.view.concept.operation.CreateConceptRelationOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.model.TaxonRelationshipTypeInverseContainer; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -74,7 +75,7 @@ public class CreateConceptRelationHandler extends AbstractHandler { editor.getUndoContext(), editor.getTaxon(), relatedConcept, typeInverseContainer, postOperationEnabled); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set"); + MessagingUtils.warn(getClass(), "Command name not set"); } return null; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/DeleteConceptRelationHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/DeleteConceptRelationHandler.java index bc5a8eb65..b9a93dfde 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/DeleteConceptRelationHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/DeleteConceptRelationHandler.java @@ -28,6 +28,7 @@ import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.Page; import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor; import eu.etaxonomy.taxeditor.editor.view.concept.operation.DeleteConceptRelationOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -70,7 +71,7 @@ public class DeleteConceptRelationHandler extends AbstractHandler { editor.getUndoContext(), editor.getTaxon(), relations, postOperationEnabled); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set"); + MessagingUtils.warn(getClass(), "Command name not set"); } return null; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java index 502d9b94b..dcc1b44fb 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/handler/OpenRelatedConceptHandler.java @@ -24,6 +24,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * @author n.hoffmann @@ -53,7 +54,7 @@ public class OpenRelatedConceptHandler extends AbstractHandler { try { EditorUtil.openTaxonBase(relatedTaxon.getUuid()); } catch (PartInitException e) { - EditorUtil.errorDialog("Could not open taxon", getClass(), + MessagingUtils.messageDialog("Could not open taxon", getClass(), String.format("Could not open the taxon: %s" ,relatedTaxon), e); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDragListener.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDragListener.java index 72debf1d1..c597eca6c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDragListener.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDragListener.java @@ -15,7 +15,7 @@ import org.eclipse.swt.dnd.DragSourceAdapter; import org.eclipse.swt.dnd.DragSourceEvent; import eu.etaxonomy.taxeditor.editor.EditorUtil; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * @author pplitzner @@ -51,7 +51,7 @@ public class DerivateDragListener extends DragSourceAdapter{ public void dragStart(DragSourceEvent event) { if(derivateView.isDirty()){ event.doit = false; - AbstractUtility.warningDialog("View has unsaved changes", this, "You need to save before performing this action"); + MessagingUtils.warningDialog("View has unsaved changes", this, "You need to save before performing this action"); return; } ISelection selection = derivateView.getViewer().getSelection(); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDropListener.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDropListener.java index 384904181..66bcff1ec 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDropListener.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateDropListener.java @@ -22,7 +22,7 @@ import eu.etaxonomy.cdm.model.molecular.SingleRead; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.editor.EditorUtil; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.view.derivateSearch.DerivateLabelProvider; @@ -49,7 +49,7 @@ public class DerivateDropListener extends ViewerDropAdapter { @Override public boolean performDrop(Object data) { if(derivateView.isDirty()){ - AbstractUtility.warningDialog("View has unsaved changes", this, "You need to save before performing this action"); + MessagingUtils.warningDialog("View has unsaved changes", this, "You need to save before performing this action"); return false; } Object target = getCurrentTarget(); @@ -76,7 +76,7 @@ public class DerivateDropListener extends ViewerDropAdapter { return true; } else{ - AbstractUtility.warningDialog("Moving derivate not possible!", derivateView, "Moving \""+DerivateLabelProvider.getDerivateText(draggednode)+"\" to \""+DerivateLabelProvider.getDerivateText(targetNode)+"\" is not possible!"); + MessagingUtils.warningDialog("Moving derivate not possible!", derivateView, "Moving \""+DerivateLabelProvider.getDerivateText(draggednode)+"\" to \""+DerivateLabelProvider.getDerivateText(targetNode)+"\" is not possible!"); } } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java index 71abe76c5..18f89f0f0 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/DerivateViewEditorInput.java @@ -22,7 +22,7 @@ import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.FieldUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.taxeditor.editor.EditorUtil; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -70,7 +70,7 @@ public class DerivateViewEditorInput implements IEditorInput, IPersistable { } } if(root==null){ - AbstractUtility.errorDialog("Failed initializing editor", DerivateViewEditorInput.class, "No root element found!"); + MessagingUtils.messageDialog("Failed initializing editor", DerivateViewEditorInput.class, "No root element found!"); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/SingleReadSequenceContextMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/SingleReadSequenceContextMenu.java index 3b8caea01..b3164a458 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/SingleReadSequenceContextMenu.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/contextMenu/SingleReadSequenceContextMenu.java @@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.model.molecular.Sequence; import eu.etaxonomy.cdm.model.molecular.SingleRead; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; /** @@ -100,7 +100,7 @@ public class SingleReadSequenceContextMenu extends CompoundContributionItem { switch (commandType) { case REMOVE_FROM_SEQUENCE: if(activeEditor.isDirty()){ - AbstractUtility.warningDialog("View has unsaved changes", this, "You need to save before performing this action"); + MessagingUtils.warningDialog("View has unsaved changes", this, "You need to save before performing this action"); return; } if(selectedTreeNode!=null && selectedTreeNode.getParent()!=null && @@ -118,7 +118,7 @@ public class SingleReadSequenceContextMenu extends CompoundContributionItem { break; case ADD_TO_SEQUENCE: if(activeEditor.isDirty()){ - AbstractUtility.warningDialog("View has unsaved changes", this, "You need to save before performing this action"); + MessagingUtils.warningDialog("View has unsaved changes", this, "You need to save before performing this action"); return; } if(clipBoardTreeNode!=null && clipBoardTreeNode.getValue() instanceof SingleRead diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementDropAdapter.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementDropAdapter.java index ce60deeca..488cc775b 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementDropAdapter.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptionElementDropAdapter.java @@ -22,8 +22,8 @@ import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.cdm.model.description.TaxonDescription; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionElementsOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** * @author n.hoffmann @@ -54,7 +54,7 @@ public class DescriptionElementDropAdapter extends ViewerDropAdapter { // cannot drop a feature node onto itself for (Object droppedElement : droppedElements) { if (droppedElement == null){ - StoreUtil.warningDialog("Operation not supported yet", this, "We are currently unable to drag and drop a newly created element. Please save the editor to make this work."); + MessagingUtils.warningDialog("Operation not supported yet", this, "We are currently unable to drag and drop a newly created element. Please save the editor to make this work."); return false; } if(! (droppedElement instanceof DescriptionElementBase)){ diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java index d8b1bf94b..85d0ede84 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionElementHandler.java @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateDescriptionElementOperation; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -76,10 +77,10 @@ public class CreateDescriptionElementHandler extends AbstractHandler { operation = operationCreationInstance(event.getCommand().getName(), event, description, postOperationEnabled); AbstractUtility.executeOperation(operation); } catch (NotDefinedException e) { - AbstractUtility.warn(getClass(), "Command name not set"); + MessagingUtils.warn(getClass(), "Command name not set"); } } else { - AbstractUtility.error(getClass(), new IllegalArgumentException("Could not determine the taxon description")); + MessagingUtils.error(getClass(), new IllegalArgumentException("Could not determine the taxon description")); return null; } return null; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java index 165205e2e..2f3392406 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/CreateDescriptionHandler.java @@ -27,6 +27,7 @@ import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateSpecimenDescriptionOperation; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateTaxonDescriptionOperation; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -62,7 +63,7 @@ public class CreateDescriptionHandler extends AbstractHandler { operation = createTaxonOperation(event.getCommand().getName(), taxon, postOperationEnabled); AbstractUtility.executeOperation(operation); } catch (NotDefinedException e) { - AbstractUtility.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } // specimen description @@ -73,7 +74,7 @@ public class CreateDescriptionHandler extends AbstractHandler { operation = new CreateSpecimenDescriptionOperation(event.getCommand().getName(), EditorUtil.getUndoContext(), (SpecimenOrObservationBase) viewerInput, postOperationEnabled); AbstractUtility.executeOperation(operation); } catch (NotDefinedException e) { - AbstractUtility.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } } 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 ce6aaef14..753f38769 100644 --- 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 @@ -32,6 +32,7 @@ import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteDescriptio import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.DeleteTaxonDescriptionOperation; import eu.etaxonomy.taxeditor.editor.view.media.operation.DeleteMediaOperation; import eu.etaxonomy.taxeditor.model.FeatureNodeContainer; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -92,7 +93,7 @@ public class DeleteHandler extends AbstractHandler { operations.add(new DeleteMediaOperation(label, undoContext, imageGallery, (Media) object, postOperationEnabled)); } else{ - EditorUtil.error(getClass(), "Selection is not valid for this delete handler", null); + MessagingUtils.error(getClass(), "Selection is not valid for this delete handler", null); } } @@ -102,7 +103,7 @@ public class DeleteHandler extends AbstractHandler { } } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java index 7c3a65669..d67e42169 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/DynamicFeatureMenu.java @@ -33,6 +33,7 @@ import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateDescriptionElementOperation; import eu.etaxonomy.taxeditor.model.FeatureNodeContainer; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -122,7 +123,7 @@ public class DynamicFeatureMenu extends CompoundContributionItem { handlerService.executeCommand( CreateDescriptionElementOperation.ID, event); } catch (Exception e) { - EditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } }); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java index 2ccfea947..0c2306ba6 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionElementsHandler.java @@ -34,6 +34,7 @@ import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.descriptive.DescriptiveViewPart; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionElementsOperation; import eu.etaxonomy.taxeditor.model.FeatureNodeContainer; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -104,7 +105,7 @@ public class MoveDescriptionElementsHandler extends AbstractHandler { CdmStore.getService(ITaxonService.class).saveOrUpdate(targetTaxon); } catch (NotDefinedException e) { - EditorUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionToOtherTaxonHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionToOtherTaxonHandler.java index 945af220e..726b217db 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionToOtherTaxonHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/handler/MoveDescriptionToOtherTaxonHandler.java @@ -33,6 +33,7 @@ import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.MoveDescriptionToOtherTaxonOperation; //import eu.etaxonomy.taxeditor.navigator.operation.ChangeAcceptedTaxonToSynonymOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.ui.dialog.selection.TaxonNodeSelectionDialog; @@ -128,10 +129,10 @@ public class MoveDescriptionToOtherTaxonHandler extends AbstractHandler } EditorUtil.openTaxonNode(newAcceptedTaxonNodeUuid); } catch (PartInitException e) { - EditorUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); throw new RuntimeException(e); } catch (Exception e) { - EditorUtil.warningDialog("Could not create Taxon", this, e.getMessage()); + MessagingUtils.warningDialog("Could not create Taxon", this, e.getMessage()); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java index 195e3d715..ed86d4b2b 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/DeleteDescriptionElementOperation.java @@ -17,9 +17,9 @@ import org.eclipse.core.runtime.IStatus; import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.description.DescriptionElementBase; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

DeleteDescriptionElementOperation class.

@@ -62,7 +62,7 @@ public class DeleteDescriptionElementOperation extends AbstractPostTaxonOperatio // Remove element from description if (description == null) { - StoreUtil.error(this.getClass(), "Couldn't find element's description!", null); + MessagingUtils.error(this.getClass(), "Couldn't find element's description!", null); } else { description.removeElement(element); } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/EditInXper2Handler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/EditInXper2Handler.java index c2607953e..5e2239599 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/EditInXper2Handler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/EditInXper2Handler.java @@ -7,7 +7,7 @@ import org.eclipse.core.commands.AbstractHandler; import org.eclipse.core.commands.ExecutionEvent; import org.eclipse.core.commands.ExecutionException; -import eu.etaxonomy.taxeditor.editor.EditorUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * @author n.hoffmann @@ -20,7 +20,7 @@ public class EditInXper2Handler extends AbstractHandler { */ @Override public Object execute(ExecutionEvent event) throws ExecutionException { - EditorUtil.warningDialog("Operation not supported yet", getClass(), "This operation is not supported yet."); + MessagingUtils.warningDialog("Operation not supported yet", getClass(), "This operation is not supported yet."); return null; } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java index bddcfbfea..751b34545 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java @@ -27,8 +27,8 @@ import eu.etaxonomy.cdm.model.description.SpecimenDescription; import eu.etaxonomy.cdm.model.media.Media; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.taxon.Taxon; -import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** *

MediaContentProvider class.

@@ -47,7 +47,7 @@ public class MediaContentProvider implements ITreeContentProvider{ if (parentElement instanceof TaxonEditorInput) { Taxon taxon = ((TaxonEditorInput) parentElement).getTaxon(); if(taxon == null){ - EditorUtil.error(getClass(), "Taxon is null", null); + MessagingUtils.error(getClass(), "Taxon is null", null); return NO_CHILDREN; } HashSet imageGalleries = new HashSet(); @@ -85,7 +85,7 @@ public class MediaContentProvider implements ITreeContentProvider{ return derivedUnitFacadeImageGalleries.toArray(); } catch (DerivedUnitFacadeNotSupportedException e) { - EditorUtil.error(this.getClass(), "DerivedUnitFacadeNotSupportedException when trying to instantiate DerivedUnitFacade", e); + MessagingUtils.error(this.getClass(), "DerivedUnitFacadeNotSupportedException when trying to instantiate DerivedUnitFacade", e); } } @@ -123,7 +123,7 @@ public class MediaContentProvider implements ITreeContentProvider{ if (elements != null) { // by definition, image galleries have only one description element if(elements.size() > 1){ - EditorUtil.error(this.getClass(), "There should be one and only one description element to hold the images. Found: " + elements.size() + " InDescription ID: " + description.getUuid(), null); + MessagingUtils.error(this.getClass(), "There should be one and only one description element to hold the images. Found: " + elements.size() + " InDescription ID: " + description.getUuid(), null); } DescriptionElementBase element = elements.iterator().next(); diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java index a18a10293..2739b337e 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/AddImageGalleryHandler.java @@ -16,6 +16,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; import eu.etaxonomy.taxeditor.editor.view.descriptive.operation.CreateTaxonDescriptionOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -48,7 +49,7 @@ public class AddImageGalleryHandler extends AbstractHandler { EditorUtil.getUndoContext(), taxon, postOperationEnabled, true); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } return null; diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/CreateMediaHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/CreateMediaHandler.java index a03c9a363..b2aeebf4d 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/CreateMediaHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/CreateMediaHandler.java @@ -18,6 +18,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.view.media.operation.AddMediaToImageGalleryOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -67,7 +68,7 @@ public class CreateMediaHandler extends AbstractHandler { EditorUtil.getUndoContext(), description, postOperationEnabled); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/DeleteMediaHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/DeleteMediaHandler.java index 7a183518d..1dfa1451d 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/DeleteMediaHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/DeleteMediaHandler.java @@ -22,6 +22,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; import eu.etaxonomy.taxeditor.editor.view.media.operation.RemoveImageFromDescriptionElementOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -70,7 +71,7 @@ public class DeleteMediaHandler extends AbstractHandler { EditorUtil.getUndoContext(), taxon, image, element, postOperationEnabled); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/MoveImageDownInListHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/MoveImageDownInListHandler.java index 67726fdf5..eb01f8d5a 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/MoveImageDownInListHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/MoveImageDownInListHandler.java @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; import eu.etaxonomy.taxeditor.editor.view.media.operation.MoveMediaInListOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -75,7 +76,7 @@ public class MoveImageDownInListHandler extends AbstractHandler { EditorUtil.getUndoContext(), taxon, description, media, MoveMediaInListOperation.DOWN, postOperationEnabled); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/MoveImageUpInListHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/MoveImageUpInListHandler.java index 2550661c5..e5bbff375 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/MoveImageUpInListHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/handler/MoveImageUpInListHandler.java @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; import eu.etaxonomy.taxeditor.editor.view.media.operation.MoveMediaInListOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; @@ -74,7 +75,7 @@ public class MoveImageUpInListHandler extends AbstractHandler { EditorUtil.getUndoContext(), taxon, element, media, MoveMediaInListOperation.UP, postOperationEnabled); EditorUtil.executeOperation(operation); } catch (NotDefinedException e) { - EditorUtil.warn(getClass(), "Command name not set."); + MessagingUtils.warn(getClass(), "Command name not set."); } } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/MoveMediaInListOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/MoveMediaInListOperation.java index 667598736..1b02b432c 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/MoveMediaInListOperation.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/operation/MoveMediaInListOperation.java @@ -23,9 +23,9 @@ import eu.etaxonomy.cdm.model.description.DescriptionBase; import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.cdm.model.media.Media; import eu.etaxonomy.cdm.model.taxon.Taxon; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

MoveMediaInListOperation class.

@@ -107,7 +107,7 @@ public class MoveMediaInListOperation extends AbstractPostTaxonOperation { Set elements = description.getElements(); if(elements.size() != 1){ - StoreUtil.error(this.getClass(), "More than one description element in this image gallery", null); + MessagingUtils.error(this.getClass(), "More than one description element in this image gallery", null); } DescriptionElementBase element = elements.iterator().next(); @@ -125,7 +125,7 @@ public class MoveMediaInListOperation extends AbstractPostTaxonOperation { try{ Collections.swap(medias, newIndex, index); }catch(ArrayIndexOutOfBoundsException e){ - StoreUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); } } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java index 7ea9ed09d..ab46175b1 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java @@ -40,6 +40,7 @@ import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin; import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator; @@ -64,13 +65,13 @@ public class NavigationUtil extends AbstractUtility{ try { handlerService.executeCommand(commandId, null); } catch (ExecutionException e) { - AbstractUtility.error(NavigationUtil.class, e); + MessagingUtils.error(NavigationUtil.class, e); } catch (NotDefinedException e) { - AbstractUtility.error(NavigationUtil.class, e); + MessagingUtils.error(NavigationUtil.class, e); } catch (NotEnabledException e) { - AbstractUtility.error(NavigationUtil.class, e); + MessagingUtils.error(NavigationUtil.class, e); } catch (NotHandledException e) { - AbstractUtility.error(NavigationUtil.class, e); + MessagingUtils.error(NavigationUtil.class, e); } } @@ -88,16 +89,16 @@ public class NavigationUtil extends AbstractUtility{ EditorUtil.openTaxonBase(entityUuid); }else if(selectedObject instanceof TaxonNameBase){ // TODO open bulk editor - warningDialog("Not implemented yet", NavigationUtil.class, "You tried to open a name. This is not handled by the software yet."); + MessagingUtils.warningDialog("Not implemented yet", NavigationUtil.class, "You tried to open a name. This is not handled by the software yet."); }else if(selectedObject instanceof PolytomousKey){ EditorUtil.openPolytomousKey(entityUuid); }else{ - warningDialog("Unsupported Type", NavigationUtil.class, "No editor exists for the current selection: " + selectedObject); + MessagingUtils.warningDialog("Unsupported Type", NavigationUtil.class, "No editor exists for the current selection: " + selectedObject); } } catch (PartInitException e) { - AbstractUtility.error(NavigationUtil.class, "Error opening the editor", e); + MessagingUtils.error(NavigationUtil.class, "Error opening the editor", e); } catch (Exception e) { - AbstractUtility.warningDialog("Could not create Taxon", NavigationUtil.class, e.getMessage()); + MessagingUtils.warningDialog("Could not create Taxon", NavigationUtil.class, e.getMessage()); } } @@ -108,13 +109,13 @@ public class NavigationUtil extends AbstractUtility{ try { EditorUtil.openTaxonBase(((UuidAndTitleCache) selectedObject).getUuid()); } catch (PartInitException e) { - AbstractUtility.error(NavigationUtil.class, "Error opening the editor", e); + MessagingUtils.error(NavigationUtil.class, "Error opening the editor", e); } } }else if(selectedObject instanceof ICdmBase){ openEditor((ICdmBase) selectedObject); }else{ - AbstractUtility.error(NavigationUtil.class, new IllegalArgumentException("Selected object is not supported: " + selectedObject)); + MessagingUtils.error(NavigationUtil.class, new IllegalArgumentException("Selected object is not supported: " + selectedObject)); } } @@ -127,7 +128,7 @@ public class NavigationUtil extends AbstractUtility{ try { EditorUtil.openEmpty(parentNodeUuid); } catch (PartInitException e) { - AbstractUtility.error(NavigationUtil.class, "Error opening the editor", e); + MessagingUtils.error(NavigationUtil.class, "Error opening the editor", e); } } @@ -196,7 +197,7 @@ public class NavigationUtil extends AbstractUtility{ } } } catch (PartInitException e) { - AbstractUtility.error(NavigationUtil.class, e.getMessage(), e); + MessagingUtils.error(NavigationUtil.class, e.getMessage(), e); throw new RuntimeException(e); } @@ -248,7 +249,7 @@ public class NavigationUtil extends AbstractUtility{ handleOpeningOfMultipleTaxa(synonym.getAcceptedTaxa()); }else{ - warningDialog("Not implemented yet", NavigationUtil.class, "You chose to open a name that has no connection to a taxon. The Editor does not support editing of such a content type at the moment."); + MessagingUtils.warningDialog("Not implemented yet", NavigationUtil.class, "You chose to open a name that has no connection to a taxon. The Editor does not support editing of such a content type at the moment."); } } @@ -258,11 +259,11 @@ public class NavigationUtil extends AbstractUtility{ openEditor(acceptedTaxa.iterator().next()); }else if(acceptedTaxa.size() > 1){ // FIXME implement a dialog that shows all possible taxa and let the user choose which he wants to open. - warningDialog("Not implemented yet", NavigationUtil.class, "The accepted taxon is in multiple taxonomic trees. We currently do not know which one you want to open." + + MessagingUtils.warningDialog("Not implemented yet", NavigationUtil.class, "The accepted taxon is in multiple taxonomic trees. We currently do not know which one you want to open." + " This case is not handled yet by the software."); }else if(acceptedTaxa.size() == 0){ // this is an undesired state - warningDialog("Not implemented yet", NavigationUtil.class, "This taxon is not connected to a classification. Currently editing of such taxa is not supported yet."); + MessagingUtils.warningDialog("Not implemented yet", NavigationUtil.class, "This taxon is not connected to a classification. Currently editing of such taxa is not supported yet."); } } @@ -276,11 +277,11 @@ public class NavigationUtil extends AbstractUtility{ openEditor(taxonNodes.iterator().next()); }else if(taxonNodes.size() > 1){ // FIXME implement a dialog that shows all possible taxa and let the user choose which he wants to open. - warningDialog("Not implemented yet", NavigationUtil.class, "The accepted taxon is in multiple taxonomic trees. We currently do not know which one you want to open." + + MessagingUtils.warningDialog("Not implemented yet", NavigationUtil.class, "The accepted taxon is in multiple taxonomic trees. We currently do not know which one you want to open." + " This case is not handled yet by the software."); }else if(taxonNodes.size() == 0){ // this is an undesired state - warningDialog("Incorrect state", NavigationUtil.class, "The accepted taxon is not in a taxonomic view. This should not have happened."); + MessagingUtils.warningDialog("Incorrect state", NavigationUtil.class, "The accepted taxon is not in a taxonomic view. This should not have happened."); } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java index 36c455e9e..085783c8d 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/PolytomousKeyViewPart.java @@ -43,7 +43,7 @@ import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.model.ContextListenerAdapter; import eu.etaxonomy.taxeditor.model.DataChangeBridge; import eu.etaxonomy.taxeditor.model.IContextListener; -import eu.etaxonomy.taxeditor.navigation.NavigationUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -164,11 +164,11 @@ public class PolytomousKeyViewPart extends ViewPart implements if(command.isEnabled()) { IHandlerService handlerService = (IHandlerService)getSite().getService(IHandlerService.class); try { - handlerService.executeCommand(OPEN_COMMAND_ID, null); + handlerService.executeCommand(OPEN_COMMAND_ID, null); } catch (NotDefinedException e) { throw new RuntimeException("Could not find open command: " + OPEN_COMMAND_ID); } catch (Exception e) { - NavigationUtil.error(getClass(), "An exception occured while trying to open a selection", e); + MessagingUtils.error(getClass(), "An exception occured while trying to open a selection", e); } } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/handler/DeleteHandler.java index ede0de647..faf141c73 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/handler/DeleteHandler.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/key/polytomous/handler/DeleteHandler.java @@ -20,6 +20,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.model.description.PolytomousKey; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.navigation.NavigationUtil; import eu.etaxonomy.taxeditor.navigation.key.polytomous.PolytomousKeyViewPart; import eu.etaxonomy.taxeditor.navigation.key.polytomous.operation.DeleteOperation; @@ -45,7 +46,7 @@ public class DeleteHandler extends AbstractHandler { return null; } - boolean confirmation = NavigationUtil.confirmDialog("Confirm deletaion", "Do you want to delete the selected key" + (keys.size() == 1 ? "" : "s") + "?"); + boolean confirmation = MessagingUtils.confirmDialog("Confirm deletaion", "Do you want to delete the selected key" + (keys.size() == 1 ? "" : "s") + "?"); if(confirmation){ @@ -58,7 +59,7 @@ public class DeleteHandler extends AbstractHandler { (PolytomousKeyViewPart) NavigationUtil.getView(PolytomousKeyViewPart.ID, false)); NavigationUtil.executeOperation(operation); } catch (NotDefinedException e) { - NavigationUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonLinkHelper.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonLinkHelper.java index a8b2d2523..1d30e554f 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonLinkHelper.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonLinkHelper.java @@ -18,8 +18,8 @@ import org.eclipse.ui.IWorkbenchPage; import org.eclipse.ui.navigator.ILinkHelper; import eu.etaxonomy.cdm.model.taxon.TaxonNode; -import eu.etaxonomy.taxeditor.editor.EditorUtil; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * When a taxon is open in an editor and this editor has focus, its entry in the @@ -56,7 +56,7 @@ public class TaxonLinkHelper implements ILinkHelper { } } } catch (Exception e) { - EditorUtil.warningDialog("Could not create Taxon", this, e.getMessage()); + MessagingUtils.warningDialog("Could not create Taxon", this, e.getMessage()); } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java index 24157b3bc..2b910df22 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNavigator.java @@ -39,6 +39,7 @@ import eu.etaxonomy.cdm.model.taxon.TaxonComparatorSearch; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.model.DataChangeBridge; import eu.etaxonomy.taxeditor.model.IDataChangeBehavior; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.navigation.NavigationUtil; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -285,7 +286,7 @@ public class TaxonNavigator extends CommonNavigator implements path += ((CdmBase) segment).getUuid().toString() + " "; monitor.worked(1); } else { - NavigationUtil.warn(getClass(), + MessagingUtils.warn(getClass(), "Non-taxon tree path segment " + segment); } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java index eddf15d58..c022ca4e2 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodeLabelProvider.java @@ -25,7 +25,7 @@ import eu.etaxonomy.cdm.model.common.CdmBase; import eu.etaxonomy.cdm.model.common.IIdentifiableEntity; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonNode; -import eu.etaxonomy.taxeditor.navigation.NavigationUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.Resources; import eu.etaxonomy.taxeditor.security.RequiredPermissions; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -59,17 +59,17 @@ public class TaxonNodeLabelProvider extends ColumnLabelProvider try{ Taxon taxon = (Taxon) HibernateProxyHelper.deproxy(taxonNode.getTaxon()); if(taxon == null){ - NavigationUtil.error(getClass(), "The taxon node does not have a taxon attached to it. Please check your import. TaxonNode: " + element, null); + MessagingUtils.error(getClass(), "The taxon node does not have a taxon attached to it. Please check your import. TaxonNode: " + element, null); // throw new RuntimeException("The data your are trying to view is corrupt. Please check your import."); }else{ try{ return taxon.getName() != null ? ((IIdentifiableEntity) HibernateProxyHelper.deproxy(taxon.getName())).getTitleCache() : new String(); }catch(Exception e){ - NavigationUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } }catch (LazyInitializationException e){ - NavigationUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java index c376a5005..3763adc75 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/ChangeAcceptedTaxonToSynonymHandler.java @@ -34,6 +34,7 @@ import eu.etaxonomy.taxeditor.editor.MultiPageTaxonEditor; import eu.etaxonomy.taxeditor.editor.Page; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; import eu.etaxonomy.taxeditor.editor.name.TaxonNameEditor; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.navigation.NavigationUtil; import eu.etaxonomy.taxeditor.navigation.navigator.operation.ChangeAcceptedTaxonToSynonymOperation; import eu.etaxonomy.taxeditor.navigation.navigator.operation.DeleteOperation; @@ -99,7 +100,7 @@ public class ChangeAcceptedTaxonToSynonymHandler extends DeleteHandler // check if taxon has no children if(((TaxonNode)oldAcceptedTaxonNode).getCountChildren() > 0) { - EditorUtil.warningDialog("Prerequisite not met", this, + MessagingUtils.warningDialog("Prerequisite not met", this, "The accepted taxon must not have any childen. You need to move all childen to " + "another taxon node in the TaxonNavigator before attempting to turn the accepted " + "taxon into a synonym."); @@ -138,7 +139,7 @@ public class ChangeAcceptedTaxonToSynonymHandler extends DeleteHandler } catch (NotDefinedException e) { - NavigationUtil.warn(getClass(), "Command name not set"); + MessagingUtils.warn(getClass(), "Command name not set"); } } else{ if( MessageDialog.openConfirm(HandlerUtil.getActiveShell(event), "Moving to synonymy", "The operation move accepted taxon to synonymy is available only for a single taxon.")){ @@ -168,10 +169,10 @@ public class ChangeAcceptedTaxonToSynonymHandler extends DeleteHandler } EditorUtil.openTaxonNode(newAcceptedTaxonNodeUuid); } catch (PartInitException e) { - EditorUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); throw new RuntimeException(e); } catch (Exception e) { - EditorUtil.warningDialog("Could not create Taxon", this, e.getMessage()); + MessagingUtils.warningDialog("Could not create Taxon", this, e.getMessage()); } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CopyHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CopyHandler.java index 7e0b59b63..5fe8df91e 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CopyHandler.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/CopyHandler.java @@ -19,6 +19,7 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.model.taxon.TaxonNode; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.navigation.NavigationUtil; import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator; import eu.etaxonomy.taxeditor.navigation.navigator.operation.CopyOperation; @@ -59,7 +60,7 @@ public class CopyHandler extends AbstractHandler implements IHandler { IStatus status = NavigationUtil.executeOperation(operation); } catch (NotDefinedException e) { - NavigationUtil.warn(getClass(), "Command name not set"); + MessagingUtils.warn(getClass(), "Command name not set"); } } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java index ab4fc28ce..09c3f22da 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/handler/DeleteHandler.java @@ -33,6 +33,7 @@ import eu.etaxonomy.cdm.model.taxon.Classification; import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; import eu.etaxonomy.cdm.model.taxon.TaxonNode; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.navigation.NavigationUtil; import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator; import eu.etaxonomy.taxeditor.navigation.navigator.operation.DeleteOperation; @@ -116,7 +117,7 @@ public class DeleteHandler extends AbstractHandler implements IHandler{ } catch (NotDefinedException e) { - NavigationUtil.warn(getClass(), "Command name not set"); + MessagingUtils.warn(getClass(), "Command name not set"); } } else{ try{ @@ -131,7 +132,7 @@ public class DeleteHandler extends AbstractHandler implements IHandler{ NavigationUtil.executeOperation(operation); } }catch (NotDefinedException e) { - NavigationUtil.warn(getClass(), "Command name not set"); + MessagingUtils.warn(getClass(), "Command name not set"); } } return null; diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java index 87df0560e..56ce064a5 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/operation/MoveTaxonOperation.java @@ -24,9 +24,9 @@ import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; import eu.etaxonomy.cdm.model.taxon.IllegalAncestryException; import eu.etaxonomy.cdm.model.taxon.TaxonNode; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPersistentPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** * Change the taxonomic parent of a given taxon. @@ -91,7 +91,7 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation { monitor.worked(2); } } catch(IllegalAncestryException e) { - StoreUtil.warningDialog("Illegal ancestry", this, e.getMessage()); + MessagingUtils.warningDialog("Illegal ancestry", this, e.getMessage()); } monitor.worked(40); @@ -115,7 +115,7 @@ public class MoveTaxonOperation extends AbstractPersistentPostOperation { @Override public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - StoreUtil.warn(this.getClass(), "Not implemented yet."); + MessagingUtils.warn(this.getClass(), "Not implemented yet."); // iterate over oldParentTreeNodes, delete each TaxonNode from its actual parent and add to its former parent diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java index 98915188d..8b391876f 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/operation/CreateTaxonNode.java @@ -23,11 +23,10 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonNode; -import eu.etaxonomy.taxeditor.navigation.NavigationUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPersistentPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

CreateTaxonNodeOperation class.

@@ -100,7 +99,7 @@ public class CreateTaxonNode extends AbstractPersistentPostOperation { return postExecute(childTaxonNode); }catch(Exception e){ - NavigationUtil.errorDialog("Could not create taxon node", getClass(), e.getLocalizedMessage(), e); + MessagingUtils.messageDialog("Could not create taxon node", getClass(), e.getLocalizedMessage(), e); return Status.CANCEL_STATUS; } } @@ -123,7 +122,7 @@ public class CreateTaxonNode extends AbstractPersistentPostOperation { public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException { - StoreUtil.warn(this.getClass(), "Not yet implemented."); + MessagingUtils.warn(this.getClass(), "Not yet implemented."); return null; } } diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java index dccf5decd..e27d247dd 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/search/SearchBar.java @@ -35,6 +35,7 @@ import org.eclipse.ui.menus.WorkbenchWindowControlContribution; import org.eclipse.ui.swt.IFocusService; import eu.etaxonomy.cdm.api.service.config.IFindTaxaAndNamesConfigurator; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.navigation.NavigationUtil; import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin; import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; @@ -177,7 +178,7 @@ public class SearchBar extends WorkbenchWindowControlContribution{ } if("*".equals(searchString.trim())){ - NavigationUtil.warningDialog(Messages.SearchBar_2, this, Messages.SearchBar_3); + MessagingUtils.warningDialog(Messages.SearchBar_2, this, Messages.SearchBar_3); return; } @@ -214,7 +215,7 @@ public class SearchBar extends WorkbenchWindowControlContribution{ IWorkbenchPage.VIEW_ACTIVATE); ((SearchResultView) resultsView).performSearch(configurator); } catch (PartInitException e) { - NavigationUtil.error(this.getClass(), Messages.SearchBar_4, e); + MessagingUtils.error(this.getClass(), Messages.SearchBar_4, e); } } @@ -275,7 +276,7 @@ public class SearchBar extends WorkbenchWindowControlContribution{ */ @Override public void widgetSelected(SelectionEvent e) { - NavigationUtil.info(Messages.SearchBar_5); + MessagingUtils.info(Messages.SearchBar_5); SearchOption option = (SearchOption) e.widget.getData(); switch (option){ diff --git a/eu.etaxonomy.taxeditor.navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationWorkbenchAdvisor.java b/eu.etaxonomy.taxeditor.navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationWorkbenchAdvisor.java index 830c7e50f..33cf4192c 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationWorkbenchAdvisor.java +++ b/eu.etaxonomy.taxeditor.navigation/src/test/java/eu/etaxonomy/taxeditor/navigation/ApplicationWorkbenchAdvisor.java @@ -9,6 +9,8 @@ import org.eclipse.ui.application.WorkbenchAdvisor; import org.eclipse.ui.application.WorkbenchWindowAdvisor; import org.osgi.framework.Bundle; +import eu.etaxonomy.taxeditor.model.MessagingUtils; + @SuppressWarnings("restriction") public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { @@ -50,5 +52,11 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor { // IWorkspace workspace = ResourcesPlugin.getWorkspace(); // return workspace.getRoot(); // } + +// @Override +// public void eventLoopException(Throwable exception) { +// super.eventLoopException(exception); +// MessagingUtils.messageDialog("Unexpected Errorr", "Please contact EDIT Support and provide contents of the trace log", null , exception); +// } } diff --git a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java index 680e1ab39..9cf226ed1 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java +++ b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/handler/GeneratePdfHandler.java @@ -27,10 +27,10 @@ import eu.etaxonomy.cdm.print.PublishConfigurator; import eu.etaxonomy.cdm.print.out.pdf.PdfOutputModule; import eu.etaxonomy.cdm.print.out.xml.XMLOutputModule; import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.printpublisher.PrintUtil; import eu.etaxonomy.taxeditor.printpublisher.wizard.DirectPublishingWizard; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

GeneratePdfHandler class.

@@ -51,7 +51,7 @@ public class GeneratePdfHandler extends AbstractHandler { IEditorInput input = editor.getEditorInput(); if(!(input instanceof TaxonEditorInput)){ - StoreUtil.warningDialog("PDF generation not supported for selected input", this, "Generating PDF output is not supported for the current active editor"); + MessagingUtils.warningDialog("PDF generation not supported for selected input", this, "Generating PDF output is not supported for the current active editor"); return null; } diff --git a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/AbstractPublishWizard.java b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/AbstractPublishWizard.java index fb9406e03..a4386b6e0 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/AbstractPublishWizard.java +++ b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/AbstractPublishWizard.java @@ -20,7 +20,7 @@ import eu.etaxonomy.cdm.print.PublishConfigurator; import eu.etaxonomy.cdm.print.Publisher; import eu.etaxonomy.cdm.print.out.IPublishOutputModule; import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter; -import eu.etaxonomy.taxeditor.printpublisher.PrintUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.printpublisher.internal.PrintpublisherPlugin; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -149,7 +149,7 @@ public abstract class AbstractPublishWizard extends Wizard implements IExportWiz */ /** {@inheritDoc} */ public void init(IWorkbench workbench, IStructuredSelection selection) { - PrintUtil.info("Instantiating wizard: " + this.getClass().getSimpleName()); + MessagingUtils.info("Instantiating wizard: " + this.getClass().getSimpleName()); } diff --git a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java index b6e69ec3b..176d6b203 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java +++ b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectServiceWizardPage.java @@ -45,9 +45,9 @@ import eu.etaxonomy.cdm.print.PublishConfigurator; import eu.etaxonomy.cdm.print.XMLHelper; import eu.etaxonomy.cdm.print.XMLHelper.EntityType; import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.printpublisher.PrintUtil; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

SelectServiceWizardPage class.

@@ -225,9 +225,9 @@ public class SelectServiceWizardPage extends AbstractPublishWizardPage { try { getContainer().run(true, false, runnable); } catch (InvocationTargetException e) { - StoreUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); } catch (InterruptedException e) { - StoreUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); } } } diff --git a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectStylesheetWizardPage.java b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectStylesheetWizardPage.java index 0f0113e6c..3267eb022 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectStylesheetWizardPage.java +++ b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectStylesheetWizardPage.java @@ -20,7 +20,7 @@ import org.eclipse.swt.layout.GridData; import org.eclipse.swt.layout.GridLayout; import org.eclipse.swt.widgets.Composite; -import eu.etaxonomy.taxeditor.printpublisher.PrintUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * @author n.hoffmann @@ -82,7 +82,7 @@ public class SelectStylesheetWizardPage extends AbstractPublishWizardPage stylesheets = getOutputModule().getStylesheets(); viewer.setInput(stylesheets); } catch (IOException e) { - PrintUtil.errorDialog("Problems reading stylesheet", getClass(), e.getMessage(), e); + MessagingUtils.messageDialog("Problems reading stylesheet", getClass(), e.getMessage(), e); } } diff --git a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java index 3f1ac596d..f75985dca 100644 --- a/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java +++ b/eu.etaxonomy.taxeditor.printpublisher/src/main/java/eu/etaxonomy/taxeditor/printpublisher/wizard/SelectTaxaWizardPage.java @@ -34,7 +34,7 @@ import org.jdom.Element; import eu.etaxonomy.cdm.print.IXMLEntityFactory; import eu.etaxonomy.cdm.print.XMLHelper; import eu.etaxonomy.cdm.print.XMLHelper.EntityType; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** *

SelectTaxaWizardPage class.

@@ -111,9 +111,9 @@ public class SelectTaxaWizardPage extends AbstractPublishWizardPage { try { getContainer().run(true, false, runnable); } catch (InvocationTargetException e) { - StoreUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); } catch (InterruptedException e) { - StoreUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); } } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java index fbf4c5357..da13e5e86 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java @@ -34,9 +34,9 @@ import eu.etaxonomy.cdm.remote.CdmPersistentRemoteSource; import eu.etaxonomy.cdm.remote.CdmRemoteSourceException; import eu.etaxonomy.cdm.remote.ICdmRemoteSource; import eu.etaxonomy.taxeditor.model.MementoHelper; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; public class CdmDataSourceRepository{ @@ -96,7 +96,7 @@ public class CdmDataSourceRepository{ try { remoteSources.add(CdmPersistentDataSource.NewInstance(dataSource.getName())); } catch (DataSourceNotFoundException e) { - StoreUtil.error(CdmDataSourceRepository.class, "Could not find dataSource", e); + MessagingUtils.error(CdmDataSourceRepository.class, "Could not find dataSource", e); } } @@ -105,7 +105,7 @@ public class CdmDataSourceRepository{ remoteSources.add(remoteSource); } } catch (CdmRemoteSourceException e) { - StoreUtil.error(CdmDataSourceRepository.class, "Error retrieving remote sources", e); + MessagingUtils.error(CdmDataSourceRepository.class, "Error retrieving remote sources", e); } // TODO sort by database name @@ -127,7 +127,7 @@ public class CdmDataSourceRepository{ return CdmPersistentDataSource.NewInstance(dataSource.getName()); } } catch (DataSourceNotFoundException e) { - StoreUtil.error(CdmDataSourceRepository.class, "Could not find dataSource", e); + MessagingUtils.error(CdmDataSourceRepository.class, "Could not find dataSource", e); } } @@ -182,7 +182,7 @@ public class CdmDataSourceRepository{ if( dataSourceNomenclaturalCode != null && ! dataSourceNomenclaturalCode.equals(applicationNomenclaturalCode)){ PreferencesUtil.setPreferredNomenclaturalCode(dataSourceNomenclaturalCode); - StoreUtil.informationDialog("Nomenclatural Code Change", "The Datasource that was just " + + MessagingUtils.informationDialog("Nomenclatural Code Change", "The Datasource that was just " + "loaded has a different nomenclatural code than the one stored in Preferences. " + "The nomenclatural code was changed in the application."); } @@ -237,7 +237,7 @@ public class CdmDataSourceRepository{ try { return CdmPersistentDataSource.update(strCdmSourceName, cdmSource); } catch (Exception e) { - StoreUtil.error(CdmDataSourceRepository.class, "Error updating CDM Source", e); + MessagingUtils.error(CdmDataSourceRepository.class, "Error updating CDM Source", e); } return null; } @@ -246,7 +246,7 @@ public class CdmDataSourceRepository{ try { return CdmPersistentDataSource.replace(strCdmSourceName, cdmSource); } catch (Exception e) { - StoreUtil.error(CdmDataSourceRepository.class, "Error updating CDM Source", e); + MessagingUtils.error(CdmDataSourceRepository.class, "Error updating CDM Source", e); } return null; } @@ -262,7 +262,7 @@ public class CdmDataSourceRepository{ try { return CdmPersistentRemoteSource.update(strCdmSourceName, cdmSource); } catch (Exception e) { - StoreUtil.error(CdmDataSourceRepository.class, "Error updating CDM Source", e); + MessagingUtils.error(CdmDataSourceRepository.class, "Error updating CDM Source", e); } return null; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java index f3e09bac0..effe4520f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateDefinedTermHandler.java @@ -21,6 +21,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.model.common.TermBase; import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor; import eu.etaxonomy.taxeditor.editor.definedterm.operation.CreateDefinedTermOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.StoreUtil; @@ -64,7 +65,7 @@ public class CreateDefinedTermHandler extends AbstractHandler implements IHandle StoreUtil.executeOperation(operation); } catch (NotDefinedException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java index 12f349be1..cb08ab728 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/CreateTermVocabularyHandler.java @@ -19,6 +19,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor; import eu.etaxonomy.taxeditor.editor.definedterm.operation.CreateTermVocabularyOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.StoreUtil; @@ -54,7 +55,7 @@ public class CreateTermVocabularyHandler extends AbstractHandler implements StoreUtil.executeOperation(operation); } catch (NotDefinedException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } return null; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java index de5d40a13..6a2038534 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/DeleteTermBaseHandler.java @@ -22,6 +22,7 @@ import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.cdm.model.common.TermBase; import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor; import eu.etaxonomy.taxeditor.editor.definedterm.operation.DeleteTermBaseOperation; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostOperation; import eu.etaxonomy.taxeditor.store.StoreUtil; @@ -66,7 +67,7 @@ public class DeleteTermBaseHandler extends AbstractHandler { } } catch (NotDefinedException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } return null; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java index 25dca2cc6..64f8597eb 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/handler/OpenDefinedTermEditorHandler.java @@ -14,6 +14,7 @@ import org.eclipse.ui.PartInitException; import eu.etaxonomy.cdm.model.common.TermType; import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor; import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.StoreUtil; // $Id$ @@ -48,8 +49,8 @@ public class OpenDefinedTermEditorHandler extends AbstractHandler implements IHa String PID = "eu.etaxonomy.taxeditor.application"; MultiStatus info = new MultiStatus(PID, 1, "You might be missing sufficient permissions to open the Defined Term Editor", null); info.add(new Status(IStatus.WARNING, PID, 1, e.getMessage(), null)); - StoreUtil.errorDialog("Cannot open Defined Term Editor", getClass(), info); - StoreUtil.error(getClass(), e); + MessagingUtils.errorDialog("Cannot open Defined Term Editor", getClass(), info); + MessagingUtils.error(getClass(), e); } return null; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java index c1e838a9c..b96cacdc0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/CreateDefinedTermOperation.java @@ -20,6 +20,7 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.TermBase; import eu.etaxonomy.cdm.model.common.TermVocabulary; import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.StoreUtil; @@ -64,7 +65,7 @@ public class CreateDefinedTermOperation extends AbstractPostTaxonOperation { new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "Creation of term corresponding to type '" + definedTermInput.getTermType().getMessage() + "' is not yet supported"); - StoreUtil.warningDialog("Cannot create term", newTerm, status); + MessagingUtils.warningDialog("Cannot create term", newTerm, status); return status; } 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 24865969a..d9b72b1ac 100644 --- 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 @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.model.common.TermBase; import eu.etaxonomy.cdm.model.common.TermVocabulary; import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor; import eu.etaxonomy.taxeditor.editor.definedterm.input.TermEditorInput; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -69,13 +70,13 @@ public class DeleteTermBaseOperation extends AbstractPostTaxonOperation { if (termBase instanceof TermVocabulary) { if (((TermVocabulary)termBase).getCreatedBy() == null) { IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "This is a CDM system vocabulary"); - StoreUtil.warningDialog("Cannot delete vocabulary", termBase, status); + MessagingUtils.warningDialog("Cannot delete vocabulary", termBase, status); return status; } if (!((TermVocabulary)termBase).getTerms().isEmpty()) { IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "Delete all terms from this vocaulary before deleting the vocabulary."); - StoreUtil.warningDialog("Vocabulary not empty", termBase, status); + MessagingUtils.warningDialog("Vocabulary not empty", termBase, status); return status; } @@ -93,12 +94,12 @@ public class DeleteTermBaseOperation extends AbstractPostTaxonOperation { if (((DefinedTermBase)termBase).getCreatedBy() == null) { IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "This is a CDM system defined term"); - StoreUtil.warningDialog("Cannot delete defined term", termBase, status); + MessagingUtils.warningDialog("Cannot delete defined term", termBase, status); return status; } if(!definedTermBase.getIncludes().isEmpty()){ IStatus status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "This term includes other terms. Please delete the included terms before deleting this term."); - StoreUtil.warningDialog("Term has included terms", termBase, status); + MessagingUtils.warningDialog("Term has included terms", termBase, status); return status; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java index e85d87700..5096f49ac 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java @@ -21,6 +21,7 @@ import org.eclipse.core.runtime.Status; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.TermBase; import eu.etaxonomy.cdm.model.common.TermVocabulary; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation; import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled; import eu.etaxonomy.taxeditor.store.StoreUtil; @@ -64,7 +65,7 @@ public class MoveDefinedTermOperation extends AbstractPostTaxonOperation { // do nothing when moving it on itself if(targetTermOrVocabulary.equals(term)){ Status status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "Term can not be added to itself"); - StoreUtil.informationDialog("", status); + MessagingUtils.informationDialog("", status); return status; } @@ -74,7 +75,7 @@ public class MoveDefinedTermOperation extends AbstractPostTaxonOperation { // do nothing when term is top level and gets added to the same vocabulary if(term.getPartOf() == null && termVocabulary.equals(term.getVocabulary())){ Status status = new Status(IStatus.CANCEL, StoreUtil.getPluginId(), "Term is already in this vocabulary"); - StoreUtil.informationDialog("", status); + MessagingUtils.informationDialog("", status); return status; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java index d0216c84a..3c4466647 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/featuretree/EditFeatureTreeWizardPage.java @@ -42,8 +42,8 @@ import eu.etaxonomy.cdm.api.service.IFeatureNodeService; import eu.etaxonomy.cdm.model.description.Feature; import eu.etaxonomy.cdm.model.description.FeatureNode; import eu.etaxonomy.cdm.model.description.FeatureTree; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

@@ -309,7 +309,7 @@ public class EditFeatureTreeWizardPage extends WizardPage implements // cannot drop a feature node onto itself for (Object droppedObject : droppedObjects) { if (droppedObject == null) { - StoreUtil.warningDialog( + MessagingUtils.warningDialog( "Operation not supported yet", this, "We are currently unable to change the order of freshly created " diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenPasswordWizzardHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenPasswordWizzardHandler.java index 05273d42d..965b07dd7 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenPasswordWizzardHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/handler/OpenPasswordWizzardHandler.java @@ -18,6 +18,7 @@ import org.eclipse.jface.wizard.WizardDialog; import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.ui.password.PasswordWizard; @@ -48,7 +49,7 @@ public class OpenPasswordWizzardHandler extends AbstractHandler implements IHand } else { // should never happen, log an error - AbstractUtility.error(OpenPasswordWizzardHandler.class, "The principal currently authenticated is not a eu.etaxonomy.cdm.model.common.User", null); + MessagingUtils.error(OpenPasswordWizzardHandler.class, "The principal currently authenticated is not a eu.etaxonomy.cdm.model.common.User", null); } return null; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java index 580fb725d..c7b7acc9c 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ExportManager.java @@ -27,6 +27,7 @@ import eu.etaxonomy.cdm.io.common.IIoConfigurator; import eu.etaxonomy.cdm.io.jaxb.JaxbExportConfigurator; import eu.etaxonomy.cdm.io.sdd.out.SDDExportConfigurator; import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.StoreUtil; /** @@ -111,7 +112,7 @@ public class ExportManager extends AbstractIOManager { exporter.invoke(configurator); monitor.worked(60); } catch (RuntimeException e) { - StoreUtil.errorDialog("Error exporting data", this, + MessagingUtils.messageDialog("Error exporting data", this, "An error occured while" + "exporting to destination '" + configurator.getDestinationNameString() @@ -140,7 +141,7 @@ public class ExportManager extends AbstractIOManager { conversationEnabled.getConversationHolder() .commit(); }catch(RuntimeException e){ - StoreUtil.errorDialog("Error starting conversation handling", this, "" + + MessagingUtils.messageDialog("Error starting conversation handling", this, "" + "Conversation Error: "+ e); } } @@ -168,7 +169,7 @@ public class ExportManager extends AbstractIOManager { case Sdd: return SDDExportConfigurator.NewInstance(null, null, null); default: - StoreUtil.notImplementedMessage(this); + MessagingUtils.notImplementedMessage(this); throw new IllegalArgumentException("Export not supported yet"); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java index 1496227b9..a607e3f0f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java @@ -29,8 +29,8 @@ import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator; import eu.etaxonomy.cdm.io.specimen.excel.in.SpecimenCdmExcelImportConfigurator; import eu.etaxonomy.cdm.io.tcsxml.in.TcsXmlImportConfigurator; import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

@@ -98,7 +98,7 @@ public class ImportManager extends AbstractIOManager { importer.invoke(configurator); monitor.worked(80); } catch (RuntimeException e) { - StoreUtil.errorDialog( + MessagingUtils.messageDialog( "Error importing data", this, "An error occured while" @@ -147,7 +147,7 @@ public class ImportManager extends AbstractIOManager { case SpecimenCdmExcel: return SpecimenCdmExcelImportConfigurator.NewInstance(null, null); default: - StoreUtil.notImplementedMessage(this); + MessagingUtils.notImplementedMessage(this); throw new IllegalArgumentException("Import not supported yet"); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/GenericConfiguratorWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/GenericConfiguratorWizardPage.java index 9505f4d00..645ddbed9 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/GenericConfiguratorWizardPage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/GenericConfiguratorWizardPage.java @@ -28,7 +28,7 @@ import org.eclipse.swt.widgets.Composite; import eu.etaxonomy.cdm.io.common.IIoConfigurator; import eu.etaxonomy.cdm.io.specimen.abcd206.in.Abcd206ImportConfigurator; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** *

@@ -212,7 +212,7 @@ public class GenericConfiguratorWizardPage extends WizardPage { break; } catch (Exception e) { - StoreUtil.warn(this.getClass(), "Could not invoke method"); + MessagingUtils.warn(this.getClass(), "Could not invoke method"); } } @@ -237,7 +237,7 @@ public class GenericConfiguratorWizardPage extends WizardPage { break; } catch (Exception e) { - StoreUtil.warn(this.getClass(), "Could not invoke method"); + MessagingUtils.warn(this.getClass(), "Could not invoke method"); } } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java index 9a1e0e16a..2b8c4bbe8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java @@ -20,11 +20,9 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.TreeSet; -import org.apache.log4j.Logger; import org.eclipse.core.commands.ExecutionException; import org.eclipse.core.commands.operations.IOperationHistory; import org.eclipse.core.runtime.IAdaptable; -import org.eclipse.core.runtime.ILog; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.MultiStatus; @@ -34,8 +32,6 @@ import org.eclipse.core.runtime.Status; import org.eclipse.core.runtime.SubProgressMonitor; import org.eclipse.core.runtime.jobs.ISchedulingRule; import org.eclipse.jface.action.IStatusLineManager; -import org.eclipse.jface.dialogs.ErrorDialog; -import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.resource.ColorRegistry; import org.eclipse.jface.resource.FontRegistry; @@ -174,7 +170,7 @@ public abstract class AbstractUtility { .getActivePage() .showView(id, null, IWorkbenchPage.VIEW_VISIBLE); } catch (PartInitException e) { - errorDialog("Error opening view", AbstractUtility.class, "Could not open view: " + id, e); + MessagingUtils.messageDialog("Error opening view", AbstractUtility.class, "Could not open view: " + id, e); return null; } } @@ -288,169 +284,6 @@ public abstract class AbstractUtility { return getColorRegistry().get(symbolicName); } - /** - * Open a message box that informs the user about unimplemented - * functionality. This method is for developer convenience. - * - * @param source - * a {@link java.lang.Object} object. - */ - public static void notImplementedMessage(Object source) { - warningDialog("Not yet implemented", source, - "This functionality is not yet implemented."); - } - - /** - *

- * informationDialog - *

- * - * @param title - * a {@link java.lang.String} object. - * @param message - * a {@link java.lang.String} object. - */ - public static void informationDialog(final String title, - final String message) { - Display.getDefault().asyncExec(new Runnable() { - - @Override - public void run() { - MessageDialog.openInformation(getShell(), title, message); - } - }); - } - - public static void informationDialog(final String title, - final IStatus status) { - informationDialog(title, status.getMessage()); - } - - /** - *

- * warningDialog - *

- * - * @param title - * The dialogs title - * @param source - * The object where the warning was generated (used by log4j) - * @param message - * An informative String to be presented to the user - */ - public static void warningDialog(final String title, final Object source, - final String message) { - Display.getDefault().asyncExec(new Runnable() { - - @Override - public void run() { - MessageDialog.openWarning(getShell(), title, message); - Class clazz = source != null ? source - .getClass() : AbstractUtility.class; - warn(clazz, message); - } - }); - } - - /** - * @param title - * @param termBase - * @param status - */ - public static void warningDialog(String title, Object source, - IStatus status) { - warningDialog(title, source, status.getMessage()); - } - - /** - *

- * errorDialog - *

- * - * @param title - * The dialogs title - * @param source - * The object where the warning was generated (used by log4j) - * @param message - * An informative String to be presented to the user - * @param title - * The dialogs title - * @param t - * a Throwable if one exists or null - */ - public static void errorDialog(final String title, final Object source, - final String message, final Throwable t) { - Display.getDefault().asyncExec(new Runnable() { - - @Override - public void run() { - MessageDialog.openError(getShell(), title, message + getCauseRecursively(t)); - Class clazz = source != null ? source - .getClass() : this.getClass(); - error(clazz, message, t); - } - - private String getCauseRecursively(Throwable t) { - if(t == null){ - return ""; - } - - if(t.getCause() != null){ - return getCauseRecursively(t.getCause()); - }else{ - return String.format("\n\nException: %s\nMessage: %s", t.getClass().getSimpleName(), t.getMessage()); - } - - } - }); - } - - public static void errorDialog(final String title, final Object source, - final String message){ - errorDialog(title, source, message, null); - } - - /** - *

- * errorDialog - *

- * - * @param title - * a {@link java.lang.String} object. - * @param source - * a {@link java.lang.Object} object. - * @param status - * a {@link org.eclipse.core.runtime.IStatus} object. - */ - public static void errorDialog(final String title, final Object source, - final IStatus status) { - Display.getDefault().asyncExec(new Runnable() { - - @Override - public void run() { - ErrorDialog.openError(getShell(), title, null, status); - Class clazz = source != null ? source - .getClass() : this.getClass(); - error(clazz, status); - } - }); - } - - /** - *

- * confirmDialog - *

- * - * @param title - * a {@link java.lang.String} object. - * @param message - * a {@link java.lang.String} object. - * @return a boolean. - */ - public static boolean confirmDialog(String title, String message) { - return MessageDialog.openQuestion(getShell(), title, message); - } - /** *

* executeOperation @@ -485,7 +318,7 @@ public abstract class AbstractUtility { uiInfoAdapter); } catch (ExecutionException e) { - dialogForAbortedOperation(e, this, operationlabel, null); + MessagingUtils.operationDialog(this, e, operationlabel, null); } finally { monitor.done(); @@ -501,40 +334,9 @@ public abstract class AbstractUtility { try { runInUI(runnable, null); } catch (Exception e) { - errorDialog("Error executing operation", AbstractUtility.class, "An error occured while executing " + operation.getLabel(), e); + MessagingUtils.messageDialog("Error executing operation", AbstractUtility.class, "An error occured while executing " + operation.getLabel(), e); } - // // Start the main progress monitor. - // IProgressMonitor newMonitor = - // startMainMonitor(getMonitor(),operation.getLabel(), 100); - // - // // Check whether operation was canceled and do some steps. - // workedChecked(newMonitor, 10); - // - // try { - // IStatus status = getOperationHistory().execute(operation, newMonitor, - // WorkspaceUndoUtil.getUIInfoAdapter(getShell())); - // - // // Check whether operation was canceled and do some steps. - // workedChecked(newMonitor, 30); - // - // String statusString = status.equals(Status.OK_STATUS) ? "completed" : - // "cancelled"; - // setStatusLine(operation.getLabel() + " " + statusString + "."); - // - // return status; - // } catch (ExecutionException e) { - // logger.error("Error executing operation: " + operation.getLabel(), - // e); - // errorDialog("Error executing operation: " + operation.getLabel(), - // "Please refer to the error log."); - // } - // finally { - // - // // Stop the progress monitor. - // newMonitor.done(); - // } - IPostOperationEnabled postOperationEnabled = operation .getPostOperationEnabled(); if (postOperationEnabled != null) { @@ -740,127 +542,6 @@ public abstract class AbstractUtility { return (IWorkbenchSiteProgressService) getService(IWorkbenchSiteProgressService.class); } - /** - *

- * info - *

- * - * @param message - * a {@link java.lang.String} object. - */ - public static void info(String message) { - IStatus status = new Status(IStatus.INFO, getPluginId(), message); - info(status); - } - - /** - *

- * info - *

- * - * @param status - * a {@link org.eclipse.core.runtime.IStatus} object. - */ - public static void info(IStatus status) { - log(status); - } - - /** - *

- * warn - *

- * - * @param source - * a {@link java.lang.Class} object. - * @param message - * a {@link java.lang.String} object. - */ - public static void warn(Class source, String message) { - IStatus status = new Status(IStatus.WARNING, getPluginId(), message); - getLog4JLogger(source).warn(message); - log(status); - } - - public static void warn(Class source, IStatus status) { - getLog4JLogger(source).warn(status.getMessage(), status.getException()); - log(status); - } - - public static void warn(Class source, Throwable t) { - IStatus status = new Status(IStatus.WARNING, getPluginId(), t.getMessage(), t); - getLog4JLogger(source).warn(t); - log(status); - } - - /** - *

- * error - *

- * - * @param source - * a {@link java.lang.Class} object. - * @param t - * a {@link java.lang.Throwable} object. - */ - public static void error(Class source, Throwable t) { - error(source.getClass(), t.getMessage(), t); - } - - /** - *

- * error - *

- * - * @param source - * a {@link java.lang.Class} object. - * @param message - * a {@link java.lang.String} object. - * @param t - * a {@link java.lang.Throwable} object. - */ - public static void error(Class source, String message, Throwable t) { - IStatus status = new Status(IStatus.ERROR, getPluginId(), message, t); - error(source, status); - } - - /** - *

- * error - *

- * - * @param source - * a {@link java.lang.Class} object. - * @param status - * a {@link org.eclipse.core.runtime.IStatus} object. - */ - public static void error(Class source, IStatus status) { - getLog4JLogger(source) - .error(status.getMessage(), status.getException()); - log(status); - } - - /** - *

- * getLog4JLogger - *

- * - * @param clazz - * a {@link java.lang.Class} object. - * @return a {@link org.apache.log4j.Logger} object. - */ - public static Logger getLog4JLogger(Class clazz) { - return Logger.getLogger(clazz); - } - - /** - * @see {@link ILog#log(IStatus)} - * - * @param status - */ - private static void log(IStatus status) { - TaxeditorStorePlugin.getDefault().getLog().log(status); - } - /** *

* getPluginId @@ -1021,33 +702,6 @@ public abstract class AbstractUtility { } } - public static void dialogForAbortedOperation(Exception e, final Object source, String operationlabel, String hint) { - MultiStatus info = null; - String title = null; - - // FIXME cannot access TaxonomicEditorPlugin.PLUGIN_ID from here - // String PID = TaxonomicEditorPlugin.PLUGIN_ID; - String PID = "eu.etaxonomy.taxeditor.application"; - - RuntimeException securityRuntimeException = SecurityExceptionUtils.findSecurityRuntimeException(e); - - if(securityRuntimeException != null){ - title = "Your changes could not be saved!"; - info = new MultiStatus(PID, 1, String.format("You are missing sufficient permissions for the operation \"%s\". %s", operationlabel, hint), null); - info.add(new Status(IStatus.WARNING, PID, 1, securityRuntimeException.getMessage(), null)); - - } else { - title = "Error executing operation"; - info = new MultiStatus(PID, 1, String.format("An error occured while executing %s. %s", operationlabel, hint), null); - Writer writer = new StringWriter(); - PrintWriter printWriter = new PrintWriter(writer); - e.printStackTrace(printWriter); - info.add(new Status(IStatus.ERROR, PID, 1, writer.toString(), null)); - } - - errorDialog(title, source, info); - } - private static class TermNode> implements Comparable>{ private final T term; private final TreeSet> children; @@ -1125,4 +779,5 @@ public abstract class AbstractUtility { } } + } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmErrorDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmErrorDialog.java new file mode 100644 index 000000000..eb5a8283f --- /dev/null +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmErrorDialog.java @@ -0,0 +1,44 @@ +package eu.etaxonomy.taxeditor.model; + +import org.eclipse.core.runtime.IStatus; +import org.eclipse.jface.dialogs.ErrorDialog; +import org.eclipse.jface.dialogs.IDialogConstants; +import org.eclipse.swt.SWT; +import org.eclipse.swt.graphics.Point; +import org.eclipse.swt.widgets.Shell; + +/** + * Error dialog class specifically implemented for the editor. + * The main difference with {@link org.eclipse.jface.dialogs.ErrorDialog} is that + * this dialog has a fixed max height. + * + * @author cmathew + * + */ +public class CdmErrorDialog extends ErrorDialog { + + private static final int DIALOG_MAX_HEIGHT = 500; + + public CdmErrorDialog(Shell parentShell, String dialogTitle, + String message, IStatus status) { + super(parentShell, + dialogTitle, + message, status, + IStatus.OK| IStatus.INFO | IStatus.WARNING | IStatus.ERROR); + } + + @Override + protected void buttonPressed(int id) { + super.buttonPressed(id); + if (id == IDialogConstants.DETAILS_ID) { + Point oldSize = getShell().computeSize(SWT.DEFAULT, SWT.DEFAULT); + // set height to max allowed + if(getShell().getSize().y > DIALOG_MAX_HEIGHT) { + getShell().setSize(getShell().getSize().x, 500); + } else { + getShell().setSize(getShell().getSize().x, oldSize.y); + } + } + + } +} diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmProgressMonitorAdapter.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmProgressMonitorAdapter.java index 87dec860a..f9e994006 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmProgressMonitorAdapter.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/CdmProgressMonitorAdapter.java @@ -94,13 +94,13 @@ public class CdmProgressMonitorAdapter implements eu.etaxonomy.cdm.common.monito /** {@inheritDoc} */ @Override public void warning(String message) { - StoreUtil.warn(this.getClass(), message); + MessagingUtils.warn(this.getClass(), message); } /** {@inheritDoc} */ @Override public void warning(String message, Throwable throwable) { - StoreUtil.error(this.getClass(), message, throwable); + MessagingUtils.error(this.getClass(), message, throwable); } @Override diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java index 50c0047ce..af6a0674b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java @@ -45,7 +45,6 @@ import eu.etaxonomy.cdm.model.media.Media; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

DescriptionHelper class.

@@ -134,10 +133,10 @@ public class DescriptionHelper { } if(element instanceof Distribution){ - StoreUtil.warn(DescriptionHelper.class, "trying to set cache on distribution, don't know what to do at the moment."); + MessagingUtils.warn(DescriptionHelper.class, "trying to set cache on distribution, don't know what to do at the moment."); return; } - StoreUtil.warn(DescriptionHelper.class, "No matching subclass found for DescriptionElementBase object, 'cache' not set."); + MessagingUtils.warn(DescriptionHelper.class, "No matching subclass found for DescriptionElementBase object, 'cache' not set."); } /** @@ -167,7 +166,7 @@ public class DescriptionHelper { return ((IdentifiableEntity) element).getTitleCache(); }catch(LazyInitializationException e){ String result = "No Session to initialize title cache for IdentifiableEntity"; - StoreUtil.error(DescriptionHelper.class, result, e); + MessagingUtils.error(DescriptionHelper.class, result, e); return "TODO: " + result; } } @@ -187,7 +186,7 @@ public class DescriptionHelper { return CdmUtils.concat("; ", new String[]{originalSource.getIdNamespace(), originalSource.getIdInSource(), sourceObjectTitle}); }catch(LazyInitializationException e){ String result = "Error initializing title cache for ISourceable of an OriginalSourceBase"; - StoreUtil.error(DescriptionHelper.class, result, e); + MessagingUtils.error(DescriptionHelper.class, result, e); return "TODO: " + result; } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java index 1a40df53c..81947acc6 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/ImageResources.java @@ -198,7 +198,7 @@ public class ImageResources { } catch (MalformedURLException e) { // should never happen } catch (Exception e) { - AbstractUtility.error(ImageResources.class, e); + MessagingUtils.error(ImageResources.class, e); } // logger.warn(ImageDescriptor.getMissingImageDescriptor().getClass()); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MementoHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MementoHelper.java index 9a8c6ea87..ea31c1ce9 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MementoHelper.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/MementoHelper.java @@ -24,7 +24,6 @@ import org.eclipse.ui.IMemento; import org.eclipse.ui.WorkbenchException; import org.eclipse.ui.XMLMemento; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

MementoHelper class.

@@ -50,9 +49,9 @@ public class MementoHelper { new InputStreamReader(input, "utf-8")); //$NON-NLS-1$ return XMLMemento.createReadRoot(reader); } catch (WorkbenchException e) { - StoreUtil.error(MementoHelper.class, "Exception while reading the memento", e); + MessagingUtils.error(MementoHelper.class, "Exception while reading the memento", e); } catch (UnsupportedEncodingException e) { - StoreUtil.error(MementoHelper.class, "Exception while reading the memento", e); + MessagingUtils.error(MementoHelper.class, "Exception while reading the memento", e); } return null; @@ -81,7 +80,7 @@ public class MementoHelper { writer.close(); } catch (IOException e) { stateFile.delete(); - StoreUtil.error(MementoHelper.class, "Could not save datasource state", e); + MessagingUtils.error(MementoHelper.class, "Could not save datasource state", e); return null; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java index 194bc3c7a..07f4c2126 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java @@ -13,8 +13,8 @@ import eu.etaxonomy.cdm.model.taxon.Classification; import eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonNode; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.section.classification.TaxonNodeWizardPage; /** @@ -48,7 +48,7 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizard{ TaxonNode taxonNode = parent.addChildTaxon(taxon, parent.getReference(), parent.getMicroReference()); generatedTaxonNodeUuid = CdmStore.getService(ITaxonNodeService.class).saveOrUpdate(taxonNode); }catch(IllegalArgumentException e){ - StoreUtil.warningDialog("Taxon already exists in classfication", getClass(), e.getMessage()); + MessagingUtils.warningDialog("Taxon already exists in classfication", getClass(), e.getMessage()); } } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java index 0ca07983a..9fc72e2b8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java @@ -16,9 +16,9 @@ import eu.etaxonomy.cdm.model.reference.INomenclaturalReference; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.strategy.match.MatchException; import eu.etaxonomy.cdm.strategy.parser.NonViralNameParserImpl; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

ParseHandler class.

@@ -222,9 +222,9 @@ public class ParseHandler{ if(matchMatrix.duplicateInReferences.size() > 0){ Reference inReference = (Reference) matchMatrix.duplicateInReferences.iterator().next(); reference.setInReference(inReference); - StoreUtil.warn(this.getClass(), reference.generateTitle()); + MessagingUtils.warn(this.getClass(), reference.generateTitle()); // FIXME TODO resolve multiple duplications. We use first match for a start - StoreUtil.warn(this.getClass(), reference.getTitleCache()); + MessagingUtils.warn(this.getClass(), reference.getTitleCache()); } } @@ -301,7 +301,7 @@ public class ParseHandler{ try{ return CdmStore.getService(ICommonService.class).findMatching(nomenclaturalReference, MatchStrategyConfigurator.ReferenceMatchStrategy()); }catch (MatchException e) { - StoreUtil.error(this.getClass(), "Error finding matching references", e); + MessagingUtils.error(this.getClass(), "Error finding matching references", e); } return null; } @@ -319,7 +319,7 @@ public class ParseHandler{ try{ return CdmStore.getService(ICommonService.class).findMatching(authorTeam, MatchStrategyConfigurator.TeamOrPersonMatchStrategy()); }catch (MatchException e) { - StoreUtil.error(this.getClass(), "Error finding matching authors", e); + MessagingUtils.error(this.getClass(), "Error finding matching authors", e); } return null; } @@ -334,7 +334,7 @@ public class ParseHandler{ return CdmStore.getService(ICommonService.class).findMatching(taxonNameBase, MatchStrategyConfigurator.NonViralNameMatchStrategy()); } catch (MatchException e) { - StoreUtil.error(this.getClass(), "Error finding matching names", e); + MessagingUtils.error(this.getClass(), "Error finding matching names", e); } return null; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java index 6ac38fab5..9a0e836a4 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java @@ -40,9 +40,9 @@ import eu.etaxonomy.cdm.strategy.match.DefaultMatchStrategy; import eu.etaxonomy.cdm.strategy.match.IMatchStrategy; import eu.etaxonomy.cdm.strategy.match.MatchException; import eu.etaxonomy.cdm.strategy.match.MatchMode; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.model.NomenclaturalCodeHelper; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; /** @@ -127,7 +127,7 @@ public class PreferencesUtil implements IPreferenceKeys { try { matchStrategy.setMatchMode(fieldName, matchMode); } catch (MatchException e) { - StoreUtil.error(PreferencesUtil.class, e); + MessagingUtils.error(PreferencesUtil.class, e); throw new RuntimeException(e); } } @@ -226,7 +226,7 @@ public class PreferencesUtil implements IPreferenceKeys { String key = cdmBase.getClass().getName().concat(".") .concat(cdmBase.getUuid().toString()); if (key.contains("javassist")) { - StoreUtil.info("proxy"); + MessagingUtils.info("proxy"); } return key; } @@ -242,7 +242,7 @@ public class PreferencesUtil implements IPreferenceKeys { String key = simpleTerm.getClass().getName().concat(".") .concat(simpleTerm.getUuid().toString()); if (key.contains("javassist")) { - StoreUtil.warn(PreferencesUtil.class, + MessagingUtils.warn(PreferencesUtil.class, "Trying to persist a preference based on a proxy class."); } return key; @@ -261,7 +261,7 @@ public class PreferencesUtil implements IPreferenceKeys { String key = definedTerm.getClass().getName().concat(".") .concat(definedTerm.getUuid().toString()); if (key.contains("javassist")) { - StoreUtil.warn(PreferencesUtil.class, + MessagingUtils.warn(PreferencesUtil.class, "Trying to persist a preference based on a proxy class."); } return key; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java index 0a5e1589c..79ac53cd8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/AbstractMatchingPreferences.java @@ -32,8 +32,8 @@ import eu.etaxonomy.cdm.model.common.IdentifiableEntity; import eu.etaxonomy.cdm.strategy.match.IMatchStrategy; import eu.etaxonomy.cdm.strategy.match.MatchException; import eu.etaxonomy.cdm.strategy.match.MatchMode; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

Abstract AbstractMatchingPreferences class.

@@ -143,7 +143,7 @@ public abstract class AbstractMatchingPreferences try { matchStrategy.setMatchMode(fieldName, matchMode); } catch (MatchException e) { - StoreUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); throw new RuntimeException(e); } } @@ -227,7 +227,7 @@ public abstract class AbstractMatchingPreferences } } catch (MatchException e) { - StoreUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); throw new RuntimeException(e); } super.performDefaults(); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/NonViralNameMatchingPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/NonViralNameMatchingPreference.java index 0874465d6..72acd5666 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/NonViralNameMatchingPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/NonViralNameMatchingPreference.java @@ -15,8 +15,8 @@ import org.eclipse.ui.IWorkbench; import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.strategy.match.IMatchStrategy; import eu.etaxonomy.cdm.strategy.match.MatchException; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

NonViralNameMatchingPreference class.

@@ -37,7 +37,7 @@ public class NonViralNameMatchingPreference extends AbstractMatchingPreferences< try { matchStrategy = MatchStrategyConfigurator.NonViralNameMatchStrategy(); } catch (MatchException e) { - StoreUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); throw new RuntimeException(e); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/ReferenceMatchingPreference.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/ReferenceMatchingPreference.java index b6b5af25a..fd3fbdd32 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/ReferenceMatchingPreference.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/matching/ReferenceMatchingPreference.java @@ -15,8 +15,8 @@ import org.eclipse.ui.IWorkbench; import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.strategy.match.IMatchStrategy; import eu.etaxonomy.cdm.strategy.match.MatchException; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.parser.MatchStrategyConfigurator; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

ReferenceMatchingPreference class.

@@ -37,7 +37,7 @@ public class ReferenceMatchingPreference extends AbstractMatchingPreferencesTeamOrPersonMatchingPreference class.

@@ -39,7 +39,7 @@ public class TeamOrPersonMatchingPreference extends try { matchStrategy = MatchStrategyConfigurator.TeamOrPersonMatchStrategy(); } catch (MatchException e) { - StoreUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); throw new RuntimeException(e); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java index 112a66cbe..acf22fdb8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/AbstractMenuPreferences.java @@ -44,6 +44,7 @@ import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.TermType; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.editor.definedterm.DefinedTermEditor; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.preference.wizard.VocabularyTermWizard; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -251,14 +252,14 @@ public abstract class AbstractMenuPreferences extends throw new RuntimeException("Could not find open command: " + DefinedTermEditor.OPEN_COMMAND_ID); } catch (Exception e) { - StoreUtil + MessagingUtils .error(getClass(), "An exception occured while trying to open a selection", e); } } } catch (NotDefinedException e) { - StoreUtil + MessagingUtils .error(getClass(), "An exception occured while trying to open the Term Editor", e); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/VocabularyTermWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/VocabularyTermWizard.java index aef968d20..403f3b4b9 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/VocabularyTermWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/VocabularyTermWizard.java @@ -18,8 +18,8 @@ import eu.etaxonomy.cdm.api.service.ITermService; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.Representation; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.store.TermStore; /** @@ -125,9 +125,9 @@ public class VocabularyTermWizard extends Wizard impl term.addRepresentation(Representation.NewInstance("", "", "", CdmStore.getDefaultLanguage())); } catch (InstantiationException e) { - StoreUtil.error(this.getClass(), "InstantiationException when setting term", e); + MessagingUtils.error(this.getClass(), "InstantiationException when setting term", e); } catch (IllegalAccessException e) { - StoreUtil.error(this.getClass(), "IllegalAccessException when setting term", e); + MessagingUtils.error(this.getClass(), "IllegalAccessException when setting term", e); } } return term; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java index 7d18e0d3a..00a999bd8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java @@ -44,6 +44,7 @@ import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository; import eu.etaxonomy.taxeditor.io.ExportManager; import eu.etaxonomy.taxeditor.io.ImportManager; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart; @@ -101,7 +102,7 @@ public class CdmStore { return instance; } else if (instance == null || !instance.isConnected) { - AbstractUtility + MessagingUtils .warningDialog( "Application is not connected to a datastore", instance, @@ -125,7 +126,7 @@ public class CdmStore { cdmSource = CdmDataSourceRepository.getCurrentCdmSource(); connect(cdmSource); } catch (CdmRemoteSourceException e) { - StoreUtil.errorDialog("Connection to CDM Source Failed", CdmStore.class, "Could not connect to target CDM Source", e); + MessagingUtils.messageDialog("Connection to CDM Source Failed", CdmStore.class, "Could not connect to target CDM Source", e); } @@ -152,7 +153,7 @@ public class CdmStore { private static void connect(final ICdmSource cdmSource, final DbSchemaValidation dbSchemaValidation, final Resource applicationContextBean) { - StoreUtil.info("Connecting to datasource: " + cdmSource); + MessagingUtils.info("Connecting to datasource: " + cdmSource); job = new CdmStoreConnector(Display.getDefault(), cdmSource, dbSchemaValidation, applicationContextBean); @@ -216,7 +217,7 @@ public class CdmStore { try { return applicationConfiguration; } catch (Exception e) { - StoreUtil.error(CdmStore.class, e); + MessagingUtils.error(CdmStore.class, e); } return null; } @@ -254,7 +255,7 @@ public class CdmStore { try{ conversation.startTransaction(); }catch(Exception e){ - StoreUtil.errorDialog("No database connection", CdmStore.class, "No database connection available", e); + MessagingUtils.messageDialog("No database connection", CdmStore.class, "No database connection available", e); } return conversation; } @@ -283,11 +284,11 @@ public class CdmStore { service = (T) method.invoke(configuration, null); break; } catch (IllegalArgumentException e) { - StoreUtil.error(CdmStore.class, e); + MessagingUtils.error(CdmStore.class, e); } catch (IllegalAccessException e) { - StoreUtil.error(CdmStore.class, e); + MessagingUtils.error(CdmStore.class, e); } catch (InvocationTargetException e) { - StoreUtil.error(CdmStore.class, e); + MessagingUtils.error(CdmStore.class, e); } } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java index 52ce1b559..5387e723c 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStoreConnector.java @@ -34,6 +34,7 @@ import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.model.metadata.CdmMetaData; import eu.etaxonomy.cdm.model.metadata.CdmMetaData.MetaDataPropertyName; import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.ui.dialog.LoginDialog; import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart; @@ -128,7 +129,7 @@ class CdmStoreConnector extends Job { } }); - StoreUtil.info("Application context initialized."); + MessagingUtils.info("Application context initialized."); return Status.OK_STATUS; } else { // Show datasource view if not shown yet @@ -201,8 +202,8 @@ class CdmStoreConnector extends Job { if (!result) { // Show an error message - StoreUtil - .errorDialog( + MessagingUtils + .messageDialog( "DatabaseCompatibilityCheck failed", this, "The database schema for the chosen " @@ -246,7 +247,7 @@ class CdmStoreConnector extends Job { cdmSource.checkConnection(); monitor.worked(1); } catch (CdmSourceException e) { - StoreUtil.errorDialog("Could not connect to chosen datasource", + MessagingUtils.messageDialog("Could not connect to chosen datasource", this, "Reason: " + e.getMessage(), e); monitor.setCanceled(true); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/ContextManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/ContextManager.java index 57cab784d..d7ca5a0d0 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/ContextManager.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/ContextManager.java @@ -27,6 +27,7 @@ import org.eclipse.ui.XMLMemento; import eu.etaxonomy.taxeditor.model.IContextListener; import eu.etaxonomy.taxeditor.model.MementoHelper; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; /** @@ -71,7 +72,7 @@ public class ContextManager implements IWorkbenchListener{ *

notifyContextStart

*/ public void notifyContextStart() { - StoreUtil.info("Notifying context listeners, that the context has started."); + MessagingUtils.info("Notifying context listeners, that the context has started."); ProgressMonitorDialog dialog = new ProgressMonitorDialog(StoreUtil.getShell()); try { @@ -95,9 +96,9 @@ public class ContextManager implements IWorkbenchListener{ } }); } catch (InvocationTargetException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } catch (InterruptedException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } @@ -106,7 +107,7 @@ public class ContextManager implements IWorkbenchListener{ * */ public void notifyContextRefresh() { - StoreUtil.info("Notifying context listeners, that the context needs to be refreshed."); + MessagingUtils.info("Notifying context listeners, that the context needs to be refreshed."); ProgressMonitorDialog dialog = new ProgressMonitorDialog(StoreUtil.getShell()); try { @@ -127,9 +128,9 @@ public class ContextManager implements IWorkbenchListener{ } }); } catch (InvocationTargetException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } catch (InterruptedException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } @@ -164,7 +165,7 @@ public class ContextManager implements IWorkbenchListener{ IProgressMonitor subMonitor = StoreUtil.getSubProgressMonitor(monitor, 1); subMonitor.beginTask("Stoping context", contextListeners.size()); - StoreUtil.info("Notifying context listeners, that the context has stopped."); + MessagingUtils.info("Notifying context listeners, that the context has stopped."); for(Object listener : contextListeners.getListeners()){ ((IContextListener) listener).contextStop(memento, subMonitor); @@ -212,7 +213,7 @@ public class ContextManager implements IWorkbenchListener{ memento = MementoHelper.readMementoFromFile(getStateFileForCurrentDatabase()); } catch (FileNotFoundException e) { // no memento -> no previous state - StoreUtil.info("No state file for datasource"); + MessagingUtils.info("No state file for datasource"); } } @@ -226,13 +227,13 @@ public class ContextManager implements IWorkbenchListener{ name = name.replace(" ", "_"); memento = XMLMemento.createWriteRoot(name); - StoreUtil.info("DataSource found. Memento created."); + MessagingUtils.info("DataSource found. Memento created."); } catch (Exception e) { // The memento could not be created, but a not closable editor is avoided for this case. - StoreUtil.error(this.getClass(), "The memento could not be created", e); + MessagingUtils.error(this.getClass(), "The memento could not be created", e); } } else { - StoreUtil.info("Not storing state data, because no DataSource present."); + MessagingUtils.info("Not storing state data, because no DataSource present."); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/EditorManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/EditorManager.java index bd2b3a572..9a1c11905 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/EditorManager.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/EditorManager.java @@ -10,6 +10,7 @@ import java.util.UUID; import org.eclipse.ui.IEditorInput; import eu.etaxonomy.taxeditor.model.ICdmEditorHandle; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * @@ -25,7 +26,7 @@ public class EditorManager { ICdmEditorHandle editor = editors.get(inputType); if(editor == null){ - StoreUtil.warningDialog("No editor", getClass(), "No editor was registered for the given type."); + MessagingUtils.warningDialog("No editor", getClass(), "No editor was registered for the given type."); }else{ editor.open(uuid); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java index 7a5ada8dd..b01cd9a97 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/LoginManager.java @@ -30,6 +30,7 @@ import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.model.IContextListener; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** *

LoginManager class.

@@ -96,13 +97,13 @@ public class LoginManager extends Observable implements IConversationEnabled, IC return true; } catch(BadCredentialsException e){ - AbstractUtility.warningDialog("Could not authenticate", this, "Could not authenticate. Reason: Bad Credentials."); + MessagingUtils.warningDialog("Could not authenticate", this, "Could not authenticate. Reason: Bad Credentials."); } catch(LockedException e){ - AbstractUtility.warningDialog("Could not authenticate", this, "Could not authenticate. Reason: Account is locked."); + MessagingUtils.warningDialog("Could not authenticate", this, "Could not authenticate. Reason: Account is locked."); } catch(IllegalArgumentException e){ - AbstractUtility.warningDialog("Could not authenticate", this, "Could not authenticate. Reason: Username and/or Password empty."); + MessagingUtils.warningDialog("Could not authenticate", this, "Could not authenticate. Reason: Username and/or Password empty."); } return false; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java index 42ead4bfc..38f1fea81 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java @@ -23,6 +23,7 @@ import eu.etaxonomy.cdm.model.common.DefinedTerm; import eu.etaxonomy.cdm.model.common.DefinedTermBase; import eu.etaxonomy.cdm.model.common.TermType; import eu.etaxonomy.cdm.model.common.TermVocabulary; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.preference.Resources; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -203,12 +204,12 @@ public class TermComboElement if (label == null) { if (term.getTitleCache() != null) { label = term.getTitleCache(); - StoreUtil.warn(getClass(), + MessagingUtils.warn(getClass(), "Term does not have a default language representation: " + label + ", " + term.getUuid()); } else { label = "Unknown"; - StoreUtil.warn(getClass(), + MessagingUtils.warn(getClass(), "Representation Label and TitleCache empty for term: " + term + ", " + term.getUuid()); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java index 1151df8f2..d1e432f79 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/UriDialog.java @@ -18,7 +18,7 @@ import org.eclipse.jface.dialogs.InputDialog; import org.eclipse.jface.window.Window; import org.eclipse.swt.widgets.Shell; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** *

UriDialog class.

@@ -66,7 +66,7 @@ public class UriDialog extends InputDialog { try { uri = new URI(getValue()); } catch (URISyntaxException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } return uri; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java index 641193b67..e02afa3c9 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmEnumSelectionDialog.java @@ -33,8 +33,8 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.model.common.IEnumTerm; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; /** @@ -215,13 +215,13 @@ public abstract class AbstractFilteredCdmEnumSelectionDialog { if(amplification != null){ return amplification; } - AbstractUtility.error(this.getClass(), "Selected unit is not an amplification", null); + MessagingUtils.error(this.getClass(), "Selected unit is not an amplification", null); return null; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java index 5c5648939..2fb6c0bed 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/DerivedUnitSelectionDialog.java @@ -19,10 +19,10 @@ import eu.etaxonomy.cdm.api.service.IOccurrenceService; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

FilteredDerivedUnitSelectionDialog class.

@@ -73,7 +73,7 @@ public class DerivedUnitSelectionDialog extends if(specimenObservationBase instanceof DerivedUnit){ return (DerivedUnit) specimenObservationBase; } - StoreUtil.error(this.getClass(), "Selected unit is not a derived unit", null); + MessagingUtils.error(this.getClass(), "Selected unit is not a derived unit", null); return null; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java index 49acf9441..22e528cb3 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FieldUnitSelectionDialog.java @@ -19,10 +19,10 @@ import eu.etaxonomy.cdm.api.service.IOccurrenceService; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.occurrence.FieldUnit; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; import eu.etaxonomy.taxeditor.newWizard.NewFieldUnitWizard; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

FilteredFieldUnitSelectionDialog class.

@@ -77,7 +77,7 @@ public class FieldUnitSelectionDialog extends if(specimenObservationBase instanceof FieldUnit){ return (FieldUnit) specimenObservationBase; } - StoreUtil.error(this.getClass(), "Selected object is not a field unit", null); + MessagingUtils.error(this.getClass(), "Selected object is not a field unit", null); return null; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java index 21474e44b..4ad99c9ff 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/PrimerSelectionDialog.java @@ -17,7 +17,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.service.molecular.IPrimerService; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.molecular.Primer; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; import eu.etaxonomy.taxeditor.newWizard.NewPrimerWizard; import eu.etaxonomy.taxeditor.store.CdmStore; @@ -54,7 +54,7 @@ AbstractFilteredCdmResourceSelectionDialog { if(primer != null){ return primer; } - AbstractUtility.error(this.getClass(), "Selected unit is not a primer", null); + MessagingUtils.error(this.getClass(), "Selected unit is not a primer", null); return null; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java index 5f09c9b96..d33745d88 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/SelectionDialogFactory.java @@ -37,7 +37,7 @@ import eu.etaxonomy.cdm.model.taxon.Synonym; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.cdm.model.taxon.TaxonNode; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** * @author n.hoffmann @@ -85,7 +85,7 @@ public class SelectionDialogFactory { return (T) PolytomousKeySelectionDialog.select(shell, conversation, (PolytomousKey) curentSelection); } if(clazz.equals(PolytomousKeyNode.class)){ - StoreUtil.warningDialog("Not implemented yet", SelectionDialogFactory.class, + MessagingUtils.warningDialog("Not implemented yet", SelectionDialogFactory.class, "This functionality is not implemented yet."); return null; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractCdmFormElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractCdmFormElement.java index 35bc76c7c..586950edf 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractCdmFormElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractCdmFormElement.java @@ -17,6 +17,7 @@ import org.eclipse.swt.widgets.Control; import org.eclipse.ui.forms.widgets.Section; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** *

Abstract AbstractCdmFormElement class.

@@ -245,7 +246,7 @@ public abstract class AbstractCdmFormElement implements ICdmFormElement { // Described here: http://dev.e-taxonomy.eu/trac/ticket/2363#comment:2 // and here: http://dev.e-taxonomy.eu/trac/ticket/2438 // Ignoring the CME because nothing bad is happening - AbstractUtility.warn(getClass(), "ConcurrentModificationException. Can be ignored."); + MessagingUtils.warn(getClass(), "ConcurrentModificationException. Can be ignored."); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java index fd2b43189..6afa2b7bf 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java @@ -34,6 +34,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** *

@@ -216,7 +217,7 @@ public abstract class AbstractFormSection extends Section implements ISe ((IPropertyChangeListener) listener).propertyChange(event); } } catch (ConcurrentModificationException e) { - AbstractUtility.warn(getClass(), "ConcurrentModificationException while handling PropertyChangeEvents." + MessagingUtils.warn(getClass(), "ConcurrentModificationException while handling PropertyChangeEvents." + " It seems like this is not critical"); } } @@ -573,7 +574,7 @@ public abstract class AbstractFormSection extends Section implements ISe }else if(getParentElement() instanceof IConversationEnabled){ return ((IConversationEnabled) getParentElement()).getConversationHolder(); } - AbstractUtility.errorDialog("Could not get conversation for AbstractFormSection", + MessagingUtils.messageDialog("Could not get conversation for AbstractFormSection", getClass(), "There is an error in the implementation. There should have been an active editor but it wasn't", new IllegalArgumentException()); return null; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java index 7c69824f8..6eb6dd838 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java @@ -96,7 +96,7 @@ import eu.etaxonomy.cdm.model.taxon.SynonymRelationship; import eu.etaxonomy.cdm.model.taxon.Taxon; import eu.etaxonomy.cdm.model.taxon.TaxonNode; import eu.etaxonomy.cdm.strategy.parser.ParserProblem; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.ui.combo.EnumComboElement; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.MinMaxTextSection.UnitType; @@ -442,7 +442,7 @@ public class CdmFormFactory extends FormToolkit { if (selectionProvider != null) { selectionProvider.removeSelectionChangedListener(selectionArbitrator); } else { - AbstractUtility.error(this.getClass(), + MessagingUtils.error(this.getClass(), "Tried to destroy a selection listener from this factories listeners but was null", null); } } @@ -1337,7 +1337,7 @@ public class CdmFormFactory extends FormToolkit { */ public void removeSelectionListener(SelectionListener listener) { if (listener == null) { - AbstractUtility.error(this.getClass(), + MessagingUtils.error(this.getClass(), "Tried to remove a selection listener from this factories listeners but was null", null); } else { selectionListenerList.remove(listener); @@ -2585,7 +2585,7 @@ public class CdmFormFactory extends FormToolkit { } if (element == null) { - AbstractUtility.errorDialog("No element for entity", this, + MessagingUtils.messageDialog("No element for entity", this, "Could not generate element for entity. Looks like the case is not handled already. Check implementation. Entity: " + entity, null); } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java index 92944ecea..090413bb9 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ImageElement.java @@ -32,7 +32,7 @@ import org.eclipse.swt.widgets.Event; import org.eclipse.ui.forms.widgets.TableWrapData; import eu.etaxonomy.cdm.common.UriUtils; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** *

ImageElement class.

@@ -104,7 +104,7 @@ public class ImageElement extends AbstractCdmFormElement implements PaintListene try { runnable.run(monitor); } catch (Exception e) { - StoreUtil.errorDialog("Could not load image", getClass(), e.getMessage() + ": " + getImageUri(), e); + MessagingUtils.messageDialog("Could not load image", getClass(), e.getMessage() + ": " + getImageUri(), e); } return Status.OK_STATUS; @@ -125,7 +125,7 @@ public class ImageElement extends AbstractCdmFormElement implements PaintListene try { runnable.run(monitor); } catch (Exception e) { - StoreUtil.errorDialog("Could not unload image", getClass(), e.getMessage() + ": " + getImageUri(), e); + MessagingUtils.messageDialog("Could not unload image", getClass(), e.getMessage() + ": " + getImageUri(), e); } return Status.OK_STATUS; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java index d315fccf9..ad379c370 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java @@ -30,9 +30,9 @@ import eu.etaxonomy.cdm.model.common.LanguageString; import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper; import eu.etaxonomy.cdm.model.common.TermType; import eu.etaxonomy.taxeditor.model.DefaultTermComparator; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.translation.TranslationWizard; @@ -66,7 +66,7 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements Map multilanguageText = getMultilanguageText(); if (multilanguageText == null){ - StoreUtil.warningDialog("No text to transalte", getClass(), "The text is empty and therefore can not be translated"); + MessagingUtils.warningDialog("No text to transalte", getClass(), "The text is empty and therefore can not be translated"); } TranslationWizard wizard = new TranslationWizard(multilanguageText); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/SelectionArbitrator.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/SelectionArbitrator.java index 3c2c784ee..a91de774c 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/SelectionArbitrator.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/SelectionArbitrator.java @@ -25,7 +25,7 @@ import org.eclipse.swt.events.SelectionListener; import org.eclipse.swt.widgets.Control; import org.eclipse.swt.widgets.Widget; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; /** @@ -142,7 +142,7 @@ public class SelectionArbitrator implements SelectionListener, ISelectionChanged try{ entityElement.setSelected(false); }catch(SWTException e){ - StoreUtil.error(getClass(), "Widgets of element are disposed", e); + MessagingUtils.error(getClass(), "Widgets of element are disposed", e); } ISelection selection = event.getSelection(); if(selection != null && selection instanceof StructuredSelection){ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityCompositeViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityCompositeViewer.java index 331b13f34..ff2eda0bd 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityCompositeViewer.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/group/grantedauthority/CdmAuthorityCompositeViewer.java @@ -30,7 +30,7 @@ import eu.etaxonomy.cdm.model.common.Group; import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD; import eu.etaxonomy.cdm.persistence.hibernate.permission.CdmAuthority; import eu.etaxonomy.taxeditor.model.IDirtyMarkableSelectionProvider; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; @@ -146,13 +146,13 @@ public class CdmAuthorityCompositeViewer extends ContentViewer { // create a granted authrity from a cdm authority gai = cdma.asNewGrantedAuthority(); } catch (Exception e) { - StoreUtil.warningDialog("Parsing Error", this, "Could not parse authority string"); + MessagingUtils.warningDialog("Parsing Error", this, "Could not parse authority string"); return; } //FIXME : this contains call will allow users to add authorities which differ only in CRUD operation choice. // need to have a comparator which only checks permission class and uuid if(cdmAuthorities.contains(gai) || newCdmAuthorities.contains(gai)) { - StoreUtil.warningDialog("Duplicate CDM Authority", this, "Chosen CDM Authority is already attached to current group"); + MessagingUtils.warningDialog("Duplicate CDM Authority", this, "Chosen CDM Authority is already attached to current group"); } else { group.addGrantedAuthority(gai); newCdmAuthorities.add(gai); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlReferencePage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlReferencePage.java index 9553a3719..dfdecf40e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlReferencePage.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlReferencePage.java @@ -26,7 +26,7 @@ import org.eclipse.swt.widgets.Label; import org.eclipse.ui.forms.widgets.ScrolledForm; import eu.etaxonomy.cdm.ext.openurl.OpenUrlReference; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.ui.element.ImageElement; import eu.etaxonomy.taxeditor.ui.element.LayoutConstants; import eu.etaxonomy.taxeditor.ui.element.RootElement; @@ -124,7 +124,7 @@ public class OpenUrlReferencePage extends WizardPage implements SelectionListene getWizard().getContainer().run(true, false, runnable); } catch (Exception e) { - StoreUtil.errorDialog("Could not load image", getClass(), e.getMessage() + ": " + imageUri , e); + MessagingUtils.messageDialog("Could not load image", getClass(), e.getMessage() + ": " + imageUri , e); } } @@ -161,7 +161,7 @@ public class OpenUrlReferencePage extends WizardPage implements SelectionListene } catch (IllegalArgumentException e) { setErrorMessage(String.format("Could not page: %s", e.getLocalizedMessage())); } catch (Exception e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorElement.java index c508919a6..62746ec3a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/openurl/OpenUrlSelectorElement.java @@ -19,7 +19,7 @@ import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Label; import eu.etaxonomy.cdm.model.reference.Reference; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.ui.element.AbstractCdmFormElement; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; @@ -68,7 +68,7 @@ public class OpenUrlSelectorElement extends AbstractCdmFormElement implements Se @Override public void widgetSelected(SelectionEvent e) { if(openUrlEnabled.getReference() == null){ - StoreUtil.warningDialog("No reference", getClass(), "The given reference is empty"); + MessagingUtils.warningDialog("No reference", getClass(), "The given reference is empty"); return; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/password/PasswordWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/password/PasswordWizard.java index 8240bfe52..0ab1de214 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/password/PasswordWizard.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/password/PasswordWizard.java @@ -18,8 +18,8 @@ import eu.etaxonomy.cdm.api.conversation.IConversationEnabled; import eu.etaxonomy.cdm.api.service.IUserService; import eu.etaxonomy.cdm.model.common.User; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; /** @@ -76,7 +76,7 @@ public class PasswordWizard extends Wizard implements IConversationEnabled{ internalConversation.close(); return true; }catch(Exception e){ - StoreUtil.errorDialog("Error while changing password", getClass(), "There was a problem changing the password.", e); + MessagingUtils.messageDialog("Error while changing password", getClass(), "There was a problem changing the password.", e); return false; }finally{ if(conversation != null){ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java index 32f05c608..7d861c220 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java @@ -28,7 +28,7 @@ import eu.etaxonomy.cdm.model.name.TaxonNameBase; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap; import eu.etaxonomy.cdm.persistence.hibernate.permission.CRUD; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.store.LoginManager; import eu.etaxonomy.taxeditor.store.StoreUtil; @@ -306,7 +306,7 @@ public abstract class AbstractCdmDetailElement extends AbstractCdmFormElement */ public void handleException(CdmPropertyChangeEvent event) { // override this in subclasses if you want to deal with the error - AbstractUtility.error(event.getSource().getClass(), event.getException()); + MessagingUtils.error(event.getSource().getClass(), event.getException()); } /** diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java index 578d220b2..47d373fe7 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamOrPersonBaseDetailSection.java @@ -16,7 +16,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.agent.Person; import eu.etaxonomy.cdm.model.agent.Team; import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement; @@ -63,7 +63,7 @@ public class TeamOrPersonBaseDetailSection extends AbstractCdmDetailSection createCdmDetailElement(AbstractCdmDetailSection parentElement, int style) { - AbstractUtility.error(this.getClass(), "Detail element was not created. Seems like the case was not implemented for TeamOrPersonBaseDetailSection", null); + MessagingUtils.error(this.getClass(), "Detail element was not created. Seems like the case was not implemented for TeamOrPersonBaseDetailSection", null); //TODO DetailElement missing?? return null; } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java index 2fe958839..c1fa5a60b 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/DescriptionElementDetailSection.java @@ -19,6 +19,7 @@ import org.eclipse.swt.widgets.Control; import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.model.description.DescriptionElementBase; import eu.etaxonomy.cdm.model.description.TextData; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -70,7 +71,7 @@ public class DescriptionElementDetailSection extends */ @Override public void run() { - boolean confirmed = StoreUtil.confirmDialog("Confirmation", "Do you really want to change to " + boolean confirmed = MessagingUtils.confirmDialog("Confirmation", "Do you really want to change to " + destinationString + "? Current data will be lost."); if (confirmed) { // FIXME diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java index ae2bbb7ba..0f19002fe 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationElement.java @@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.common.media.ImageInfo; import eu.etaxonomy.cdm.model.media.ImageFile; import eu.etaxonomy.cdm.model.media.MediaRepresentation; import eu.etaxonomy.cdm.model.media.MediaRepresentationPart; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; @@ -120,9 +120,9 @@ public class MediaRepresentationElement extends AbstractEntityCollectionElement< text_suffix.setText(imageInfo.getSuffix()); getEntity().setSuffix(imageInfo.getSuffix()); } catch (IOException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } catch (HttpException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java index c0e1988f1..67dd4b17d 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameRelationshipDetailElement.java @@ -16,7 +16,7 @@ import org.eclipse.swt.graphics.Color; import eu.etaxonomy.cdm.model.name.NameRelationship; import eu.etaxonomy.cdm.model.name.NameRelationshipType; -import eu.etaxonomy.taxeditor.store.StoreUtil; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.ui.combo.TermComboElement; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; @@ -86,7 +86,7 @@ public class NameRelationshipDetailElement extends AbstractReferencedEntityEleme getEntity().setType(combo_relationshipType.getSelection()); } else if(eventSource == selection_toName){ - StoreUtil.error(getClass(), "No API call available.", null); + MessagingUtils.error(getClass(), "No API call available.", null); } else if(eventSource == text_ruleConsidered){ getEntity().setRuleConsidered(text_ruleConsidered.getText()); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java index edc738db7..fbaac5d51 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailSection.java @@ -21,7 +21,7 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; import eu.etaxonomy.cdm.model.name.NonViralName; import eu.etaxonomy.cdm.model.taxon.TaxonBase; -import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory; import eu.etaxonomy.taxeditor.ui.element.CdmPropertyChangeEvent; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; @@ -67,7 +67,7 @@ public class NonViralNameDetailSection extends AbstractCdmDetailSectionCdmMetaDataAwareDataSourceContainer class.

@@ -88,7 +88,7 @@ public class CdmMetaDataAwareDataSourceContainer { // } } } catch (Exception e) { - StoreUtil.error(this.getClass(), e); + MessagingUtils.error(this.getClass(), e); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java index a14a60f65..6edcd8fd8 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/ChangeConnectionHandler.java @@ -17,8 +17,8 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.ui.handlers.HandlerUtil; import eu.etaxonomy.taxeditor.datasource.CdmDataSourceRepository; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.view.datasource.CdmMetaDataAwareDataSourceContainer; /** @@ -41,23 +41,23 @@ public class ChangeConnectionHandler extends AbstractHandler { CdmMetaDataAwareDataSourceContainer container = (CdmMetaDataAwareDataSourceContainer) ((IStructuredSelection) selection).getFirstElement(); if(CdmStore.isConnecting()){ - StoreUtil.warningDialog("Already connecting", this, "You are currently connecting to a different datasource already."); + MessagingUtils.warningDialog("Already connecting", this, "You are currently connecting to a different datasource already."); return null; } try { container.getCdmSource().checkConnection(); - boolean confirmed = StoreUtil.confirmDialog("Confirm Datasource Connection", "Do you really want to connect to this datasource?\n\n" + boolean confirmed = MessagingUtils.confirmDialog("Confirm Datasource Connection", "Do you really want to connect to this datasource?\n\n" + container.getCdmSource().getName()); if(confirmed){ CdmDataSourceRepository.changeDataSource(container.getCdmSource()); } } catch (Exception e) { - StoreUtil.warningDialog("Chosen datasource is not available", this, "This could mean that either the database server is " + + MessagingUtils.warningDialog("Chosen datasource is not available", this, "This could mean that either the database server is " + "not running or the machine is not reachable.\n\n" + "Please also make sure that you are connected to the network when trying to connect to a remote datasource."); - StoreUtil.warn(getClass(), e); + MessagingUtils.warn(getClass(), e); return null; } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java index 1d1bb51ea..cf694e94f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/datasource/handler/UpdateDataSourceHandler.java @@ -25,6 +25,7 @@ import eu.etaxonomy.cdm.config.ICdmSource; import eu.etaxonomy.cdm.database.ICdmDataSource; import eu.etaxonomy.cdm.database.update.CdmUpdater; import eu.etaxonomy.taxeditor.model.CdmProgressMonitorAdapter; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; import eu.etaxonomy.taxeditor.view.datasource.CdmDataSourceViewPart; @@ -80,7 +81,7 @@ public class UpdateDataSourceHandler extends AbstractDataSourceHandler { } }catch(Exception e){ status = new Status(IStatus.ERROR, TaxeditorStorePlugin.PLUGIN_ID, e.getMessage(), e); - StoreUtil.errorDialog("Could not run updater", getClass(), status.getMessage()); + MessagingUtils.messageDialog("Could not run updater", getClass(), status.getMessage()); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java index 76a6b5aee..ff7cb73f5 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/derivateSearch/DerivateSearchCompositeController.java @@ -36,6 +36,7 @@ import eu.etaxonomy.cdm.api.service.config.IdentifiableServiceConfiguratorImpl; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase; import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType; import eu.etaxonomy.taxeditor.model.AbstractUtility; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.ui.mvc.combo.EnumTermComboController; @@ -86,13 +87,13 @@ public class DerivateSearchCompositeController implements Listener{ try { handlerService.executeCommand(commandId, null); } catch (ExecutionException e) { - AbstractUtility.error(DerivateSearchCompositeController.class, e); + MessagingUtils.error(DerivateSearchCompositeController.class, e); } catch (NotDefinedException e) { - AbstractUtility.error(DerivateSearchCompositeController.class, e); + MessagingUtils.error(DerivateSearchCompositeController.class, e); } catch (NotEnabledException e) { - AbstractUtility.error(DerivateSearchCompositeController.class, e); + MessagingUtils.error(DerivateSearchCompositeController.class, e); } catch (NotHandledException e) { - AbstractUtility.error(DerivateSearchCompositeController.class, e); + MessagingUtils.error(DerivateSearchCompositeController.class, e); } } diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java index 285fd520e..207e1e5ed 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/CdmSectionPart.java @@ -20,9 +20,9 @@ import eu.etaxonomy.cdm.model.description.PolytomousKeyNode; import eu.etaxonomy.cdm.model.occurrence.DerivedUnit; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.taxeditor.model.IElementHasDetails; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; -import eu.etaxonomy.taxeditor.store.StoreUtil; import eu.etaxonomy.taxeditor.ui.element.AbstractFormSection; import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement; import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection; @@ -86,7 +86,7 @@ public class CdmSectionPart extends SectionPart implements input = DerivedUnitFacade.NewInstance((DerivedUnit) input, PreferencesUtil.getDerivedUnitConfigurator()); } catch (DerivedUnitFacadeNotSupportedException e) { - StoreUtil.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } else if (input instanceof PolytomousKeyRelationship) { diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java index b2132c23f..e6ce4a104 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/detail/DetailsViewer.java @@ -52,8 +52,8 @@ import eu.etaxonomy.cdm.model.reference.Reference; import eu.etaxonomy.cdm.model.taxon.TaxonBase; import eu.etaxonomy.cdm.model.taxon.TaxonRelationship; import eu.etaxonomy.taxeditor.editor.UsageTermCollection; -import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.model.FeatureNodeContainer; +import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship; import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; import eu.etaxonomy.taxeditor.preference.PreferencesUtil; @@ -179,7 +179,7 @@ public class DetailsViewer extends AbstractCdmDataViewer { input = DerivedUnitFacade.NewInstance(derivedUnit, PreferencesUtil.getDerivedUnitConfigurator()); } catch (DerivedUnitFacadeNotSupportedException e) { - AbstractUtility.error(getClass(), e); + MessagingUtils.error(getClass(), e); } } else if(input instanceof FieldUnit){ -- 2.34.1