From bb9ea9e65a62c0f3423190fca172530169361988 Mon Sep 17 00:00:00 2001
From: "n.hoffmann" <n.hoffmann@localhost>
Date: Mon, 17 Jan 2011 11:03:30 +0000
Subject: [PATCH] Fixed a problem with updating views and editors after an
 import has run; Correcting display of homotypic synonyms; reactivated
 Specimen dialog

---
 .../editor/name/SynonymContainer.java         |  2 +-
 .../DerivedUnitFacadeDetailElement.java       |  8 +++---
 .../etaxonomy/taxeditor/io/ImportManager.java | 28 -------------------
 3 files changed, 5 insertions(+), 33 deletions(-)

diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymContainer.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymContainer.java
index 1b11c164d..6de6fd6f5 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymContainer.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/SynonymContainer.java
@@ -132,7 +132,7 @@ public class SynonymContainer extends AbstractGroupedContainer<Synonym> {
 	protected void updateIndent() {
 		TaxonNameBase name = getName();
 	
-		if (!name.getHomotypicalGroup().getBasionyms().isEmpty() && !name.isGroupsBasionym()) {
+		if (!isHomotypic() && !name.getHomotypicalGroup().getBasionyms().isEmpty() && !name.isGroupsBasionym()) {
 			setIndent(HOMOTYPIC_SYNONYM_IN_HETEROTYPIC_GROUP_INDENT);
 			return;
 		}
diff --git a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailElement.java b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailElement.java
index 6da9ca286..760f4c241 100644
--- a/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailElement.java
+++ b/taxeditor-editor/src/main/java/eu/etaxonomy/taxeditor/section/occurrence/DerivedUnitFacadeDetailElement.java
@@ -62,10 +62,10 @@ public class DerivedUnitFacadeDetailElement extends AbstractCdmDetailElement<Der
 		try {
 			facade = DerivedUnitFacade.NewInstance(entity, configurator);
 			
-//			section_general.setFacade(facade);
-//			section_derivedUnitBase.setFacade(facade);
-//			section_gatheringEvent.setFacade(facade);
-//			section_fieldObservation.setFacade(facade);
+			section_general.setEntity(facade);
+			section_derivedUnitBase.setEntity(facade);
+			section_gatheringEvent.setEntity(facade);
+			section_fieldObservation.setEntity(facade);
 			
 		} catch (DerivedUnitFacadeNotSupportedException e) {
 			EditorUtil.errorDialog("Error", this, "SpecimenFacadeNotSupportedException while inititating SpecimenFacade", e);
diff --git a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
index 569f7d64f..d73ab1ae2 100644
--- a/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
+++ b/taxeditor-store/src/main/java/eu/etaxonomy/taxeditor/io/ImportManager.java
@@ -16,10 +16,8 @@ import org.eclipse.core.runtime.IStatus;
 import org.eclipse.core.runtime.Status;
 import org.eclipse.core.runtime.jobs.Job;
 import org.eclipse.swt.widgets.Display;
-import org.eclipse.ui.IWorkbenchPart;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationController;
-import eu.etaxonomy.cdm.api.conversation.IConversationEnabled;
 import eu.etaxonomy.cdm.io.berlinModel.in.BerlinModelImportConfigurator;
 import eu.etaxonomy.cdm.io.common.CdmDefaultImport;
 import eu.etaxonomy.cdm.io.common.IImportConfigurator;
@@ -80,21 +78,6 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> {
 				
 				monitor.worked(10);
 				
-//				display.asyncExec(new Runnable() {
-//					
-//					@Override
-//					public void run() {
-//						// terminate any open transactions
-//						IWorkbenchPart activePart = StoreUtil.getActivePage().getActivePart();
-//						
-//						if(activePart instanceof IConversationEnabled){
-//							IConversationEnabled conversationEnabled = (IConversationEnabled) activePart;
-//							conversationEnabled.getConversationHolder().commit(false);
-//						}
-//					}
-//				});
-				monitor.worked(10);
-				
 				CdmDefaultImport<IImportConfigurator> importer = new CdmDefaultImport<IImportConfigurator>();
 				importer.setCdmAppController(applicationController);
 				monitor.worked(10);		
@@ -115,17 +98,6 @@ public class ImportManager extends AbstractIOManager<IImportConfigurator> {
 					
 					@Override
 					public void run() {
-//						// restarting transaction and committing it to trigger change listener
-//						// TODO verify correct behaviour
-//						IWorkbenchPart activePart = StoreUtil.getActivePage().getActivePart();
-//						
-//						if(activePart instanceof IConversationEnabled){
-//							IConversationEnabled conversationEnabled = (IConversationEnabled) activePart;
-//							
-//							conversationEnabled.getConversationHolder().startTransaction();
-//							conversationEnabled.getConversationHolder().commit();
-//						}
-						
 						CdmStore.getContextManager().notifyContextRefresh();
 					}
 				});
-- 
2.34.1