Merge branch 'develop' into wset

diff --combined eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
index 9d2cfc9e8d9342b1b182eca216bc2932c4758b5e,897e692322ff71c48d4d00bdc3230c8034aa3abc..e6a716a9d2f4eefd0912eb66710a876481a8bfd8
--- 1/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
--- 2/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
@@@ -2,7 -2,7 +2,7 @@@ Manifest-Version: 1.
  Bundle-ManifestVersion: 2
  Bundle-Name: Editor Bundle
  Bundle-SymbolicName: eu.etaxonomy.taxeditor.editor;singleton:=true
- Bundle-Version: 4.12.0.qualifier
+ Bundle-Version: 4.13.0.qualifier
  Bundle-Activator: eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin
  Bundle-Vendor: %Bundle-Vendor.0
  Bundle-Localization: OSGI-INF/l10n/plugin
@@@ -38,15 -38,11 +38,15 @@@ Require-Bundle: org.eclipse.ui
   org.eclipse.e4.ui.di,
   org.eclipse.e4.core.commands,
   org.eclipse.e4.core.services,
 - org.eclipse.e4.core.contexts
 + org.eclipse.e4.core.contexts,
 + org.eclipse.nebula.widgets.nattable.core,
 + org.eclipse.nebula.widgets.nattable.extension.glazedlists,
 + ca.odell.glazedlists
  Bundle-RequiredExecutionEnvironment: JavaSE-1.8
  Bundle-ActivationPolicy: lazy
  Import-Package: javax.annotation;version="1.0.0";resolution:=optional,
   javax.inject;version="1.0.0",
 + org.apache.commons.collections4.map,
   org.eclipse.core.databinding.beans,
   org.eclipse.core.databinding.observable.list,
   org.eclipse.core.databinding.observable.map,

diff --combined eu.etaxonomy.taxeditor.feature.platform/feature.xml
index 3025914465da803091d1b933d3ec62ce8ca0da91,b5763642a2d23c84effd1bdb91aee898184ec43d..1ebd2f56c998f8f6ebfe9297b55a09f6346a7432
--- 1/eu.etaxonomy.taxeditor.feature.platform/feature.xml
--- 2/eu.etaxonomy.taxeditor.feature.platform/feature.xml
+++ b/eu.etaxonomy.taxeditor.feature.platform/feature.xml
@@@ -2,7 -2,7 +2,7 @@@
  <feature
        id="eu.etaxonomy.taxeditor.feature.platform"
        label="Taxeditor Dependencies"
-       version="4.12.0.qualifier"
+       version="4.13.0.qualifier"
        os="linux,macosx,win32"
        ws="cocoa,gtk,win32"
        arch="x86,x86_64">
@@@ -63,6 -63,13 +63,6 @@@
           version="0.0.0"
           unpack="false"/>
  
 -   <plugin
 -         id="org.eclipse.nebula.widgets.compositetable"
 -         download-size="0"
 -         install-size="0"
 -         version="0.0.0"
 -         unpack="false"/>
 -
     <plugin
           id="org.hamcrest.core"
           download-size="0"
@@@ -238,25 -245,4 +238,25 @@@
           version="0.0.0"
           unpack="false"/>
  
 +   <plugin
 +         id="org.eclipse.nebula.widgets.nattable.core"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
 +         unpack="false"/>
 +
 +   <plugin
 +         id="ca.odell.glazedlists"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
 +         unpack="false"/>
 +
 +   <plugin
 +         id="org.eclipse.nebula.widgets.nattable.extension.glazedlists"
 +         download-size="0"
 +         install-size="0"
 +         version="0.0.0"
 +         unpack="false"/>
 +
  </feature>

diff --combined eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java
index 3aeca6e06687787703e5d0268c1e8876916b470c,cd536fff3ad1826064813988518411e0af2ddd61..8aff91fac590546e2332dbd34650254bf68014ae
--- 1/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/FeatureTreeSelectionDialog.java
--- 2/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
@@@ -13,11 -13,6 +13,11 @@@ import java.util.ArrayList
  import java.util.List;
  import java.util.UUID;
  
 +import org.eclipse.jface.dialogs.InputDialog;
 +import org.eclipse.jface.window.Window;
 +import org.eclipse.swt.events.SelectionAdapter;
 +import org.eclipse.swt.events.SelectionEvent;
 +import org.eclipse.swt.events.SelectionListener;
  import org.eclipse.swt.widgets.Shell;
  
  import eu.etaxonomy.cdm.api.service.IFeatureTreeService;
@@@ -56,7 -51,7 +56,7 @@@ public class FeatureTreeSelectionDialo
  
        /** {@inheritDoc} */
        @Override
-       protected void search() {
+       protected void callService(String pattern) {
                List<FeatureTree> featureTrees = CdmStore.getService(IFeatureTreeService.class).list(FeatureTree.class, null, null, null, null);
  
                if(model == null){
@@@ -65,33 -60,44 +65,36 @@@
                model.clear();
                for(FeatureTree featureTree : featureTrees){
                        UuidAndTitleCache<FeatureTree> element = new UuidAndTitleCache<FeatureTree>(FeatureTree.class, featureTree.getUuid(),featureTree.getId(), featureTree.getTitleCache());
-                       model.add(element);
+                       if (element.getTitleCache().matches(pattern)) {
+                 model.add(element);
+             }
                }
+ 
        }
  
 -//    /** {@inheritDoc} */
 -//    @Override
 -//    protected Control createExtendedContentArea(Composite parent) {
 -//            Link link = new Link(parent, SWT.NONE);
 -//            link.setText(getNewWizardLinkText());
 -//            link.addListener (SWT.Selection, new Listener () {
 -//                    @Override
 -//            public void handleEvent(Event event) {
 -//
 -//                        InputDialog input = new InputDialog(getShell(), "New feature tree", "Enter label for new feature tree", null, null);
 -//                            int status = input.open();
 -//                            if (status == IStatus.OK) {
 -//                                String label = input.getValue();
 -//                                if(label!=null){
 -//                                    FeatureTree featureTree = FeatureTree.NewInstance();
 -//                                    featureTree.setTitleCache(label, false);
 -//                                    CdmStore.getService(IFeatureTreeService.class).save(featureTree);
 -//                                UuidAndTitleCache<FeatureTree> uuidAndTitleCache = new UuidAndTitleCache<FeatureTree>(FeatureTree.class, featureTree.getUuid(),featureTree.getId(), featureTree.getTitleCache());
 -//                                model.add(uuidAndTitleCache);
 -//                                setPattern(featureTree);
 -//                                }
 -//                            }
 -//                    }
 -//            });
 -//            return link;
 -//    }
 +      @Override
 +    protected SelectionListener getNewWizardButtonSelectionListener(){
 +        return new SelectionAdapter() {
 +
 +            @Override
 +            public void widgetSelected(SelectionEvent e) {
 +                InputDialog dialog = new InputDialog(getShell(), "Feature tree label", "Enter label for feature tree", null, null);
 +                if (dialog.open() == Window.OK) {
 +                    // User clicked OK; update the label with the input
 +                    FeatureTree tree = FeatureTree.NewInstance();
 +                    CdmStore.getService(IFeatureTreeService.class).merge(tree,true);
 +                    tree.setTitleCache(dialog.getValue(), true);
 +                    refresh();
 +                    setPattern(tree);
 +                  }
 +            }
 +        };
 +    }
  
        /** {@inheritDoc} */
        @Override
        protected String[] getNewWizardText() {
-               return new String[]{ "Feature tree "};
+               return new String[]{ "New Feature tree"};
        }