Merge pull request #703 from Mailaender/dirty-focus

Fixed editor being marked as dirty when there are no changes
eclipse-chemclipse · Aug 13, 2021 · 9d8bafb · 9d8bafb
2 parents 2b34d9d + fb7ed77
commit 9d8bafb
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 6 deletions.
diff --git a/...tension.msd.ui/src/org/eclipse/chemclipse/ux/extension/msd/ui/editors/DatabaseEditor.java b/...tension.msd.ui/src/org/eclipse/chemclipse/ux/extension/msd/ui/editors/DatabaseEditor.java
@@ -248,7 +248,6 @@ private void importMassSpectra(File file, boolean batch) throws FileNotFoundExce
 		/*
 		 * Add the mass spectra handling.
 		 */
-		dirtyable.setDirty(true);
 		massSpectra = runnable.getMassSpectra();
 		massSpectrumFile = file;
 		massSpectra.addUpdateListener(new IUpdateListener() {

diff --git a/...ion.msd.ui/src/org/eclipse/chemclipse/ux/extension/msd/ui/editors/MassSpectrumEditor.java b/...ion.msd.ui/src/org/eclipse/chemclipse/ux/extension/msd/ui/editors/MassSpectrumEditor.java
@@ -278,7 +278,6 @@ private void importMassSpectrum(File file, boolean batch) throws FileNotFoundExc
 		} catch(InterruptedException e) {
 			logger.warn(e);
 		}
-		dirtyable.setDirty(true);
 		massSpectra = runnable.getMassSpectra();
 		massSpectrumFile = file;
 	}

diff --git a/...on.ui/src/org/eclipse/chemclipse/ux/extension/ui/provider/ISupplierFileEditorSupport.java b/...on.ui/src/org/eclipse/chemclipse/ux/extension/ui/provider/ISupplierFileEditorSupport.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2017, 2020 Lablicate GmbH.
+ * Copyright (c) 2017, 2021 Lablicate GmbH.
  * 
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -36,6 +36,7 @@
 import org.eclipse.e4.ui.workbench.modeling.EModelService;
 import org.eclipse.e4.ui.workbench.modeling.EPartService;
 import org.eclipse.e4.ui.workbench.modeling.EPartService.PartState;
+import org.eclipse.swt.widgets.Shell;
 
 public interface ISupplierFileEditorSupport extends ISupplierFileIdentifier {
 
@@ -126,5 +127,6 @@ default void openEditor(File file, Object object, String elementId, String contr
 		 */
 		partStack.getChildren().add(part);
 		partService.showPart(part, PartState.ACTIVATE);
+		((Shell)window.getWidget()).forceFocus();
 	}
 }
diff --git a/...ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/AbstractChromatogramEditor.java b/...ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/AbstractChromatogramEditor.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2018, 2020 Lablicate GmbH.
+ * Copyright (c) 2018, 2021 Lablicate GmbH.
  *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
@@ -259,7 +259,6 @@ private synchronized void initialize(Composite parent) {
 		//
 		if(chromatogramSelection != null) {
 			part.setLabel(ChromatogramDataSupport.getChromatogramEditorLabel(chromatogramSelection));
-			dirtyable.setDirty(true);
 			chromatogramSelection.update(true);
 		}
 	}

diff --git a/...ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/QuantitationDatabaseEditor.java b/...ui/src/org/eclipse/chemclipse/ux/extension/xxd/ui/editors/QuantitationDatabaseEditor.java
@@ -126,7 +126,6 @@ public IQuantitationDatabase getQuantitationDatabase() {
 	private void initialize(Composite parent) {
 
 		createEditorPages(parent);
-		dirtyable.setDirty(true);
 		quantitationDatabase = loadQuantitationDatabase();
 		extendedQuantCompoundListUI.update(quantitationDatabase);
 	}