merged trunk into branch
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 25 Sep 2013 09:11:33 +0000 (09:11 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 25 Sep 2013 09:11:33 +0000 (09:11 +0000)
1  2 
eu.etaxonomy.taxeditor.cdmlib/build.properties
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/AbstractFilteredCdmResourceSelectionDialog.java

index d9727902a7c5f96df5b847f9231a47a4d9ae4fbe,95a87cf5211b2cac8862c27141dcf26204e0d64c..1730721f108ce39b9fc38f58aa6e6daa438d2df9
@@@ -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();
                                }
                        }
                };