X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/blobdiff_plain/5561ae15eabcd96d39fc716489de8ca8d4fd87b1..c799a32e590620a2719f8f4edfa30604d5a23306:/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/NavigationUtil.java 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 d6f3919b9..2d33925c2 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 @@ -9,57 +9,45 @@ package eu.etaxonomy.taxeditor.navigation; -import java.util.HashMap; +import java.util.Collection; import java.util.HashSet; -import java.util.Map; import java.util.Set; import java.util.UUID; -import org.eclipse.core.commands.Command; -import org.eclipse.core.commands.ParameterizedCommand; -import org.eclipse.core.commands.common.NotDefinedException; import org.eclipse.core.commands.operations.IUndoContext; import org.eclipse.core.commands.operations.UndoContext; -import org.eclipse.jface.viewers.StructuredSelection; +import org.eclipse.e4.ui.model.application.MApplication; +import org.eclipse.e4.ui.model.application.ui.basic.MPart; +import org.eclipse.e4.ui.workbench.modeling.EModelService; +import org.eclipse.e4.ui.workbench.modeling.EPartService; import org.eclipse.jface.wizard.WizardDialog; -import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; -import org.eclipse.ui.IEditorPart; -import org.eclipse.ui.IEditorReference; -import org.eclipse.ui.IWorkbenchWindow; -import org.eclipse.ui.PartInitException; -import org.eclipse.ui.PlatformUI; -import org.eclipse.ui.commands.ICommandService; -import org.eclipse.ui.handlers.IHandlerService; -import org.eclipse.ui.navigator.CommonViewer; import eu.etaxonomy.cdm.api.service.IClassificationService; import eu.etaxonomy.cdm.api.service.INameService; import eu.etaxonomy.cdm.api.service.ITaxonNodeService; import eu.etaxonomy.cdm.api.service.ITaxonService; import eu.etaxonomy.cdm.model.common.ICdmBase; -import eu.etaxonomy.cdm.model.description.PolytomousKey; import eu.etaxonomy.cdm.model.name.TaxonName; import eu.etaxonomy.cdm.model.taxon.Classification; 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.cdm.persistence.dto.TaxonNodeDto; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; import eu.etaxonomy.taxeditor.editor.EditorUtil; -import eu.etaxonomy.taxeditor.editor.TaxonEditorInput; -import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin; +import eu.etaxonomy.taxeditor.editor.e4.TaxonEditorInputE4; +import eu.etaxonomy.taxeditor.editor.name.e4.TaxonNameEditorE4; import eu.etaxonomy.taxeditor.model.AbstractUtility; import eu.etaxonomy.taxeditor.model.MessagingUtils; import eu.etaxonomy.taxeditor.navigation.internal.TaxeditorNavigationPlugin; import eu.etaxonomy.taxeditor.navigation.l10n.Messages; -import eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator; import eu.etaxonomy.taxeditor.newWizard.NewClassificationWizard; import eu.etaxonomy.taxeditor.store.CdmStore; import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; /** - *
NavigationUtil class.
* * @author n.hoffmann * @created 24.03.2009 @@ -68,7 +56,6 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin; public class NavigationUtil extends AbstractUtility{ private static final String NOT_IMPLEMENTED_YET = Messages.NavigationUtil_NOT_IMPLEMENTED; - private static final String ERROR_OPENING_THE_EDITOR = Messages.NavigationUtil_OPEN_ERROR; private static IUndoContext defaultUndoContext; /** @@ -76,10 +63,14 @@ public class NavigationUtil extends AbstractUtility{ * * @param selectedObject a {@link eu.etaxonomy.cdm.model.common.CdmBase} object. */ - public static void openEditor(UuidAndTitleCache uuidAndTitleCache){ + public static void openEditor(UuidAndTitleCache uuidAndTitleCache, Shell shell, EModelService modelService, EPartService partService, MApplication application){ Class> type = uuidAndTitleCache.getType(); ICdmBase cdmBase = null; - if(type.equals(Classification.class)){ + if(uuidAndTitleCache instanceof TaxonNodeDto){ + EditorUtil.openTaxonNodeE4(uuidAndTitleCache.getUuid(), modelService, partService, application); + return; + } + else if(type.equals(Classification.class)){ cdmBase = CdmStore.getService(IClassificationService.class).load(uuidAndTitleCache.getUuid()); } else if(type.equals(TaxonNode.class)){ @@ -95,14 +86,14 @@ public class NavigationUtil extends AbstractUtility{ MessagingUtils.warningDialog(Messages.NavigationUtil_UNKNOWN_TYPE, NavigationUtil.class, Messages.NavigationUtil_UNKNOWN_TYPE_MESSAGE); } if(cdmBase!=null){ - openEditor(cdmBase); + openEditor(cdmBase, shell, modelService, partService, application); } else{ MessagingUtils.warningDialog(Messages.NavigationUtil_NOT_FOUND, NavigationUtil.class, Messages.NavigationUtil_NOT_FOUND_MESSAGE); } } - public static void openEditor(ICdmBase selectedObject){ + public static void openEditor(ICdmBase selectedObject, Shell shell, EModelService modelService, EPartService partService, MApplication application){ UUID entityUuid = selectedObject.getUuid(); try { if(selectedObject instanceof TaxonNode){ @@ -112,29 +103,19 @@ public class NavigationUtil extends AbstractUtility{ NewClassificationWizard classificationWizard = new NewClassificationWizard(); classificationWizard.init(null, null); classificationWizard.setEntity(classification); - WizardDialog dialog = new WizardDialog(PlatformUI.getWorkbench().getActiveWorkbenchWindow().getShell(), classificationWizard); + WizardDialog dialog = new WizardDialog(shell, classificationWizard); dialog.open(); } else{ - EditorUtil.openTaxonNode(entityUuid); + EditorUtil.openTaxonNodeE4(entityUuid, modelService, partService, application); } - }else if(selectedObject instanceof TaxonBase){ - TaxonBase taxonBase = (TaxonBase)selectedObject; - if(taxonBase.isOrphaned()){ - openInBulkEditor(taxonBase); - } - else{ - EditorUtil.openTaxonBase(entityUuid); - } - }else if(selectedObject instanceof TaxonName){ - openInBulkEditor(selectedObject); - }else if(selectedObject instanceof PolytomousKey){ - EditorUtil.openPolytomousKey(entityUuid); - }else{ + } + else if(selectedObject instanceof TaxonBase){ + EditorUtil.openTaxonBaseE4(entityUuid, modelService, partService, application); + } + else{ MessagingUtils.warningDialog(Messages.NavigationUtil_UNSUPPORTED_TYPE, NavigationUtil.class, Messages.NavigationUtil_UNSUPPORTED_TYPE_MESSAGE + selectedObject); } - } catch (PartInitException e) { - MessagingUtils.error(NavigationUtil.class, ERROR_OPENING_THE_EDITOR, e); } catch (Exception e) { MessagingUtils.errorDialog(Messages.NavigationUtil_CREATE_FAILED, NavigationUtil.class, @@ -145,72 +126,13 @@ public class NavigationUtil extends AbstractUtility{ } } - private static void openInBulkEditor(ICdmBase selectedObject) { - ICommandService commandService = PlatformUI.getWorkbench().getService(ICommandService.class); - IHandlerService handlerService = PlatformUI.getWorkbench().getService(IHandlerService.class); - String openInBulkEditorCommand = "eu.etaxonomy.taxeditor.bulkeditor.openBulkEditorForIdentifiableEntity"; //$NON-NLS-1$ - Command command = commandService.getCommand(openInBulkEditorCommand); - if(command.isDefined()){ - MapopenEmpty
* * @param parentNodeUuid a {@link java.util.UUID} object. */ public static void openEmpty(UUID parentNodeUuid) { - try { - EditorUtil.openEmpty(parentNodeUuid); - } catch (PartInitException e) { - MessagingUtils.error(NavigationUtil.class, ERROR_OPENING_THE_EDITOR, e); - } - } - - /** - *getShell
- * - * @return a {@link org.eclipse.swt.widgets.Shell} object. - */ - public static Shell getShell() { - return getActiveWindow().getShell(); - } - - /** - *getActiveWindow
- * - * @return a {@link org.eclipse.ui.IWorkbenchWindow} object. - */ - public static IWorkbenchWindow getActiveWindow() { - return TaxeditorNavigationPlugin.getDefault().getWorkbench(). - getActiveWorkbenchWindow(); - } - - /** - *getWorkbenchUndoContext
- * - * @return a {@link org.eclipse.core.commands.operations.IUndoContext} object. - */ - public static IUndoContext getWorkbenchUndoContext() { - return TaxeditorEditorPlugin.getDefault().getWorkbench(). - getOperationSupport().getUndoContext(); + EditorUtil.openEmptyE4(parentNodeUuid); } /** @@ -237,52 +159,39 @@ public class NavigationUtil extends AbstractUtility{ * @param taxonNode a {@link eu.etaxonomy.cdm.model.taxon.TaxonNode} object. * @return a boolean. */ - public static boolean isDirty(TaxonNode taxonNode){ - - for (IEditorReference reference : getActivePage().getEditorReferences()) { - - try { - if (reference.getEditorInput() instanceof TaxonEditorInput) { - TaxonEditorInput editorInput = (TaxonEditorInput) reference.getEditorInput(); - if(editorInput.getTaxonNode().equals(taxonNode) && reference.isDirty()){ - return true; - } - } - } catch (PartInitException e) { - MessagingUtils.error(NavigationUtil.class, e.getMessage(), e); - throw new RuntimeException(e); - } - - } + public static boolean isDirty(TaxonNodeDto taxonNode, EPartService partService){ + + CollectionselectInNavigator
- * - * @param element a {@link java.lang.Object} object. - * @param parentElement a {@link java.lang.Object} object. - */ - public static void selectInNavigator(final Object element, final Object parentElement) { - Display.getDefault().asyncExec(new Runnable(){ - - @Override - public void run() { - TaxonNavigator navigator = showNavigator(); - - if (navigator != null) { - CommonViewer viewer = navigator.getCommonViewer(); - if (viewer != null) { - if (parentElement != null) { - viewer.setExpandedState(parentElement, true); - } - viewer.setSelection(new StructuredSelection(element)); - } - } - } - - }); - } + * Whether a taxonNode has unsaved changes. + * + * @param taxonNode a {@link eu.etaxonomy.cdm.model.taxon.TaxonNode} object. + * @return a boolean. + */ + public static boolean isDirty(TaxonNode taxonNode, EPartService partService){ + + CollectionopenSearch
@@ -311,15 +220,16 @@ public class NavigationUtil extends AbstractUtility{ } private static void handleOpeningOfMultipleTaxa(SetshowNavigator
- * - * @return the TaxonNavigator instance if present - */ - public static TaxonNavigator showNavigator() { - return (TaxonNavigator) showView(TaxonNavigator.ID); - } - - /** - *getNavigator
- * - * @param restore a boolean. - * @return a {@link eu.etaxonomy.taxeditor.navigation.navigator.TaxonNavigator} object. - */ - public static TaxonNavigator getNavigator(boolean restore) { - return (TaxonNavigator) getView(TaxonNavigator.ID, restore); - } - - /** - *getOpenEditors
- * - * @return a {@link java.util.Set} object. - */ - public static Set