From d455719e839f670a638280423026754b89a28d46 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Wed, 7 Jun 2017 11:11:23 +0200 Subject: [PATCH] ref #6694 Set pattern when creating a new feature tree --- .../selection/FeatureTreeSelectionDialog.java | 32 +------------------ 1 file changed, 1 insertion(+), 31 deletions(-) diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java index 96d531927..ef0aeef65 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java @@ -15,7 +15,6 @@ import java.util.UUID; import org.eclipse.core.runtime.IStatus; import org.eclipse.jface.dialogs.InputDialog; -import org.eclipse.jface.wizard.WizardDialog; import org.eclipse.swt.SWT; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Control; @@ -28,13 +27,10 @@ import eu.etaxonomy.cdm.api.conversation.ConversationHolder; import eu.etaxonomy.cdm.api.service.IFeatureTreeService; import eu.etaxonomy.cdm.model.description.FeatureTree; import eu.etaxonomy.cdm.persistence.dto.UuidAndTitleCache; -import eu.etaxonomy.taxeditor.featuretree.FeatureTreeEditorWizard; import eu.etaxonomy.taxeditor.newWizard.AbstractNewEntityWizard; import eu.etaxonomy.taxeditor.store.CdmStore; /** - *

FilteredFeatureTreeSelectionDialog class.

- * * @author n.hoffmann * @created Sep 17, 2010 * @version 1.0 @@ -42,48 +38,24 @@ import eu.etaxonomy.taxeditor.store.CdmStore; public class FeatureTreeSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog { - /** - * Creates a filtered selection dialog to select a named area. - * - * @param shell - * The shell for displaying this widget - * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object. - * @param featureTree a {@link eu.etaxonomy.cdm.model.description.FeatureTree} object. - * @return a {@link eu.etaxonomy.cdm.model.description.FeatureTree} object. - */ public static FeatureTree select(Shell shell, ConversationHolder conversation, FeatureTree featureTree) { FeatureTreeSelectionDialog dialog = new FeatureTreeSelectionDialog(shell, conversation, "Choose a feature tree", false, featureTree); return getSelectionFromDialog(dialog); } - /** - *

Constructor for FilteredFeatureTreeSelectionDialog.

- * - * @param shell a {@link org.eclipse.swt.widgets.Shell} object. - * @param conversation a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder} object. - * @param title a {@link java.lang.String} object. - * @param multi a boolean. - * @param cdmObject a {@link eu.etaxonomy.cdm.model.description.FeatureTree} object. - */ protected FeatureTreeSelectionDialog(Shell shell, ConversationHolder conversation, String title, boolean multi, FeatureTree cdmObject) { super(shell, conversation, title, multi, FeatureTreeSelectionDialog.class.getCanonicalName(), cdmObject); } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#getPersistentObject(java.util.UUID) - */ /** {@inheritDoc} */ @Override protected FeatureTree getPersistentObject(UUID uuid) { return CdmStore.getService(IFeatureTreeService.class).load(uuid); } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.dialogs.filteredSelection.AbstractFilteredCdmResourceSelectionDialog#initModel() - */ /** {@inheritDoc} */ @Override protected void initModel() { @@ -99,9 +71,6 @@ public class FeatureTreeSelectionDialog extends } } - /* (non-Javadoc) - * @see org.eclipse.ui.dialogs.FilteredItemsSelectionDialog#createExtendedContentArea(org.eclipse.swt.widgets.Composite) - */ /** {@inheritDoc} */ @Override protected Control createExtendedContentArea(Composite parent) { @@ -121,6 +90,7 @@ public class FeatureTreeSelectionDialog extends CdmStore.getService(IFeatureTreeService.class).save(featureTree); UuidAndTitleCache uuidAndTitleCache = new UuidAndTitleCache(FeatureTree.class, featureTree.getUuid(),featureTree.getId(), featureTree.getTitleCache()); model.add(uuidAndTitleCache); + setPattern(featureTree); } } } -- 2.34.1