From 57e6fef9bd702f89f9738e463c060f544be3cdf1 Mon Sep 17 00:00:00 2001 From: "n.hoffmann" Date: Wed, 26 Jan 2011 18:49:20 +0000 Subject: [PATCH] Fixes a problem that could have solved #2071; Resolves the problems described in #1811 on the editor side; Fixes #2216 --- .gitattributes | 1 + .../taxeditor/editor/EditorStateManager.java | 7 ++- .../taxeditor/editor/EditorUtil.java | 28 +---------- .../editor/handler/SaveAllHandler.java | 2 +- .../ChangeSynonymToAcceptedTaxonHandler.java | 2 +- .../section/supplemental/MediaElement.java | 4 +- taxeditor-store/plugin.xml | 24 +++++++++- .../handler/CloseConnectionHandler.java | 3 +- .../handler/DataSourceMenuPropertyTester.java | 5 ++ .../taxeditor/io/AbstractIOManager.java | 4 +- .../io/wizard/AbstractImportWizard.java | 1 - .../taxeditor/model/AbstractCdmViewPart.java | 5 -- .../taxeditor/model/AbstractUtility.java | 32 +++++++++---- .../taxeditor/preference/IPreferenceKeys.java | 2 + .../preference/PreferencePropertyTester.java | 46 +++++++++++++++++++ .../TaxonomicEditorGeneralPreferences.java | 35 +++++++++++++- .../etaxonomy/taxeditor/store/CdmStore.java | 2 +- 17 files changed, 151 insertions(+), 52 deletions(-) create mode 100644 taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java diff --git a/.gitattributes b/.gitattributes index a5746d8e9..162555bfd 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1100,6 +1100,7 @@ taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/InitNomenclatura taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/LanguagePreferencePage.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/MatchingPreferences.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/NomenclaturalCodePreferences.java -text +taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/Resources.java -text taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java -text diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java index 505e4896e..aed6628de 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorStateManager.java @@ -22,6 +22,7 @@ import org.eclipse.ui.IPersistable; import org.eclipse.ui.PartInitException; import eu.etaxonomy.taxeditor.editor.view.AbstractCdmEditorViewPart; +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; @@ -63,6 +64,7 @@ public class EditorStateManager extends ContextListenerAdapter { /** {@inheritDoc} */ @Override public void contextStop(IMemento memento, IProgressMonitor monitor) { + EditorUtil.closeAll(); resetConstantViews(); } @@ -72,14 +74,17 @@ public class EditorStateManager extends ContextListenerAdapter { private void resetConstantViews() { AbstractCdmEditorViewPart descriptiveView = (AbstractCdmEditorViewPart) EditorUtil.getView(DescriptiveViewPart.ID, false); AbstractCdmEditorViewPart mediaView = (AbstractCdmEditorViewPart) EditorUtil.getView(MediaViewPart.ID, false); + AbstractCdmEditorViewPart conceptView = (AbstractCdmEditorViewPart) EditorUtil.getView(ConceptViewPart.ID, false); if(descriptiveView != null){ descriptiveView.showEmptyPage(); } - if(mediaView != null){ mediaView.showEmptyPage(); } + if(conceptView != null){ + conceptView.showEmptyPage(); + } } /* (non-Javadoc) diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java index 9186ef57d..60d277db2 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/EditorUtil.java @@ -42,30 +42,6 @@ import eu.etaxonomy.taxeditor.model.AbstractUtility; public class EditorUtil extends AbstractUtility{ private static boolean isSaving = false; - - /** - *

closeAll

- * - * @return a boolean. - */ - public static boolean closeAll() { - for (IEditorPart editor : getOpenEditors()) { - if (!getActivePage().closeEditor(editor, true)) { - return false; - } - } - return true; - } - - /** - * Close the given editor. - * - * @param editor The MultipageTaxonEditor to close. - * @return true on success - */ - public static boolean close(MultiPageTaxonEditor editor) { - return getActivePage().closeEditor(editor, true); - } /** * Opens a new editor window with the given input @@ -87,7 +63,7 @@ public class EditorUtil extends AbstractUtility{ * @throws org.eclipse.ui.PartInitException if any. */ public static void open(TaxonEditorInput input) throws PartInitException{ - IEditorPart editor = open(input, MultiPageTaxonEditor.ID); + open(input, MultiPageTaxonEditor.ID); } public static void open(PolytomousKeyEditorInput input) throws PartInitException{ @@ -270,7 +246,7 @@ public class EditorUtil extends AbstractUtility{ return false; } - editor.doSave(null); + editor.doSave(EditorUtil.getMonitor()); } return true; } diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java index e41228fa8..41b142bb1 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SaveAllHandler.java @@ -40,7 +40,7 @@ public class SaveAllHandler extends AbstractHandler implements IHandler { for (IEditorPart editor : EditorUtil.getOpenEditors()) { if (editor.isDirty()) { - editor.doSave(null); + editor.doSave(EditorUtil.getMonitor()); } } diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java index 6b8aadde4..26dc6daa0 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/ChangeSynonymToAcceptedTaxonHandler.java @@ -108,7 +108,7 @@ public class ChangeSynonymToAcceptedTaxonHandler extends AbstractHandler impleme // Redraw existing editor ((IPostOperationEnabled) editor).postOperation(null); - editor.doSave(null); + editor.doSave(EditorUtil.getMonitor()); if (objectAffectedByOperation instanceof TaxonNode) { diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaElement.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaElement.java index e73bfbf9c..0292fcdcf 100644 --- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaElement.java +++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/supplemental/MediaElement.java @@ -3,6 +3,8 @@ */ package eu.etaxonomy.taxeditor.section.supplemental; +import org.eclipse.swt.events.FocusAdapter; +import org.eclipse.swt.events.FocusEvent; import org.eclipse.swt.events.SelectionListener; import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper; @@ -56,7 +58,7 @@ public class MediaElement extends AbstractEntityCollectionElement { /** {@inheritDoc} */ @Override public void createControls(ICdmFormElement element, int style) { - text_title = formFactory.createLanguageStringWithLabelElement(element, "Title", null, style); + text_title = formFactory.createLanguageStringWithLabelElement(element, "Title", null, style); selection_artist = (AgentSelectionElement) formFactory.createSelectionElement(SelectionType.AGENT, getConversationHolder(), element, "Artist", null, style); text_description = formFactory.createLanguageStringWithLabelElement(element, "Description", null, 100, style); section_mediaRepresentation = (MediaRepresentationSection) formFactory.createEntityDetailSection(EntityDetailType.MEDIAREPRESENTATION, getConversationHolder(), element, style); diff --git a/taxeditor-store/plugin.xml b/taxeditor-store/plugin.xml index 248134d02..1915742e2 100644 --- a/taxeditor-store/plugin.xml +++ b/taxeditor-store/plugin.xml @@ -113,7 +113,7 @@ category="eu.etaxonomy.taxeditor.preferences.general" class="eu.etaxonomy.taxeditor.preference.MatchingPreferences" id="eu.etaxonomy.taxeditor.preferences.matching" - name="Matching"> + name="Matching (Experimental)"> + + + + @@ -680,6 +686,13 @@ properties="isCompatible" type="org.eclipse.jface.viewers.IStructuredSelection"> + + @@ -692,6 +705,15 @@ + + + + + + diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CloseConnectionHandler.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CloseConnectionHandler.java index defaee192..e2c9aeca5 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CloseConnectionHandler.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/CloseConnectionHandler.java @@ -39,9 +39,8 @@ public class CloseConnectionHandler extends AbstractHandler { boolean confirmed = MessageDialog.openConfirm(shell, "Confirm Datasource Close", "Do you really want to close the datasource connection?\n\n"); - if(confirmed){ - CdmStore.close(null); + CdmStore.close(StoreUtil.getMonitor()); } CdmDataSourceViewPart view = (CdmDataSourceViewPart) StoreUtil.getView(CdmDataSourceViewPart.ID, true); diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DataSourceMenuPropertyTester.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DataSourceMenuPropertyTester.java index 5cf0b2df5..e97653356 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DataSourceMenuPropertyTester.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/datasource/handler/DataSourceMenuPropertyTester.java @@ -14,6 +14,8 @@ import org.eclipse.core.expressions.PropertyTester; import org.eclipse.jface.viewers.IStructuredSelection; import eu.etaxonomy.taxeditor.datasource.view.CdmMetaDataAwareDataSourceContainer; +import eu.etaxonomy.taxeditor.preference.IPreferenceKeys; +import eu.etaxonomy.taxeditor.preference.PreferencesUtil; /** *

DataSourceMenuPropertyTester class.

@@ -47,10 +49,13 @@ public class DataSourceMenuPropertyTester extends PropertyTester { if (COMPATIBLE.equals(property)) { return isCompatible(selectedElements); } + return false; } + + /** * @param selectedElements * @return diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java index 660366a0e..09b5afca0 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/AbstractIOManager.java @@ -47,10 +47,12 @@ public abstract class AbstractIOManager { * @param configurator a CONFIGURATOR object. */ public void run(final CONFIGURATOR configurator){ - + // create job Job job = createIOJob(configurator); + // configure the job job.setProperty(IProgressConstants.KEEP_PROPERTY, true); job.setUser(true); + // schedule job job.schedule(); } diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java index 303c5afac..4b946fa36 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/wizard/AbstractImportWizard.java @@ -24,7 +24,6 @@ import org.eclipse.ui.IWorkbenchPage; import eu.etaxonomy.cdm.io.common.IImportConfigurator; import eu.etaxonomy.cdm.io.common.IIoConfigurator; -import eu.etaxonomy.taxeditor.store.StoreUtil; /** *

Abstract AbstractImportWizard class.

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractCdmViewPart.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractCdmViewPart.java index 484e1b537..360a2f61e 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractCdmViewPart.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractCdmViewPart.java @@ -82,10 +82,7 @@ public abstract class AbstractCdmViewPart extends ViewPart implements ISelection } private void createViewerComposite(Composite parent) { - viewerComposite = new SashForm(parent, SWT.HORIZONTAL); - - } /** @@ -102,8 +99,6 @@ public abstract class AbstractCdmViewPart extends ViewPart implements ISelection * @param selection a {@link org.eclipse.jface.viewers.ISelection} object. */ public void showViewer(IWorkbenchPart part, ISelection selection){ - - this.part = part; IStructuredSelection structuredSelection = (IStructuredSelection) selection; diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java index 362a406f0..aa66420a0 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/model/AbstractUtility.java @@ -42,6 +42,7 @@ import org.eclipse.ui.IWorkbenchPart; import org.eclipse.ui.PartInitException; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.ide.undo.WorkspaceUndoUtil; +import org.eclipse.ui.part.EditorPart; import org.eclipse.ui.progress.IProgressService; import org.eclipse.ui.progress.IWorkbenchSiteProgressService; import org.eclipse.ui.themes.ITheme; @@ -63,6 +64,26 @@ public abstract class AbstractUtility { /** Constant statusLineManager */ protected static IStatusLineManager statusLineManager; + + /** + *

closeAll

+ * + * @return a boolean. + */ + public static boolean closeAll() { + return getActivePage().closeAllEditors(true); + } + + /** + * Close the given editor. + * + * @param editor The MultipageTaxonEditor to close. + * @return true on success + */ + public static boolean close(EditorPart editor) { + return getActivePage().closeEditor(editor, true); + } + /** *

getShell

* @@ -114,7 +135,7 @@ public abstract class AbstractUtility { */ public static IViewPart showView(String id){ try { - return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(id); + return PlatformUI.getWorkbench().getActiveWorkbenchWindow().getActivePage().showView(id, null, IWorkbenchPage.VIEW_VISIBLE); } catch (PartInitException e) { error(AbstractUtility.class, "Could not open view: " + id, e); throw new RuntimeException(e); @@ -147,15 +168,6 @@ public abstract class AbstractUtility { } return null; } - - /** - *

closeAll

- * - * @return a boolean. - */ - public static boolean closeAll() { - return getActivePage().closeAllEditors(true); - } /** *

getService

diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java index dffdef1ee..925084e76 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/IPreferenceKeys.java @@ -97,4 +97,6 @@ public interface IPreferenceKeys { * The language to be used for all things multilanguage */ public static final String GLOBAL_LANGUAGE_UUID = "eu.etaxonomy.taxeditor.globalLanguage"; + + public static final String SHOW_EXPERIMENTAL_FEATURES = "eu.etaxonomy.taxeditor.showExperimentalFeatures"; } diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java new file mode 100644 index 000000000..aee9397c9 --- /dev/null +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencePropertyTester.java @@ -0,0 +1,46 @@ +// $Id$ +/** +* Copyright (C) 2007 EDIT +* European Distributed Institute of Taxonomy +* http://www.e-taxonomy.eu +* +* The contents of this file are subject to the Mozilla Public License Version 1.1 +* See LICENSE.TXT at the top of this package for the full license terms. +*/ + +package eu.etaxonomy.taxeditor.preference; + +import org.eclipse.core.expressions.PropertyTester; + +/** + * @author n.hoffmann + * @created Jan 26, 2011 + * @version 1.0 + */ +public class PreferencePropertyTester extends PropertyTester { + + + private static final String SHOW_EXPERIMENTAL_FEATURES = "isShowExperimentalFeatures"; + + /* (non-Javadoc) + * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object) + */ + @Override + public boolean test(Object receiver, String property, Object[] args, + Object expectedValue) { + + if(SHOW_EXPERIMENTAL_FEATURES.equals(property)){ + return isShowExperimentalFeatures(); + } + + return false; + } + + /** + * @return + */ + private boolean isShowExperimentalFeatures() { + return PreferencesUtil.getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES); + } + +} diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java index 8a98d6258..78c0f8ad7 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/preference/TaxonomicEditorGeneralPreferences.java @@ -44,6 +44,8 @@ public class TaxonomicEditorGeneralPreferences extends PreferencePage implements private boolean shouldConnectAtStartup; private boolean shouldExpandSectionWhenDataAvailable; + + private boolean shouldShowExperimentalFeatures; /* (non-Javadoc) * @see org.eclipse.jface.preference.PreferencePage#createContents(org.eclipse.swt.widgets.Composite) @@ -60,9 +62,12 @@ public class TaxonomicEditorGeneralPreferences extends PreferencePage implements createShouldConnectAtStartUp(container); createShouldExpandSectionWhenDataAvailable(container); + createShowExperimentalFeatures(container); + return container; } + private void createShouldExpandSectionWhenDataAvailable(Composite container) { shouldExpandSectionWhenDataAvailable = getPreferenceStore().getBoolean(IPreferenceKeys.SHOULD_EXPAND_SECTION_WHEN_DATA_AVAILABLE); @@ -128,7 +133,7 @@ public class TaxonomicEditorGeneralPreferences extends PreferencePage implements } private void createShouldConnectAtStartUp(Composite parent){ - shouldConnectAtStartup = getPreferenceStore().getBoolean(PreferencesUtil.SHOULD_CONNECT_AT_STARTUP); + shouldConnectAtStartup = getPreferenceStore().getBoolean(IPreferenceKeys.SHOULD_CONNECT_AT_STARTUP); final Composite composite = createComposite(parent); @@ -151,6 +156,32 @@ public class TaxonomicEditorGeneralPreferences extends PreferencePage implements }); } + /** + * @param container + */ + private void createShowExperimentalFeatures(Composite parent) { + shouldShowExperimentalFeatures = getPreferenceStore().getBoolean(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES); + final Composite composite = createComposite(parent); + + final Button button_toggle = new Button(composite, SWT.CHECK); + + + button_toggle.setText("Show experimental features-"); + + button_toggle.setSelection(shouldShowExperimentalFeatures); + + + button_toggle.addSelectionListener(new SelectionAdapter(){ + /* (non-Javadoc) + * @see org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse.swt.events.SelectionEvent) + */ + @Override + public void widgetSelected(SelectionEvent e) { + shouldShowExperimentalFeatures = button_toggle.getSelection(); + } + }); + } + private Composite createComposite(Composite parent){ Composite composite = new Composite(parent, SWT.NULL); composite.setLayoutData(new GridData(SWT.FILL, SWT.TOP, true, false, 2, 1)); @@ -174,7 +205,9 @@ public class TaxonomicEditorGeneralPreferences extends PreferencePage implements getPreferenceStore().setValue(IPreferenceKeys.EDIT_MAP_SERVICE_ACCES_POINT, editMapServiceAccessPoint); getPreferenceStore().setValue(IPreferenceKeys.SHOULD_CONNECT_AT_STARTUP, shouldConnectAtStartup); getPreferenceStore().setValue(IPreferenceKeys.SHOULD_EXPAND_SECTION_WHEN_DATA_AVAILABLE, shouldExpandSectionWhenDataAvailable); + getPreferenceStore().setValue(IPreferenceKeys.SHOW_EXPERIMENTAL_FEATURES, shouldShowExperimentalFeatures); return super.performOk(); } + } diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java index 488c8f497..cc6a56c7b 100644 --- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java +++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java @@ -148,7 +148,7 @@ public class CdmStore{ @Override public void run() { getContextManager().notifyContextAboutToStop(monitor); - if((monitor == null || (!monitor.isCanceled()) && isActive() && StoreUtil.closeAll())){ + if((monitor == null || (!monitor.isCanceled()) && isActive())){ getContextManager().notifyContextStop(monitor); if(instance.getApplicationController() != null){ instance.getApplicationController().close(); -- 2.34.1