Merge branch 'develop' into remoting-4.0

Conflicts:
	eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java

diff --cc eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
index 8db6230ba7d0492fa4301d8d5824950a8615ec3c,720cd61578f40be821155fd125e1bf851df858f4..c26e4b2eb20c2dd842d9e18316f697af29a1328f
--- 1/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
--- 2/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditor.java
@@@ -198,12 -170,8 +170,9 @@@ public class BulkEditor extends Annotat
                        displayWarningDialog();
                        isInitialFocus = false;
                }
 +              super.setFocus();
        }
  
-       /**
-        *
-        */
        private void displayWarningDialog() {
                IPreferenceStore prefs = PreferencesUtil.getPreferenceStore();
                if (!prefs.getBoolean(PreferencesUtil.HIDE_BULKEDITOR_INFO)) {

diff --cc eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
index 83795a4aa5485383159f8584b6bb5f5af63f4ba6,36a7cc9bc78ea0695119e9c55e51114b4cf526d7..1ed2910f4c7e595805a3127b7b2e39357a406f96
--- 1/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
--- 2/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java
@@@ -59,27 -48,11 +48,13 @@@ public class AgentEditorInput extends A
                return ID;
        }
  
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IEditorInput#getName()
-        */
-       /**
-        * <p>getName</p>
-        *
-        * @return a {@link java.lang.String} object.
-        */
++
        @Override
      public String getName() {
                return BulkEditorInputType.AGENT.label;
        }
  
-       /* (non-Javadoc)
-        * @see org.eclipse.ui.IEditorInput#getToolTipText()
-        */
-       /**
-        * <p>getToolTipText</p>
-        *
-        * @return a {@link java.lang.String} object.
-        */
++
        @Override
      public String getToolTipText() {
                return getName();
@@@ -106,9 -71,6 +73,7 @@@
                return true;
        }
  
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInput#isMergingEnabled()
-        */
++
        /** {@inheritDoc} */
        @Override
        public boolean isConvertingEnabled() {
@@@ -156,7 -117,7 +120,6 @@@
  
  
        public boolean delete(AgentBase entity) throws ReferencedObjectUndeletableException  {
--
                        return CdmStore.getService(IAgentService.class).delete(entity) != null;
  
        }
@@@ -179,9 -137,6 +139,7 @@@
                return sortProviders;
        }
  
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#createEntityCreator()
-        */
++
        @Override
        protected IEntityCreator<TeamOrPersonBase> createEntityCreator() {
                return new AgentCreator();