From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Wed, 25 Sep 2013 09:11:33 +0000 (+0000)
Subject: merged trunk into branch
X-Git-Tag: 3.6.0~960^2~1
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b623f72278a522ba6990b1371352e68b0bf62632

merged trunk into branch
---

b623f72278a522ba6990b1371352e68b0bf62632
diff --cc eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
index d9727902a,95a87cf52..1730721f1
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java
@@@ -468,19 -468,18 +468,19 @@@ public abstract class AbstractFilteredC
  			public void widgetSelected(SelectionEvent e) {
  
  				AbstractNewEntityWizard wizard = getNewEntityWizard(e.text);
 +
  				wizard.init(null, null);
- 				if(wizard.getEntity() != null) {
- 					WizardDialog dialog = new WizardDialog(getShell(), wizard);
- 					int status = dialog.open();
+ 				WizardDialog dialog = new WizardDialog(getShell(), wizard);
+ 				int status = dialog.open();
  
- 					if (status == IStatus.OK) {
+ 				if (status == IStatus.OK) {
  
- 						T entity = (T) wizard.getEntity();
- 						refresh();
- 						setPattern(entity);
- 						getConversationHolder().bind();
- 					}
+ 					T entity = (T) wizard.getEntity();
+ 
+ //					addObjectToModel(teamOrPerson);
+ 					refresh();
+ 					setPattern(entity);
+ 					getConversationHolder().bind();
  				}
  			}
  		};