From: n.hoffmann <n.hoffmann@localhost>
Date: Tue, 7 Jun 2011 13:10:55 +0000 (+0000)
Subject: Refactoring of property change handling. Also fixes #2363
X-Git-Tag: rcp.ss-first-working-version~37
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/e0b35bf151c9fa684aafad55c1cce79b497893c5

Refactoring of property change handling. Also fixes #2363
---

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
index 0525acbbd..38cd1c5b7 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/AbstractFilteredCdmResourceSelectionDialog.java
@@ -199,9 +199,14 @@ public abstract class AbstractFilteredCdmResourceSelectionDialog<T extends ICdmB
 	 * @return a {@link java.lang.String} object.
 	 */
 	protected String getTitle(T cdmObject) {
+		if(cdmObject == null){
+			return "";
+		}
+		
 		if (cdmObject instanceof IIdentifiableEntity) {
 			return ((IIdentifiableEntity) cdmObject).getTitleCache();			
 		}
+		
 		throw new IllegalArgumentException("Generic method only" +
 				" supports cdmObject of type IIdentifiableEntity." +
 				" Please implement specific method in subclass.");
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ReferenceSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ReferenceSelectionDialog.java
index 175049c44..35a7f53da 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ReferenceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialogs/filteredSelection/ReferenceSelectionDialog.java
@@ -82,7 +82,9 @@ public class ReferenceSelectionDialog extends AbstractFilteredCdmResourceSelecti
 	/** {@inheritDoc} */
 	@Override
 	protected String getTitle(Reference cdmObject) {
-		if(cdmObject.getAuthorTeam() == null){
+		if(cdmObject == null){
+			return "";
+		}else if(cdmObject.getAuthorTeam() == null){
 			return super.getTitle(cdmObject);
 		}else{
 			return ReferenceBaseDefaultCacheStrategy.putAuthorToEndOfString(cdmObject.getTitleCache(), cdmObject.getAuthorTeam().getTitleCache());
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java
index 8a57b0aa2..d372d15ff 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/forms/AbstractCdmFormElement.java
@@ -13,6 +13,7 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
+import org.eclipse.swt.widgets.Event;
 import org.eclipse.ui.forms.widgets.Section;
 
 import eu.etaxonomy.taxeditor.store.StoreUtil;
@@ -233,11 +234,20 @@ public abstract class AbstractCdmFormElement implements IPropertyChangeEmitter,
 	/** {@inheritDoc} */
 	public void firePropertyChangeEvent(CdmPropertyChangeEvent event) {
 		Assert.isNotNull(propertyChangeListeners, "Property change listeners are not present");
+		
 		for(Object listener : propertyChangeListeners){
 			((IPropertyChangeListener)listener).propertyChange(event);
 		}
 	}
 	
+	public void firePropertyChangeEvent(Object object){
+		firePropertyChangeEvent(object, null);
+	}
+	
+	public void firePropertyChangeEvent(Object object, PropertyChangeEvent originatingEvent){
+		firePropertyChangeEvent(new CdmPropertyChangeEvent(object, originatingEvent));
+	}
+	
 
 	/**
 	 * {@inheritDoc}
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 dac11ef17..f20cd8780 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
@@ -185,9 +185,11 @@ public abstract class AbstractCdmDetailElement<T> extends
 						return;
 					}
 				}
-				
+				// call specific handler implementation
 				handleEvent(eventSource);
-				
+				// refire the event
+				firePropertyChangeEvent(this, event);
+				// update possible parents
 				updateParentSection();
 			}
 		}
@@ -210,7 +212,7 @@ public abstract class AbstractCdmDetailElement<T> extends
 	}
 
 	/**
-	 * <p>handleEvent</p>
+	 * Gets called when the source of the event is a child widget of this widget.
 	 *
 	 * @param eventSource a {@link java.lang.Object} object.
 	 */
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java
index 05c499996..25821d71a 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/ClassificationDetailElement.java
@@ -106,7 +106,5 @@ public class ClassificationDetailElement extends
 		} else if (eventSource == text_microReference) {
 			getEntity().setMicroReference(text_microReference.getText());
 		}
-
-		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index 0240d1caa..f45d12647 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@ -157,9 +157,6 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<ITreeNode>
 		} else if (eventSource == checkbox_openInEditor) {
 			setOpenInEditor(checkbox_openInEditor.getSelection());
 		}
-
-		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
-
 	}
 
 	/**
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
index 2b004eaa0..defd67798 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/key/PolytomousKeyNodeDetailElement.java
@@ -114,7 +114,5 @@ public class PolytomousKeyNodeDetailElement extends
 		} else if (eventSource == selection_otherNode) {
 			getEntity().setOtherNode(selection_otherNode.getEntity());
 		}
-
-		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailElement.java
index 2b8e6b33a..6cb687c41 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/HybridDetailElement.java
@@ -62,7 +62,6 @@ public class HybridDetailElement extends AbstractCdmDetailElement<NonViralName>
 		else if(eventSource == checkbox_trinomHybrid){
 			getEntity().setTrinomHybrid(checkbox_trinomHybrid.getSelection());
 		}
-		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
 	}
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
index 6ae1fa914..082317916 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
@@ -21,7 +21,6 @@ import eu.etaxonomy.cdm.model.name.ZoologicalName;
 import eu.etaxonomy.cdm.strategy.parser.ParserProblem;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.forms.CdmFormFactory.TermComboType;
-import eu.etaxonomy.taxeditor.ui.forms.CdmPropertyChangeEvent;
 import eu.etaxonomy.taxeditor.ui.forms.CheckboxElement;
 import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.forms.IEnableableFormElement;
@@ -29,7 +28,6 @@ import eu.etaxonomy.taxeditor.ui.forms.ISelectableElement;
 import eu.etaxonomy.taxeditor.ui.forms.NumberWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.forms.SelectionArbitrator;
 import eu.etaxonomy.taxeditor.ui.forms.TextWithLabelElement;
-import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement;
 import eu.etaxonomy.taxeditor.ui.term.AbstractTermComboElement;
 
@@ -176,7 +174,8 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<N
 	public void handleEvent(Object eventSource){
 		if(eventSource == combo_rank){
 			getEntity().setRank(combo_rank.getSelection());
-			clearCheckRankWarnings();	
+			clearCheckRankWarnings();
+			updateContent();
 		}		
 		else if(eventSource == text_appendedPhrase){
 			getEntity().setAppendedPhrase(text_appendedPhrase.getText());
@@ -199,16 +198,6 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<N
 		else if(eventSource == checkbox_anamorphic){
 			((BotanicalName)getEntity()).setAnamorphic(checkbox_anamorphic.getSelection());
 		}
-		
-		
-		if(eventSource != toggleable_cache && !toggleable_cache.getLayoutComposite().isDisposed()){
-			toggleable_cache.setText(getEntity().getNameCache());
-		}
-		
-//		// we have to notify the parent if this is embedded in the nonviral name section
-//		// maybe we can handle this a little bit more elegant
-//		if(getParentElement() instanceof AbstractCdmDetailSection)
-//			firePropertyChangeEvent(new CdmPropertyChangeEvent(getParentElement(), null));
 	}
 		
 	/*
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
index e72ba626d..819e6f6e3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
@@ -145,16 +145,11 @@ public class NonViralNameDetailElement extends
 	@Override
 	public void handleEvent(Object eventSource) {
 		if (eventSource == toggleable_cache) {
-			getEntity().setTitleCache(toggleable_cache.getText(),
-					toggleable_cache.getState());
+			handleToggleableCacheField();
 			// we never want the fullTitleCache to be protected since we only
 			// use it for
 			// initiating the free text name editor
 			getEntity().setProtectedFullTitleCache(false);
-			boolean irrelevant = toggleable_cache.getState();
-			List<Object> except = Arrays
-					.asList(new Object[] { toggleable_cache });
-			setIrrelevant(irrelevant, except);
 		} else if (eventSource == section_name || eventSource == section_author) {
 			if (getParentElement() instanceof AbstractCdmDetailSection)
 				((AbstractCdmDetailSection) getParentElement()).updateTitle();
@@ -166,7 +161,5 @@ public class NonViralNameDetailElement extends
 			section_name.setEntity(getEntity());
 			getLayoutComposite().layout();
 		}
-
-		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
index cbf150ff1..735fac83d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/FieldObservationDetailElement.java
@@ -95,6 +95,5 @@ public class FieldObservationDetailElement extends AbstractCdmDetailElement<Deri
 		else if(eventSource == combo_sex){
 			getEntity().setSex(combo_sex.getSelection());
 		}
-		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
index 73a01940b..f47e243da 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GatheringEventDetailElement.java
@@ -154,6 +154,5 @@ public class GatheringEventDetailElement extends
 			getEntity().setGatheringEventDescription(
 					text_gatheringEventDescription.getText());
 		}
-		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
index 91eb4e87a..1f0e00410 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/GeneralDetailElement.java
@@ -133,7 +133,6 @@ public class GeneralDetailElement extends
 		if (eventSource != toggleableText_titleCache) {
 			toggleableText_titleCache.setText(getEntity().getTitleCache());
 		}
-		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
 	}
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
index 60dc85c60..5489fc701 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/user/UserDetailElement.java
@@ -110,7 +110,6 @@ public class UserDetailElement extends AbstractCdmDetailElement<User> {
 			getEntity().setCredentialsNonExpired(
 					checkbox_credentialsNonExpired.getSelection());
 		}
-		firePropertyChangeEvent(new CdmPropertyChangeEvent(this, null));
 	}
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ReferenceSelectionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ReferenceSelectionElement.java
index d5bdc1948..18629c9ae 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ReferenceSelectionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/ReferenceSelectionElement.java
@@ -68,11 +68,13 @@ public class ReferenceSelectionElement extends
 		Reference newSelection = ReferenceSelectionDialog.select(getShell(),
 				getConversationHolder(), entity);
 
-		Reference freshlyLoadedSelection = null;
-		if (newSelection != null)
-			freshlyLoadedSelection = CdmStore.getService(
-					IReferenceService.class).load(newSelection.getUuid());
-
-		setSelectionInternal(freshlyLoadedSelection);
+		setSelectionInternal(newSelection);
+		
+//		Reference freshlyLoadedSelection = null;
+//		if (newSelection != null)
+//			freshlyLoadedSelection = CdmStore.getService(
+//					IReferenceService.class).load(newSelection.getUuid());
+//
+//		setSelectionInternal(freshlyLoadedSelection);
 	}
 }
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 2a8321d42..097d78afe 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
@@ -23,7 +23,7 @@ import eu.etaxonomy.taxeditor.model.PolytomousKeyRelationship;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.ui.forms.AbstractFormSection;
-import eu.etaxonomy.taxeditor.ui.forms.ICdmFormElement;
+import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 import eu.etaxonomy.taxeditor.ui.section.ITaxonBaseDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.IDerivedUnitFacadeDetailSection;
 
@@ -103,8 +103,8 @@ public class CdmSectionPart<T> extends SectionPart implements
 			Object eventSource = event.getSource();
 
 			if (formSection.equals(eventSource)
-					|| (eventSource instanceof ICdmFormElement && formSection
-							.containsFormElement((ICdmFormElement) eventSource))) {
+					|| (eventSource instanceof AbstractCdmDetailElement && formSection
+							.containsFormElement((AbstractCdmDetailElement) eventSource))) {
 				markDirty();
 			}
 		}
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 941e099f3..e9ed4f3d3 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
@@ -115,10 +115,10 @@ public class DetailsViewer extends AbstractCdmDataViewer {
 		super(parent, viewPart);
 	}
 
-	// START HACK TO MAKE THE DERIVED UNIT FACADE WORKING
+	// START HACK TO MAKE THE DERIVED UNIT FACADE WORK
 	// since we are getting implementations of DerivedUnitBase from the bulk
 	// editor
-	// and not derived unit base objects,
+	// and not derived unit facade objects,
 
 	/*
 	 * (non-Javadoc)
@@ -150,7 +150,7 @@ public class DetailsViewer extends AbstractCdmDataViewer {
 		super.markViewPartDirty();
 	}
 
-	// END HACK TO MAKE THE DERIVED UNIT FACADE WORKING
+	// END HACK TO MAKE THE DERIVED UNIT FACADE WORK
 
 	/*
 	 * (non-Javadoc)