commit 8481f9520218ee4ff2325a03e484930befa446cf
Author: Andreas Müller <a.mueller@bgbm.org>
Date:   Wed May 27 18:40:02 2020 +0200

    cleanup

diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/Application.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/Application.java
index 1359050e5..0e6edba82 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/Application.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/Application.java
@@ -10,15 +10,11 @@ import org.eclipse.ui.PlatformUI;
  * This class controls all aspects of the application's execution
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class Application implements IApplication {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#start(org.eclipse.equinox.app.IApplicationContext)
-	 */
-	/** {@inheritDoc} */
-	public Object start(IApplicationContext context) {
+	@Override
+    public Object start(IApplicationContext context) {
 		Display display = PlatformUI.createDisplay();
 		try {
 			int returnCode = PlatformUI.createAndRunWorkbench(display, new ApplicationWorkbenchAdvisor());
@@ -31,21 +27,19 @@ public class Application implements IApplication {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.equinox.app.IApplication#stop()
-	 */
-	/**
-	 * <p>stop</p>
-	 */
-	public void stop() {
+	@Override
+    public void stop() {
 		final IWorkbench workbench = PlatformUI.getWorkbench();
-		if (workbench == null)
-			return;
+		if (workbench == null) {
+            return;
+        }
 		final Display display = workbench.getDisplay();
 		display.syncExec(new Runnable() {
-			public void run() {
-				if (!display.isDisposed())
-					workbench.close();
+			@Override
+            public void run() {
+				if (!display.isDisposed()) {
+                    workbench.close();
+                }
 			}
 		});
 	}
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
index 75e32e5f1..d2135e5f0 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationActionBarAdvisor.java
@@ -14,7 +14,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
  * new actions.
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 
@@ -30,10 +29,10 @@ public class ApplicationActionBarAdvisor extends ActionBarAdvisor {
 		super(configurer);
 	}
 
-	/** {@inheritDoc} */
-	protected void makeActions(final IWorkbenchWindow window) {
+	@Override
+    protected void makeActions(final IWorkbenchWindow window) {
 		StoreUtil.setStatusLineManager(getActionBarConfigurer().getStatusLineManager());
-		
+
 		saveAction = ActionFactory.SAVE.create(window);
 		register(saveAction);
 
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
index f5c553f74..a72f5af6a 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchAdvisor.java
@@ -20,7 +20,6 @@ import eu.etaxonomy.taxeditor.store.CdmAuthenticationException;
  * <p>ApplicationWorkbenchAdvisor class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
 
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
index 4057ed1d6..71ba9cfc8 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/ApplicationWorkbenchWindowAdvisor.java
@@ -21,9 +21,7 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.util.ApplicationUtil;
 
 /**
- *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class ApplicationWorkbenchWindowAdvisor extends WorkbenchWindowAdvisor {
 
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java
index 3d2a3330d..0067f170c 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/TaxonomicEditorPlugin.java
@@ -19,7 +19,6 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils;
  * The activator class controls the plug-in life cycle
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class TaxonomicEditorPlugin extends AbstractUIPlugin {
 	private static final Logger logger = Logger
@@ -34,13 +33,13 @@ public class TaxonomicEditorPlugin extends AbstractUIPlugin {
 
 	private PackageAdmin packageAdmin;
 
-	private ServiceReference packageAdminRef;
+	private ServiceReference<?> packageAdminRef;
 
 	/** Constant <code>bundleContext</code> */
 	protected static BundleContext bundleContext;
 
 
-	private ServiceRegistration policyRegistration;
+	private ServiceRegistration<?> policyRegistration;
 
 	private ProvisioningSession session;
 	private ProvisioningUI ui;
@@ -53,11 +52,6 @@ public class TaxonomicEditorPlugin extends AbstractUIPlugin {
 	public TaxonomicEditorPlugin() {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public void start(BundleContext context) throws Exception {
 		super.start(context);
@@ -88,11 +82,6 @@ public class TaxonomicEditorPlugin extends AbstractUIPlugin {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public void stop(BundleContext context) throws Exception {
 	    plugin = null;
@@ -116,7 +105,7 @@ public class TaxonomicEditorPlugin extends AbstractUIPlugin {
 	public ProvisioningUI getProvisioningUI() {
 
 	    if (ui == null) {
-	        ServiceReference reference = bundleContext.getServiceReference(IProvisioningAgent.SERVICE_NAME);
+	        ServiceReference<?> reference = bundleContext.getServiceReference(IProvisioningAgent.SERVICE_NAME);
 	        IProvisioningAgent agent = (IProvisioningAgent) bundleContext.getService(reference);
 	        session = new ProvisioningSession(agent);
 	        Policy policy = null;// = (Policy) ServiceHelper.getService(ProvUIActivator.getContext(), Policy.class.getName());
@@ -127,6 +116,4 @@ public class TaxonomicEditorPlugin extends AbstractUIPlugin {
 	    }
 	    return ui;
 	}
-
-
 }
diff --git a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Uses.java b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Uses.java
index 92ffa76d4..911fdf3ee 100644
--- a/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Uses.java
+++ b/eu.etaxonomy.taxeditor.application/src/main/java/eu/etaxonomy/taxeditor/perspective/Uses.java
@@ -11,14 +11,9 @@ import eu.etaxonomy.taxeditor.editor.AppModelId;
  * Uses Class
  * @author a.theys
  * @created mar 13, 2012
- * @version 1.0
  */
 public class Uses extends Default {
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.IPerspectiveFactory#createInitialLayout(org.eclipse.ui.IPageLayout)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public void createInitialLayout(IPageLayout layout) {
 		layout.addView(NAVIGATOR, IPageLayout.LEFT, 0.25f, layout.getEditorArea());
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/EntityListener.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/EntityListener.java
index 6e1468783..75f18128f 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/EntityListener.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/annotatedlineeditor/EntityListener.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -19,17 +19,14 @@ import org.apache.log4j.Logger;
  *
  * @author p.ciardelli
  * @created 31.08.2009
- * @version 1.0
  */
 abstract public class EntityListener implements PropertyChangeListener {
-	private static final Logger logger = Logger
-			.getLogger(EntityListener.class);
 
-	/* (non-Javadoc)
-	 * @see java.beans.PropertyChangeListener#propertyChange(java.beans.PropertyChangeEvent)
-	 */
-	/** {@inheritDoc} */
-	public void propertyChange(PropertyChangeEvent evt) {
+    @SuppressWarnings("unused")
+    private static final Logger logger = Logger.getLogger(EntityListener.class);
+
+	@Override
+    public void propertyChange(PropertyChangeEvent evt) {
 		updateEntity();
 	}
 
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java
index b1d8f21f9..c38bf4713 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorUtil.java
@@ -29,11 +29,9 @@ import eu.etaxonomy.taxeditor.workbench.WorkbenchUtility;
  *
  * @author n.hoffmann
  * @created Mar 12, 2010
- * @version 1.0
  */
 public class BulkEditorUtil extends AbstractUtility{
 
-
 	/**
 	 * <p>getPluginId</p>
 	 *
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java
index 48359f4db..9f0502897 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/command/BulkEditorPropertyTester.java
@@ -40,7 +40,6 @@ public class BulkEditorPropertyTester extends PropertyTester {
     public static final String IS_TEAM = "isTeam";
     public static final String IS_MEDIA_EDITOR = "isMediaEditor";
 
-    /** {@inheritDoc} */
 	@Override
     public boolean test(Object receiver, String property, Object[] args,
 			Object expectedValue) {
@@ -48,11 +47,11 @@ public class BulkEditorPropertyTester extends PropertyTester {
 
 		bulkEditor = (BulkEditorE4) receiver;
 		if (IS_MERGING_ENABLED.equals(property)) {
-			AbstractBulkEditorInput input = bulkEditor.getEditorInput();
+			AbstractBulkEditorInput<?> input = bulkEditor.getEditorInput();
 			return ((AbstractBulkEditorInput<?>) input).isMergingEnabled();
 		}
 		if (IS_CONVERT_ENABLED.equals(property)) {
-		    AbstractBulkEditorInput input = bulkEditor.getEditorInput();
+		    AbstractBulkEditorInput<?> input = bulkEditor.getEditorInput();
 		    return ((AbstractBulkEditorInput<?>) input).isConvertingEnabled();
 		}
 		else if(IS_GROUP_EDITOR.equals(property)){
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java
index 35b950d86..1fa3f0e0c 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/BulkEditorE4.java
@@ -65,10 +65,8 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 
 /**
- *
  * @author pplitzner
  * @since Sep 8, 2017
- *
  */
 public class BulkEditorE4 implements IPartContentHasDetails, IConversationEnabled, IPostOperationEnabled,
         IDirtyMarkable, IDerivedUnitFacadePart, IPartContentHasFactualData,
@@ -98,7 +96,6 @@ public class BulkEditorE4 implements IPartContentHasDetails, IConversationEnable
     public BulkEditorE4() {
 	}
 
-	@SuppressWarnings("unused")
     public void init(AbstractBulkEditorInput<?> input){
 	    this.input = input;
 	    this.conversation = input.getConversation();
@@ -107,7 +104,6 @@ public class BulkEditorE4 implements IPartContentHasDetails, IConversationEnable
 	    bulkEditorComposite.init(input);
 	}
 
-	/** {@inheritDoc} */
 	@PostConstruct
 	public void createPartControl(Composite parent, IEclipseContext context) {
 	    bulkEditorComposite = new BulkEditorE4Composite(this, parent, SWT.NONE);
@@ -314,9 +310,6 @@ public class BulkEditorE4 implements IPartContentHasDetails, IConversationEnable
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void update() {
         input.performSearch(lastQuery, getSelection());
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/command/DynamicMarkerTypeEditingMenuE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/command/DynamicMarkerTypeEditingMenuE4.java
index 455db1dd2..fa9464fb5 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/command/DynamicMarkerTypeEditingMenuE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/command/DynamicMarkerTypeEditingMenuE4.java
@@ -32,10 +32,8 @@ import eu.etaxonomy.taxeditor.l10n.Messages;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
- *
  * @author pplitzner
  * @date 26.09.2017
- *
  */
 public class DynamicMarkerTypeEditingMenuE4 {
 
@@ -43,7 +41,6 @@ public class DynamicMarkerTypeEditingMenuE4 {
     public static final String COMMAND_PARAMETER_MARKER_TYPE = COMMAND_ID+".markerType"; //$NON-NLS-1$
     public static final String COMMAND_PARAMETER_MARKER_STATE = COMMAND_ID+".markerState"; //$NON-NLS-1$
 
-	/** {@inheritDoc} */
     @AboutToShow
     public void aboutToShow(List<MMenuElement> items, @Named(IServiceConstants.ACTIVE_SELECTION)Object selection) {
         if(selection instanceof StructuredSelection && ((StructuredSelection)selection).isEmpty()){
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/command/DynamicNewObjectMenuE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/command/DynamicNewObjectMenuE4.java
index 962da79b5..09a17b80c 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/command/DynamicNewObjectMenuE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/e4/command/DynamicNewObjectMenuE4.java
@@ -32,17 +32,14 @@ import eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput;
 import eu.etaxonomy.taxeditor.l10n.Messages;
 
 /**
- *
  * @author pplitzner
  * @date 12.09.2017
- *
  */
 public class DynamicNewObjectMenuE4 {
 
 	private Map<? extends Object, String> classLabelPairs;
     private BulkEditorE4 editor;
 
-	  /** {@inheritDoc} */
     @AboutToShow
     public void aboutToShow(@Named(IServiceConstants.ACTIVE_PART)MPart activePart,
             List<MMenuElement> items) {
@@ -71,7 +68,6 @@ public class DynamicNewObjectMenuE4 {
 
         menuItem.setCommand(mCommand);
         menu.getChildren().add(menuItem);
-
 	}
 
 	/**
@@ -80,7 +76,7 @@ public class DynamicNewObjectMenuE4 {
 	 */
 	private Map<? extends Object, String> getClassLabelPairs() {
 		if (editor != null){
-		    AbstractBulkEditorInput input = editor.getEditorInput();
+		    AbstractBulkEditorInput<?> input = editor.getEditorInput();
 
 		    IEntityCreator<?> entityCreator = input.getEntityCreator();
 		    if(entityCreator!=null){
@@ -88,6 +84,8 @@ public class DynamicNewObjectMenuE4 {
 		    }
 		}
 
-		return Collections.EMPTY_MAP;
+		@SuppressWarnings("unchecked")
+        Map<? extends Object, String> result = Collections.EMPTY_MAP;
+		return result;
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
index 6dd0b606b..371208157 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AbstractBulkEditorInput.java
@@ -52,8 +52,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 /**
  * @author p.ciardelli
  * @created 25.06.2009
- * @version 1.0
- * @param <T>
  */
 public abstract class AbstractBulkEditorInput<T extends CdmBase> extends CdmEntitySessionInput implements
     IEntityPersistenceService<T> {
@@ -336,8 +334,6 @@ public abstract class AbstractBulkEditorInput<T extends CdmBase> extends CdmEnti
 		return false;
 	}
 
-
-	/** {@inheritDoc} */
 	@Override
     public boolean merge(T entity, T mergeTarget) {
 		if (entity instanceof IMergable) {
@@ -390,7 +386,6 @@ public abstract class AbstractBulkEditorInput<T extends CdmBase> extends CdmEnti
 	    mergedEntities.clear();
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public T create(T entity) {
 		return save(entity);
diff --git a/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
index bd2cd700f..d35b6b314 100644
--- a/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
@@ -115,20 +115,16 @@ public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase>
 		return instance;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public boolean isMergingEnabled() {
 		return true;
 	}
 
-
-	/** {@inheritDoc} */
 	@Override
 	public boolean isConvertingEnabled() {
 		return true;
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public boolean merge(TeamOrPersonBase entity, TeamOrPersonBase mergeTarget) {
 		if (entity instanceof IMergable) {
@@ -163,7 +159,6 @@ public class AgentEditorInput extends AbstractBulkEditorInput<TeamOrPersonBase>
         return CdmStore.getService(IAgentService.class).countByTitle(configurator);
     }
 
-	/** {@inheritDoc} */
 	@Override
 	public List<TeamOrPersonBase> listEntities(IIdentifiableEntityServiceConfigurator configurator) {
 
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
index 6cf2ee2db..582e2c5b4 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/ReferenceEditorInput.java
@@ -150,7 +150,6 @@ public class ReferenceEditorInput extends AbstractBulkEditorInput<Reference> {
         return CdmStore.getService(IReferenceService.class).countByTitle(configurator);
     }
 
-	/** {@inheritDoc} */
 	@Override
 	public List listEntities(IIdentifiableEntityServiceConfigurator configurator) {
 		return CdmStore.getSearchManager().findReferences(configurator);
@@ -158,7 +157,6 @@ public class ReferenceEditorInput extends AbstractBulkEditorInput<Reference> {
 
 	// Entity persistence
 
-	/** {@inheritDoc} */
 	@Override
 	public Reference loadEntity(UUID entityUuid) {
 		List<String> propertyPaths = Arrays.asList(new String[]{"*", "inReference.*", "authorTeam.*"});
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
index 8d4526aa8..1c1276cd6 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/AgentCreator.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -24,14 +24,13 @@ import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
  *
  * @author p.ciardelli
  * @created 18.09.2009
- * @version 1.0
  */
 public class AgentCreator implements IEntityCreator<TeamOrPersonBase> {
-	private static final Logger logger = Logger.getLogger(AgentCreator.class);
 
+    private static final Logger logger = Logger.getLogger(AgentCreator.class);
 
-	/** {@inheritDoc} */
-	public TeamOrPersonBase createEntity(String text) {
+	@Override
+    public TeamOrPersonBase createEntity(String text) {
 		// FIXME
 		logger.error("FIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXMEFIXME");
 		logger.error("We can only create Persons at the moment. See #1820");
@@ -39,15 +38,15 @@ public class AgentCreator implements IEntityCreator<TeamOrPersonBase> {
 		return createEntity(Person.class, text);
 	}
 
-	/** {@inheritDoc} */
-	public TeamOrPersonBase createEntity(Object key, String text) {
-		TeamOrPersonBase teamOrPerson = null;
+	@Override
+    public TeamOrPersonBase createEntity(Object key, String text) {
+		TeamOrPersonBase<?> teamOrPerson = null;
 		if (Team.class.equals((key))) {
 			teamOrPerson = Team.NewInstance();
 		}
 		if (Person.class.equals((key))) {
 			teamOrPerson = Person.NewInstance();
-		}		
+		}
 		if (teamOrPerson != null) {
 			teamOrPerson.setTitleCache(text, true);
 		}
@@ -59,7 +58,8 @@ public class AgentCreator implements IEntityCreator<TeamOrPersonBase> {
 	 *
 	 * @return a {@link java.util.Map} object.
 	 */
-	public Map<Object, String> getKeyLabelPairs() {
+	@Override
+    public Map<Object, String> getKeyLabelPairs() {
 		Map<Object, String> result = new HashMap<Object, String>();
 		result.put(Team.class, "Team");
 		result.put(Person.class, "Person");
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
index 0c1da4f53..b7075e47f 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/NameCreator.java
@@ -26,11 +26,9 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  * @author p.ciardelli
  * @created 07.07.2009
- * @version 1.0
  */
 public class NameCreator implements IEntityCreator<TaxonName> {
 
-	/** {@inheritDoc} */
     @Override
     public TaxonName createEntity(String text) {
 		TaxonName name = PreferencesUtil.getPreferredNomenclaturalCode().getNewTaxonNameInstance(null);
@@ -39,7 +37,6 @@ public class NameCreator implements IEntityCreator<TaxonName> {
 		return name;
 	}
 
-	/** {@inheritDoc} */
     @Override
     public TaxonName createEntity(Object key, String text) {
 		return ParseHandler.parseName(text, (Rank) key);
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
index 9783d0206..66080b55b 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/OccurrenceCreator.java
@@ -10,7 +10,6 @@
 package eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator;
 
 import java.util.Arrays;
-import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -22,7 +21,6 @@ import eu.etaxonomy.cdm.model.occurrence.DerivedUnit;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationType;
 import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator;
-import eu.etaxonomy.taxeditor.bulkeditor.BulkEditorUtil;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.newWizard.NewDerivedUnitBaseWizard;
 
@@ -40,22 +38,20 @@ public class OccurrenceCreator implements
 	private static final Logger logger = Logger
 			.getLogger(OccurrenceCreator.class);
 
-	/** {@inheritDoc} */
 	@Override
 	public SpecimenOrObservationBase createEntity(String text) {
 
 		return createEntity(DerivedUnit.class, text);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public SpecimenOrObservationBase createEntity(Object key, String text) {
 
-		SpecimenOrObservationBase specimenOrObservation = null;
+		SpecimenOrObservationBase<?> specimenOrObservation = null;
 		NewDerivedUnitBaseWizard wizard = new NewDerivedUnitBaseWizard((SpecimenOrObservationType)key);
 		wizard.init(null, null);
 		if(wizard.getEntity() != null) {
-			WizardDialog dialog = new WizardDialog(BulkEditorUtil.getShell(), wizard);
+			WizardDialog dialog = new WizardDialog(AbstractUtility.getShell(), wizard);
 			int status = dialog.open();
 
 			if (status == IStatus.OK) {
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
index 391440037..9c3e0e271 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/entitycreator/ReferenceCreator.java
@@ -23,23 +23,14 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils;
  *
  * @author p.ciardelli
  * @created 07.07.2009
- * @version 1.0
  */
 public class ReferenceCreator implements IEntityCreator<Reference> {
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.bulkeditor.IEntityCreator#createEntity(java.lang.String)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public Reference createEntity(String text) {
 		return createEntity(Reference.class, text);
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#createEntity(java.lang.Class, java.lang.String)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public Reference createEntity(Object key, String text) {
 		Reference reference = null;
@@ -104,9 +95,6 @@ public class ReferenceCreator implements IEntityCreator<Reference> {
 		return reference;
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator#getClassLabelPairs()
-	 */
 	/**
 	 * <p>getKeyLabelPairs</p>
 	 *
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/sortprovider/TitleCacheComparator.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/sortprovider/TitleCacheComparator.java
index 4d5892d96..7ce9731a9 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/sortprovider/TitleCacheComparator.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/sortprovider/TitleCacheComparator.java
@@ -18,7 +18,6 @@ import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
  *
  * @author p.ciardelli
  * @created 19.08.2009
- * @version 1.0
  */
 public class TitleCacheComparator<T extends IIdentifiableEntity> implements Comparator<T> {
 
@@ -28,10 +27,6 @@ public class TitleCacheComparator<T extends IIdentifiableEntity> implements Comp
 		return o == null ? null : o.getTitleCache();
 	}
 
-	/* (non-Javadoc)
-	 * @see java.util.Comparator#compare(java.lang.Object, java.lang.Object)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public int compare(T o1, T o2) {
 		String titleCache1 = getTitleCache(o1);
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/internal/TaxeditorBulkeditorPlugin.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/internal/TaxeditorBulkeditorPlugin.java
index 7aa8b0b52..7b2cd8d14 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/internal/TaxeditorBulkeditorPlugin.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/internal/TaxeditorBulkeditorPlugin.java
@@ -7,7 +7,6 @@ import org.osgi.framework.BundleContext;
  * The activator class controls the plug-in life cycle
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class TaxeditorBulkeditorPlugin extends AbstractUIPlugin {
 
@@ -17,30 +16,22 @@ public class TaxeditorBulkeditorPlugin extends AbstractUIPlugin {
 
 	// The shared instance
 	private static TaxeditorBulkeditorPlugin plugin;
-	
+
 	/**
 	 * The constructor
 	 */
 	public TaxeditorBulkeditorPlugin() {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	/** {@inheritDoc} */
-	public void start(BundleContext context) throws Exception {
+	@Override
+    public void start(BundleContext context) throws Exception {
 		super.start(context);
-		plugin = this;		
-		
+		plugin = this;
+
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	/** {@inheritDoc} */
-	public void stop(BundleContext context) throws Exception {
+	@Override
+    public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
 	}
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsContentProvider.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsContentProvider.java
index d02d1a4b3..dc84b3c5a 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsContentProvider.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsContentProvider.java
@@ -20,15 +20,13 @@ import org.eclipse.jface.viewers.Viewer;
  *
  * @author p.ciardelli
  * @created 09.07.2009
- * @version 1.0
  */
 public class ReferencingObjectsContentProvider implements
 		IStructuredContentProvider {
-	@SuppressWarnings("unused")
-    private static final Logger logger = Logger
-			.getLogger(ReferencingObjectsContentProvider.class);
 
-	/** {@inheritDoc} */
+    @SuppressWarnings("unused")
+    private static final Logger logger = Logger.getLogger(ReferencingObjectsContentProvider.class);
+
 	@Override
     public Object[] getElements(Object inputElement) {
 		if (inputElement instanceof Collection) {
@@ -37,13 +35,9 @@ public class ReferencingObjectsContentProvider implements
 		return new Object[0];
 	}
 
-	/**
-	 * <p>dispose</p>
-	 */
 	@Override
     public void dispose() {}
 
-	/** {@inheritDoc} */
 	@Override
     public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
 }
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsLabelProvider.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsLabelProvider.java
index f071aba14..a4ac2fea5 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/ReferencingObjectsLabelProvider.java
@@ -26,11 +26,11 @@ import eu.etaxonomy.taxeditor.model.DescriptionHelper;
  *
  * @author p.ciardelli
  * @created 09.07.2009
- * @version 1.0
  */
 public class ReferencingObjectsLabelProvider extends LabelProvider implements ITableLabelProvider {
-	private static final Logger logger = Logger
-			.getLogger(ReferencingObjectsLabelProvider.class);
+
+    @SuppressWarnings("unused")
+    private static final Logger logger = Logger.getLogger(ReferencingObjectsLabelProvider.class);
 
 	/**
 	 * <p>Constructor for ReferencingObjectsLabelProvider.</p>
@@ -38,14 +38,11 @@ public class ReferencingObjectsLabelProvider extends LabelProvider implements IT
 	public ReferencingObjectsLabelProvider() {
 	}
 
-
-	/** {@inheritDoc} */
 	@Override
     public Image getColumnImage(Object element, int columnIndex) {
 		return null;
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public String getColumnText(Object element, int columnIndex) {
 		String text = null;
diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java
index 0d5838faa..dab48be3d 100644
--- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java
+++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/referencingobjects/e4/ReferencingObjectsViewE4.java
@@ -414,7 +414,6 @@ public class ReferencingObjectsViewE4 extends AbstractCdmEditorPartE4 implements
         }
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void showViewer(IStructuredSelection selection, MPart activePart, Viewer viewer){
 	//	this.part = part;
@@ -465,7 +464,6 @@ public class ReferencingObjectsViewE4 extends AbstractCdmEditorPartE4 implements
 		}
 	}
 
-	/** {@inheritDoc} */
 	@PreDestroy
 	public void dispose() {
 	    if(conversation!=null){
@@ -474,13 +472,11 @@ public class ReferencingObjectsViewE4 extends AbstractCdmEditorPartE4 implements
 	    }
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void changed(Object object) {
 		// no editing in this view
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public boolean onComplete() {
 		return false;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/CdmDataTransfer.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/CdmDataTransfer.java
index 41403b53a..801a7021b 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/CdmDataTransfer.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/CdmDataTransfer.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -34,18 +34,18 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  * @author n.hoffmann
  * @created Jun 18, 2010
- * @version 1.0
  */
 public class CdmDataTransfer extends ByteArrayTransfer {
-	private static final Logger logger = Logger
-			.getLogger(CdmDataTransfer.class);
+
+	@SuppressWarnings("unused")
+    private static final Logger logger = Logger.getLogger(CdmDataTransfer.class);
 
 	private static int SEPARATOR = -10;
 	private static int EOF = -20;
 	private static final String TYPE_NAME = "cdmdata-transfer-format"; //$NON-NLS-1$
-	private static final int TYPE_ID = registerType (TYPE_NAME);		
+	private static final int TYPE_ID = registerType (TYPE_NAME);
 	private static final CdmDataTransfer instance = new CdmDataTransfer();
-	
+
 	/**
 	 * <p>Getter for the field <code>instance</code>.</p>
 	 *
@@ -56,36 +56,25 @@ public class CdmDataTransfer extends ByteArrayTransfer {
 	}
 
 	private ICdmBase cdmBase;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.dnd.Transfer#getTypeIds()
-	 */
-	/** {@inheritDoc} */
+
 	@Override
 	protected int[] getTypeIds() {
-		return new int[] { TYPE_ID }; 
+		return new int[] { TYPE_ID };
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.dnd.Transfer#getTypeNames()
-	 */
-	/** {@inheritDoc} */
 	@Override
 	protected String[] getTypeNames() {
 		return new String[]{ TYPE_NAME };
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected void javaToNative(Object object, TransferData transferData) {
 		byte[] bytes = toByteArray((ICdmBase[]) object);
-		if (bytes != null)
-			super.javaToNative(bytes, transferData);
+		if (bytes != null) {
+            super.javaToNative(bytes, transferData);
+        }
 	}
 
-
-
-	/** {@inheritDoc} */
 	@Override
 	protected Object nativeToJava(TransferData transferData) {
 		byte[] bytes = (byte[]) super.nativeToJava(transferData);
@@ -105,7 +94,7 @@ public class CdmDataTransfer extends ByteArrayTransfer {
 		byte[] bytes = null;
 
 		try {
-			
+
 			for(ICdmBase cdmBaseObject : cdmBaseObjects){
 				writeCdmBaseObject(cdmBaseObject, out);
 			}
@@ -116,14 +105,14 @@ public class CdmDataTransfer extends ByteArrayTransfer {
 		}
 		return bytes;
 	}
-	
-	
+
+
 	private ICdmBase[] fromByteArray(byte[] bytes) {
 		DataInputStream in = new DataInputStream(new ByteArrayInputStream(bytes));
-		
+
 		try {
 			List<ICdmBase> cdmBaseObjects = new ArrayList<ICdmBase>();
-                      
+
 			try{
 				while(true){
 					cdmBaseObjects.add(readCdmBaseObject(in));
@@ -135,36 +124,36 @@ public class CdmDataTransfer extends ByteArrayTransfer {
 			return null;
 		}
 	}
-	
+
 	private ICdmBase readCdmBaseObject(DataInputStream in) throws IOException{
 		String className = in.readUTF();
 		in.readInt();
 		String idString = in.readUTF();
 		in.readInt();
-		
+
 		if(className.equals(Synonym.class.getName()) || className.equals(Taxon.class.getName())){
 			ICdmBase object = CdmStore.getService(ITaxonService.class).load(UUID.fromString(idString));
-			
+
 			if(object == null){
 				return cdmBase;
 			}
-			
+
 			return object;
 		}
-		
+
 		return null;
 	}
-	
+
 	private void writeCdmBaseObject(ICdmBase cdmBase, DataOutputStream out) throws IOException{
 		/**
 		 * CdmBase object serialization:
-		 * 
+		 *
 		 */
 		out.writeUTF(cdmBase.getClass().getName());
 		out.writeInt(SEPARATOR);
 		out.writeUTF(cdmBase.getUuid().toString());
 		out.writeInt(EOF);
-		
+
 		if(cdmBase.getId() == 0){
 			// fallback for unsaved instances
 			this.cdmBase = cdmBase;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java
index 355b5e453..55b2100c0 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/SimpleSelectionProvider.java
@@ -32,7 +32,6 @@ import eu.etaxonomy.taxeditor.editor.l10n.Messages;
  * @author p.ciardelli
  * @author n.hoffmann
  * @created 16.05.2008
- * @version 1.0
  */
 public class SimpleSelectionProvider implements ISelectionProvider {
 
@@ -41,21 +40,12 @@ public class SimpleSelectionProvider implements ISelectionProvider {
 	private ISelection selection;
 	private Job job;
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#addSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public void addSelectionChangedListener(
 			ISelectionChangedListener listener) {
 		selectionChangedListeners.add(listener);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#getSelection()
-	 */
 	/**
 	 * <p>Getter for the field <code>selection</code>.</p>
 	 *
@@ -71,22 +61,12 @@ public class SimpleSelectionProvider implements ISelectionProvider {
 		return new StructuredSelection();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#removeSelectionChangedListener(org.eclipse.jface.viewers.ISelectionChangedListener)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public void removeSelectionChangedListener(
 			ISelectionChangedListener listener) {
 		selectionChangedListeners.remove(listener);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ISelectionProvider#setSelection(org.eclipse.jface.viewers.ISelection)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public void setSelection(ISelection selection) {
 		this.selection = selection;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/ViewerConfiguration.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/ViewerConfiguration.java
index 4563d3dfd..e38f1c628 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/ViewerConfiguration.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/ViewerConfiguration.java
@@ -1,8 +1,8 @@
 /**
  * Copyright (C) 2007 EDIT
- * European Distributed Institute of Taxonomy 
+ * European Distributed Institute of Taxonomy
  * http://www.e-taxonomy.eu
- * 
+ *
  * The contents of this file are subject to the Mozilla Public License Version 1.1
  * See LICENSE.TXT at the top of this package for the full license terms.
  */
@@ -19,20 +19,16 @@ import org.eclipse.jface.text.source.SourceViewerConfiguration;
  *
  * @author p.ciardelli
  * @created 22.01.2009
- * @version 1.0
  */
 public class ViewerConfiguration extends SourceViewerConfiguration {
-	
+
 	private IAnnotationHover annotationHover = new DefaultAnnotationHover();
-	
-	/** {@inheritDoc} */
-	public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
+
+	@Override
+    public IAnnotationHover getAnnotationHover(ISourceViewer sourceViewer) {
 		return annotationHover;
 	}
 
-//	/* (non-Javadoc)
-//	 * @see org.eclipse.jface.text.source.SourceViewerConfiguration#getContentAssistant(org.eclipse.jface.text.source.ISourceViewer)
-//	 */
 //	@Override
 //	public IContentAssistant getContentAssistant(ISourceViewer sourceViewer) {
 //	    ContentAssistant contentAssistant = new ContentAssistant();
@@ -42,6 +38,6 @@ public class ViewerConfiguration extends SourceViewerConfiguration {
 //	    contentAssistant.setInformationControlCreator(getInformationControlCreator(sourceViewer));
 //	    return contentAssistant;
 //	}
-	
-	
+
+
 }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetNavigator.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetNavigator.java
index 62d13cf43..5477b444d 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetNavigator.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/DescriptiveDataSetNavigator.java
@@ -205,7 +205,6 @@ public class DescriptiveDataSetNavigator implements IConversationEnabled, ICdmEn
         return selService;
     }
 
-    /** {@inheritDoc} */
     @PreDestroy
     public void dispose() {
         if (conversation != null) {
@@ -218,7 +217,6 @@ public class DescriptiveDataSetNavigator implements IConversationEnabled, ICdmEn
         }
     }
 
-    /** {@inheritDoc} */
     @Focus
     public void setFocus() {
         if (getConversationHolder() != null) {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputDataChangeBehaviourE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputDataChangeBehaviourE4.java
index 5f204279e..751f0597b 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputDataChangeBehaviourE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputDataChangeBehaviourE4.java
@@ -13,10 +13,8 @@ import eu.etaxonomy.cdm.persistence.hibernate.CdmDataChangeMap;
 import eu.etaxonomy.taxeditor.model.AbstractDataChangeBehaviour;
 
 /**
- *
  * @author pplitzner
  * @date Aug 24, 2017
- *
  */
 public class TaxonEditorInputDataChangeBehaviourE4 extends
 		AbstractDataChangeBehaviour {
@@ -27,7 +25,6 @@ public class TaxonEditorInputDataChangeBehaviourE4 extends
 		source = taxonEditorInput;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void reactOnDataChange(CdmDataChangeMap events) {
 		source.update(events);
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
index 81f6435ee..4fd4915ec 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/e4/TaxonEditorInputE4.java
@@ -63,10 +63,8 @@ import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 
 
 /**
- *
  * @author pplitzner
  * @date Aug 24, 2017
- *
  */
 public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConversationEnabled {
 
@@ -121,7 +119,6 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
     	this.taxonNode = taxonNode;
     }
 
-
     private void initForTaxonNode(UUID taxonNodeUuid) {
     	this.getCdmEntitySession().bind();
         TaxonNode taxonNode = CdmStore.getService(ITaxonNodeService.class).load(taxonNodeUuid, getTaxonNodePropertyPaths());
@@ -137,7 +134,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
     private void initForTaxonBase(UUID taxonBaseUuid) {
     	this.getCdmEntitySession().bind();
 //        TaxonBase taxonBase = CdmStore.getService(ITaxonService.class).load(taxonBaseUuid, getTaxonBasePropertyPaths());
-    	TaxonBase taxonBase = getCdmEntitySession().remoteLoad(CdmStore.getService(ITaxonService.class), taxonBaseUuid, getTaxonBasePropertyPaths());
+    	TaxonBase<?> taxonBase = getCdmEntitySession().remoteLoad(CdmStore.getService(ITaxonService.class), taxonBaseUuid, getTaxonBasePropertyPaths());
         if (taxonBase != null){
             if(taxonBase.isInstanceOf(Taxon.class)){
                 Taxon taxon = CdmBase.deproxy(taxonBase, Taxon.class);
@@ -324,7 +321,6 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
         return conversation;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void update(CdmDataChangeMap events) {
         if(dataChangeBehavior == null){
@@ -368,7 +364,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
             delete(entry.getKey(), entry.getValue());
         }
         toDeletes.clear();
-        for(AbstractPostOperation entry:operations){
+        for(AbstractPostOperation<?> entry:operations){
             IStatus status = Status.CANCEL_STATUS;
             final IAdaptable uiInfoAdapter = WorkspaceUndoUtil
                     .getUIInfoAdapter(AbstractUtility.getShell());
@@ -408,7 +404,7 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
             }
         }
 
-        for (TaxonBase concept: toSaveNewConcepts){
+        for (TaxonBase<?> concept: toSaveNewConcepts){
             for (HybridRelationship rel : concept.getName().getHybridChildRelations()){
 //                if (!rel.getParentName().isPersited()) {
                     toSaveNewNames.add(rel.getParentName());
@@ -430,17 +426,12 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
 
     }
 
-    /**
-     * @param key
-     * @param value
-     */
     private void delete(TaxonBase key, TaxonBaseDeletionConfigurator value) {
         if (key instanceof Synonym){
             CdmStore.getService(ITaxonService.class).deleteSynonym(((Synonym)key).getUuid(), (SynonymDeletionConfigurator) value);
         }else{
             CdmStore.getService(ITaxonService.class).deleteTaxon(((Taxon)key).getUuid(), (TaxonDeletionConfigurator) value, null);
         }
-
     }
 
     @Override
@@ -493,20 +484,12 @@ public class TaxonEditorInputE4  extends CdmEntitySessionInput implements IConve
         return taxonBasePropertyPaths;
     }
 
-    /**
-     * @param selectedElement
-     * @param deleteConfig
-     */
     public void addTaxonBaseToDelete(TaxonBase selectedElement, TaxonBaseDeletionConfigurator deleteConfig) {
         this.toDeletes.put(selectedElement, deleteConfig);
 
     }
 
-    /**
-     * @param newName
-     */
     public void addToSaveNewName(TaxonName newName) {
         this.toSaveNewNames.add(newName);
     }
-
 }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SpecimenPropertyTester.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SpecimenPropertyTester.java
index da4d0f17c..e1bfabcd1 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SpecimenPropertyTester.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/handler/SpecimenPropertyTester.java
@@ -1,6 +1,5 @@
 package eu.etaxonomy.taxeditor.editor.handler;
 
-
 import org.eclipse.core.expressions.PropertyTester;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.TreeNode;
@@ -11,8 +10,6 @@ import eu.etaxonomy.cdm.model.occurrence.MediaSpecimen;
 import eu.etaxonomy.cdm.model.occurrence.SpecimenOrObservationBase;
 import eu.etaxonomy.taxeditor.editor.EditorUtil;
 
-
-
 /**
  * Tests types of specimens to add items to the context menu.
  *
@@ -29,7 +26,6 @@ public class SpecimenPropertyTester extends PropertyTester {
 
     public SpecimenPropertyTester() {}
 
-    /** {@inheritDoc} */
     @Override
     public boolean test(Object receiver, String property, Object[] args, Object expectedValue) {
         if (receiver instanceof IStructuredSelection) {
@@ -78,5 +74,4 @@ public class SpecimenPropertyTester extends PropertyTester {
     private boolean isSequence(Object object) {
         return (object instanceof Sequence);
     }
-
 }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
index 9836d8d6e..8fbcf1335 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/internal/TaxeditorEditorPlugin.java
@@ -12,7 +12,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * The activator class controls the plug-in life cycle
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class TaxeditorEditorPlugin extends AbstractUIPlugin {
 
@@ -32,7 +31,6 @@ public class TaxeditorEditorPlugin extends AbstractUIPlugin {
 	public TaxeditorEditorPlugin() {
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public void start(BundleContext context) throws Exception {
 		super.start(context);
@@ -47,8 +45,6 @@ public class TaxeditorEditorPlugin extends AbstractUIPlugin {
 		logger.trace("Plugin started: " + this.getBundle().getSymbolicName()); //$NON-NLS-1$
 	}
 
-
-	/** {@inheritDoc} */
 	@Override
     public void stop(BundleContext context) throws Exception {
 		plugin = null;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/e4/KeyEditorDataChangeBehaviourE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/e4/KeyEditorDataChangeBehaviourE4.java
index d8791cdfc..8e34d4f87 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/e4/KeyEditorDataChangeBehaviourE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/key/e4/KeyEditorDataChangeBehaviourE4.java
@@ -22,7 +22,6 @@ import eu.etaxonomy.taxeditor.model.AbstractDataChangeBehaviour;
 /**
  * @author n.hoffmann
  * @created May 5, 2011
- * @version 1.0
  */
 public class KeyEditorDataChangeBehaviourE4 extends AbstractDataChangeBehaviour {
 
@@ -42,7 +41,6 @@ public class KeyEditorDataChangeBehaviourE4 extends AbstractDataChangeBehaviour
 		}
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void reactOnUpdate(Vector<CdmDataChangeEvent> events){
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/EditorAnnotation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/EditorAnnotation.java
index 3cfad1f75..fd51124e2 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/EditorAnnotation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/EditorAnnotation.java
@@ -20,11 +20,11 @@ import eu.etaxonomy.taxeditor.model.ImageResources;
  * <p>EditorAnnotation class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class EditorAnnotation extends Annotation implements IAnnotationPresentation {
-	private static final Logger logger = Logger
-			.getLogger(EditorAnnotation.class);
+
+    @SuppressWarnings("unused")
+    private static final Logger logger = Logger.getLogger(EditorAnnotation.class);
     private final IMarker marker;
     private String text;
     private int line;
@@ -33,10 +33,10 @@ public class EditorAnnotation extends Annotation implements IAnnotationPresentat
     public enum EditorAnnotationType{
     	WARNING(ImageResources.WARNING_ANNOTATION_ICON, 244, 200, 45),
     	ERROR(ImageResources.ERROR_ANNOTATION_ICON, 255, 0, 0);
-    	
+
     	public Image image;
     	public RGB color;
-    	
+
     	EditorAnnotationType(String imageResource, int r, int g, int b){
     		image = ImageResources.getImage(imageResource);
     		color = new RGB(r, g, b);
@@ -55,30 +55,30 @@ public class EditorAnnotation extends Annotation implements IAnnotationPresentat
 			}
 			return null;
 		}
-    	
+
     }
-    
+
 //    // error identifiers, images and colors
 //    /** Constant <code>ERROR_TYPE="editor.error.type"</code> */
 //    public static String ERROR_TYPE = "editor.error.type";
 //    /** Constant <code>ERROR_IMAGE</code> */
 //    public static Image ERROR_IMAGE = ImageResources.getImage(ImageResources.ERROR_ANNOTATION_ICON);
 //    /** Constant <code>ERROR_RGB</code> */
-//    public static final RGB ERROR_RGB = new RGB(255, 0, 0);    
-//    
+//    public static final RGB ERROR_RGB = new RGB(255, 0, 0);
+//
 //    /** Constant <code>WARNING_TYPE="editor.warning.type"</code> */
 //    public static String WARNING_TYPE = "editor.warning.type";
 //    /** Constant <code>WARNING_IMAGE</code> */
 //    public static Image WARNING_IMAGE = ImageResources.getImage(ImageResources.WARNING_ANNOTATION_ICON);
 //    /** Constant <code>WARNING_RGB</code> */
-//    public static final RGB WARNING_RGB = new RGB(244, 200, 45); 
-    
-    
+//    public static final RGB WARNING_RGB = new RGB(244, 200, 45);
+
+
     public EditorAnnotation(ParserProblem problem){
     	this(EditorAnnotationType.getTypeByProblem(problem), 0, problem.getMessage());
     }
-    
-    
+
+
     /**
      * <p>Constructor for EditorAnnotation.</p>
      *
@@ -111,7 +111,7 @@ public class EditorAnnotation extends Annotation implements IAnnotationPresentat
         this.line = line;
         this.text = text;
     }
-    
+
     /**
      * <p>Getter for the field <code>marker</code>.</p>
      *
@@ -152,12 +152,13 @@ public class EditorAnnotation extends Annotation implements IAnnotationPresentat
 	private Image getImage() {
     	return EditorAnnotationType.valueOf(getType()).image;
 	}
-    
+
     /**
      * <p>getLayer</p>
      *
      * @return a int.
      */
+    @Override
     public int getLayer() {
         return 3;
     }
@@ -181,9 +182,8 @@ public class EditorAnnotation extends Annotation implements IAnnotationPresentat
         this.position = position;
     }
 
-	
-	/** {@inheritDoc} */
-	public void paint(GC gc, Canvas canvas, Rectangle bounds) {
+	@Override
+    public void paint(GC gc, Canvas canvas, Rectangle bounds) {
 		Point canvasSize= canvas.getSize();
 
 		int x= 0;
@@ -191,28 +191,30 @@ public class EditorAnnotation extends Annotation implements IAnnotationPresentat
 		int w= canvasSize.x;
 		int h= bounds.height;
 
-		if (y + h > canvasSize.y)
-			h= canvasSize.y - y;
+		if (y + h > canvasSize.y) {
+            h= canvasSize.y - y;
+        }
 
 		if (y < 0) {
 			h= h + y;
 			y= 0;
 		}
 
-		if (h <= 0)
-			return;
+		if (h <= 0) {
+            return;
+        }
 
 		Image image = getImage();
-		
+
 		if (image == null) {
 			return;
 		}
-		
+
 		Rectangle r = image.getBounds();
-		
+
 		int destX = x + w - r.width;
 		int destY = y + h - r.height;
-		
+
 		gc.drawImage(image, 0, 0, r.width, r.height, destX, destY, r.width, r.height);
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/LineWrapSquigglesStrategy.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/LineWrapSquigglesStrategy.java
index f71bce16f..54cd6f732 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/LineWrapSquigglesStrategy.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/LineWrapSquigglesStrategy.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -23,10 +23,9 @@ import org.eclipse.swt.graphics.Point;
  *
  * @author p.ciardelli
  * @created 21.11.2008
- * @version 1.0
  */
 public class LineWrapSquigglesStrategy extends SquigglesStrategy {
-	
+
 	/** Constant <code>ID="linewrap_squigglesstrategy"</code> */
 	public static final String ID = "linewrap_squigglesstrategy"; //$NON-NLS-1$
 
@@ -41,61 +40,59 @@ public class LineWrapSquigglesStrategy extends SquigglesStrategy {
 	private StyledText textWidget;
 
 	private int offset;
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.text.source.AnnotationPainter$SquigglesStrategy#draw(org.eclipse.jface.text.source.Annotation, org.eclipse.swt.graphics.GC, org.eclipse.swt.custom.StyledText, int, int, org.eclipse.swt.graphics.Color)
-	 */
-	/** {@inheritDoc} */
-	public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) {
-		
+
+	@Override
+    public void draw(Annotation annotation, GC gc, StyledText textWidget, int offset, int length, Color color) {
+
 		this.gc = gc;
 		this.color = color;
 		this.textWidget = textWidget;
 		this.offset = offset;
-		
+
 		if (gc != null) {
 
-			if (length < 1)
-				return;
-			
+			if (length < 1) {
+                return;
+            }
+
 			baseline = textWidget.getBaseline(offset);
 			lineHeight = textWidget.getLineHeight(offset);
-			
+
 			Point right = null;
 			int offsetNewline = offset;
 			int end = offset + length;
-						
+
 			// Go through the length one character at a time
 			for (int i = offset; i <= end; i++) {
-				
+
 				// If the y of the current offset is different from that of the last offset,
 				//	we are on a new line
 				if (right != null && textWidget.getLocationAtOffset(i).y > right.y) {
-										
+
 					// Draw a line of squigglies
 					drawPolyline(offsetNewline, right);
 
 					// Save offset of line break
 					offsetNewline = i;
 				}
-								
+
 				// Get x,y position in case the next char is on a new line
-				right = textWidget.getLocationAtOffset(i);					
-					
+				right = textWidget.getLocationAtOffset(i);
+
 			}
-			
-			// Draw the last line of squigglies 
+
+			// Draw the last line of squigglies
 			drawPolyline(offsetNewline, right);
 
 		} else {
 			textWidget.redrawRange(offset, length, true);
 		}
 	}
-	
+
 	/**
 	 * Draws a squiggly line from the offset <code>offsetNewline</code> to
 	 * the x,y coordinates at <code>right</code>.
-	 * 
+	 *
 	 * @param offsetNewline
 	 * @param right
 	 */
@@ -103,19 +100,19 @@ public class LineWrapSquigglesStrategy extends SquigglesStrategy {
 
 		// Get offset at last line break
 		Point left = textWidget.getLocationAtOffset(offsetNewline);
-		
+
 		// Prevent solitary red dot from appearing at EOL
 		if (left.equals(right)) {
 			return;
 		}
-		
+
 		// Only start drawing from 0 if not on the first line
 		if (offsetNewline != offset) {
-			
+
 			// Offset.x is at the end of the first letter of the new line, not at 0
 			left.x = 0;
 		}
-		
+
 		int[] polyline= computePolyline(left, right, baseline, lineHeight);
 
 		gc.setLineWidth(0); // NOTE: 0 means width is 1 but with optimized performance
@@ -125,10 +122,10 @@ public class LineWrapSquigglesStrategy extends SquigglesStrategy {
 	}
 
 	/**
-	 * Copied verbatim from {@link org.eclipse.jface.text.source.AnnotationPainter$SquigglesStrategy} 
-	 * 
+	 * Copied verbatim from {@link org.eclipse.jface.text.source.AnnotationPainter$SquigglesStrategy}
+	 *
 	 * @see org.eclipse.jface.text.source.AnnotationPainter$SquigglesStrategy
-	 *  
+	 *
 	 * @param left
 	 * @param right
 	 * @param baseline
@@ -141,15 +138,17 @@ public class LineWrapSquigglesStrategy extends SquigglesStrategy {
 		final int HEIGHT= 2; // can be any number
 
 		int peaks= (right.x - left.x) / WIDTH;
-		if (peaks == 0 && right.x - left.x > 2)
-			peaks= 1;
+		if (peaks == 0 && right.x - left.x > 2) {
+            peaks= 1;
+        }
 
 		int leftX= left.x;
 
 		// compute (number of point) * 2
 		int length= ((2 * peaks) + 1) * 2;
-		if (length < 0)
-			return new int[0];
+		if (length < 0) {
+            return new int[0];
+        }
 
 		int[] coordinates= new int[length];
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/RulerWithIcon.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/RulerWithIcon.java
index c7f27a422..4fe9ddbee 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/RulerWithIcon.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/container/RulerWithIcon.java
@@ -1,8 +1,8 @@
 /**
 * Copyright (C) 2007 EDIT
-* European Distributed Institute of Taxonomy 
+* European Distributed Institute of Taxonomy
 * http://www.e-taxonomy.eu
-* 
+*
 * The contents of this file are subject to the Mozilla Public License Version 1.1
 * See LICENSE.TXT at the top of this package for the full license terms.
 */
@@ -59,7 +59,6 @@ import org.eclipse.ui.forms.widgets.TableWrapData;
  * @see org.eclipse.jface.text.source.VerticalRuler
  * @author p.ciardelli
  * @created 27.01.2009
- * @version 1.0
  */
 public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 	private static final Logger logger = Logger.getLogger(RulerWithIcon.class);
@@ -72,24 +71,29 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 		/*
 		 * @see IViewportListener#viewportChanged(int)
 		 */
-		public void viewportChanged(int verticalPosition) {
-			if (verticalPosition != fScrollPos)
-				redraw();
+		@Override
+        public void viewportChanged(int verticalPosition) {
+			if (verticalPosition != fScrollPos) {
+                redraw();
+            }
 		}
 
 		/*
 		 * @see IAnnotationModelListener#modelChanged(IAnnotationModel)
 		 */
-		public void modelChanged(IAnnotationModel model) {
+		@Override
+        public void modelChanged(IAnnotationModel model) {
 			update();
 		}
 
 		/*
 		 * @see ITextListener#textChanged(TextEvent)
 		 */
-		public void textChanged(TextEvent e) {
-			if (fTextViewer != null && e.getViewerRedrawState())
-				redraw();
+		@Override
+        public void textChanged(TextEvent e) {
+			if (fTextViewer != null && e.getViewerRedrawState()) {
+                redraw();
+            }
 		}
 	}
 
@@ -146,15 +150,13 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 	 *
 	 * @return a {@link org.eclipse.swt.widgets.Control} object.
 	 */
-	public Control getControl() {
+	@Override
+    public Control getControl() {
 		return fCanvas;
 	}
 
-	/*
-	 * @see IVerticalRuler#createControl(Composite, ITextViewer)
-	 */
-	/** {@inheritDoc} */
-	public Control createControl(Composite parent, ITextViewer textViewer) {
+	@Override
+    public Control createControl(Composite parent, ITextViewer textViewer) {
 
 		fTextViewer= textViewer;
 
@@ -163,31 +165,37 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 		TableWrapData layout = new TableWrapData(TableWrapData.LEFT);
 		layout.heightHint = 20;
 		layout.maxWidth = fWidth;
-		fCanvas.setLayoutData(layout);		
-		
+		fCanvas.setLayoutData(layout);
+
 		fCanvas.addPaintListener(new PaintListener() {
-			public void paintControl(PaintEvent event) {
-				if (fTextViewer != null)
-					doubleBufferPaint(event.gc);
+			@Override
+            public void paintControl(PaintEvent event) {
+				if (fTextViewer != null) {
+                    doubleBufferPaint(event.gc);
+                }
 			}
 		});
 
 		fCanvas.addDisposeListener(new DisposeListener() {
-			public void widgetDisposed(DisposeEvent e) {
+			@Override
+            public void widgetDisposed(DisposeEvent e) {
 				handleDispose();
 				fTextViewer= null;
 			}
 		});
 
 		fCanvas.addMouseListener(new MouseListener() {
-			public void mouseUp(MouseEvent event) {
+			@Override
+            public void mouseUp(MouseEvent event) {
 			}
 
-			public void mouseDown(MouseEvent event) {
+			@Override
+            public void mouseDown(MouseEvent event) {
 				fLastMouseButtonActivityLine= toDocumentLineNumber(event.y);
 			}
 
-			public void mouseDoubleClick(MouseEvent event) {
+			@Override
+            public void mouseDoubleClick(MouseEvent event) {
 				fLastMouseButtonActivityLine= toDocumentLineNumber(event.y);
 			}
 		});
@@ -211,8 +219,9 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 			fTextViewer= null;
 		}
 
-		if (fModel != null)
-			fModel.removeAnnotationModelListener(fInternalListener);
+		if (fModel != null) {
+            fModel.removeAnnotationModelListener(fInternalListener);
+        }
 
 		if (fBuffer != null) {
 			fBuffer.dispose();
@@ -230,8 +239,9 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 
 		Point size= fCanvas.getSize();
 
-		if (size.x <= 0 || size.y <= 0)
-			return;
+		if (size.x <= 0 || size.y <= 0) {
+            return;
+        }
 
 		if (fBuffer != null) {
 			Rectangle r= fBuffer.getBounds();
@@ -240,8 +250,9 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 				fBuffer= null;
 			}
 		}
-		if (fBuffer == null)
-			fBuffer= new Image(fCanvas.getDisplay(), size.x, size.y);
+		if (fBuffer == null) {
+            fBuffer= new Image(fCanvas.getDisplay(), size.x, size.y);
+        }
 
 		GC gc= new GC(fBuffer);
 		gc.setFont(fTextViewer.getTextWidget().getFont());
@@ -251,9 +262,9 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 
 			// Code added to VerticalRuler starts here
 			if (icon != null) {
-				
+
 				Rectangle r = icon.getBounds();
-				
+
 				if (r.width > size.x || r.height > size.y) {
 					logger.warn(r.width + "x" + r.height + " icon too big for " + size.x + "x" + size.y + " Canvas."); //$NON-NLS-1$ //$NON-NLS-2$ //$NON-NLS-3$ //$NON-NLS-4$
 				} else {
@@ -261,16 +272,17 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 					// Set destination coordinates to center icon
 					int x = (size.x - r.width) / 2;
 					int y = (size.y - r.height) / 2;
-					
+
 					gc.drawImage(icon, 0, 0, r.width, r.height, x, y, r.width, r.height);
-				}				
+				}
 			}
 			// Code added to VerticalRuler ends here
-			
-			if (fTextViewer instanceof ITextViewerExtension5)
-				doPaint1(gc);
-			else
-				doPaint(gc);
+
+			if (fTextViewer instanceof ITextViewerExtension5) {
+                doPaint1(gc);
+            } else {
+                doPaint(gc);
+            }
 
 		} finally {
 			gc.dispose();
@@ -310,12 +322,14 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 	 */
 	protected void doPaint(GC gc) {
 
-		if (fModel == null || fTextViewer == null)
-			return;
+		if (fModel == null || fTextViewer == null) {
+            return;
+        }
 
 		IAnnotationAccessExtension annotationAccessExtension= null;
-		if (fAnnotationAccess instanceof IAnnotationAccessExtension)
-			annotationAccessExtension= (IAnnotationAccessExtension) fAnnotationAccess;
+		if (fAnnotationAccess instanceof IAnnotationAccessExtension) {
+            annotationAccessExtension= (IAnnotationAccessExtension) fAnnotationAccess;
+        }
 
 		StyledText styledText= fTextViewer.getTextWidget();
 		IDocument doc= fTextViewer.getDocument();
@@ -347,22 +361,25 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 				Annotation annotation= (Annotation) iter.next();
 
 				int lay= IAnnotationAccessExtension.DEFAULT_LAYER;
-				if (annotationAccessExtension != null)
-					lay= annotationAccessExtension.getLayer(annotation);
-				else if (annotation instanceof IAnnotationPresentation) {
+				if (annotationAccessExtension != null) {
+                    lay= annotationAccessExtension.getLayer(annotation);
+                } else if (annotation instanceof IAnnotationPresentation) {
 					annotationPresentation= (IAnnotationPresentation)annotation;
 					lay= annotationPresentation.getLayer();
 				}
 				maxLayer= Math.max(maxLayer, lay+1);	// dynamically update layer maximum
-				if (lay != layer)	// wrong layer: skip annotation
-					continue;
+				if (lay != layer) {
+                    continue;
+                }
 
 				Position position= fModel.getPosition(annotation);
-				if (position == null)
-					continue;
+				if (position == null) {
+                    continue;
+                }
 
-				if (!position.overlapsWith(topLeft, viewPort))
-					continue;
+				if (!position.overlapsWith(topLeft, viewPort)) {
+                    continue;
+                }
 
 				try {
 
@@ -370,30 +387,34 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 					int length= position.getLength();
 
 					int startLine= doc.getLineOfOffset(offset);
-					if (startLine < topLine)
-						startLine= topLine;
+					if (startLine < topLine) {
+                        startLine= topLine;
+                    }
 
 					int endLine= startLine;
-					if (length > 0)
-						endLine= doc.getLineOfOffset(offset + length - 1);
-					if (endLine > bottomLine)
-						endLine= bottomLine;
+					if (length > 0) {
+                        endLine= doc.getLineOfOffset(offset + length - 1);
+                    }
+					if (endLine > bottomLine) {
+                        endLine= bottomLine;
+                    }
 
 					startLine -= topLine;
 					endLine -= topLine;
 
 					r.x= 0;
 					r.y= JFaceTextUtil.computeLineHeight(styledText, 0, startLine, startLine)  - fScrollPos;
-					
+
 					r.width= d.x;
 					int lines= endLine - startLine;
-					
+
 					r.height= JFaceTextUtil.computeLineHeight(styledText, startLine, endLine + 1, (lines+1));
 
-					if (r.y < d.y && annotationAccessExtension != null)  // annotation within visible area
-						annotationAccessExtension.paint(annotation, gc, fCanvas, r);
-					else if (annotationPresentation != null)
-						annotationPresentation.paint(gc, fCanvas, r);
+					if (r.y < d.y && annotationAccessExtension != null) {
+                        annotationAccessExtension.paint(annotation, gc, fCanvas, r);
+                    } else if (annotationPresentation != null) {
+                        annotationPresentation.paint(gc, fCanvas, r);
+                    }
 
 				} catch (BadLocationException e) {
 				}
@@ -410,12 +431,14 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 	 */
 	protected void doPaint1(GC gc) {
 
-		if (fModel == null || fTextViewer == null)
-			return;
+		if (fModel == null || fTextViewer == null) {
+            return;
+        }
 
 		IAnnotationAccessExtension annotationAccessExtension= null;
-		if (fAnnotationAccess instanceof IAnnotationAccessExtension)
-			annotationAccessExtension= (IAnnotationAccessExtension) fAnnotationAccess;
+		if (fAnnotationAccess instanceof IAnnotationAccessExtension) {
+            annotationAccessExtension= (IAnnotationAccessExtension) fAnnotationAccess;
+        }
 
 		ITextViewerExtension5 extension= (ITextViewerExtension5) fTextViewer;
 		StyledText textWidget= fTextViewer.getTextWidget();
@@ -434,44 +457,50 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 				Annotation annotation= (Annotation) iter.next();
 
 				int lay= IAnnotationAccessExtension.DEFAULT_LAYER;
-				if (annotationAccessExtension != null)
-					lay= annotationAccessExtension.getLayer(annotation);
-				else if (annotation instanceof IAnnotationPresentation) {
+				if (annotationAccessExtension != null) {
+                    lay= annotationAccessExtension.getLayer(annotation);
+                } else if (annotation instanceof IAnnotationPresentation) {
 					annotationPresentation= (IAnnotationPresentation)annotation;
 					lay= annotationPresentation.getLayer();
 				}
 				maxLayer= Math.max(maxLayer, lay+1);	// dynamically update layer maximum
-				if (lay != layer)	// wrong layer: skip annotation
-					continue;
+				if (lay != layer) {
+                    continue;
+                }
 
 				Position position= fModel.getPosition(annotation);
-				if (position == null)
-					continue;
+				if (position == null) {
+                    continue;
+                }
 
 				IRegion widgetRegion= extension.modelRange2WidgetRange(new Region(position.getOffset(), position.getLength()));
-				if (widgetRegion == null)
-					continue;
+				if (widgetRegion == null) {
+                    continue;
+                }
 
 				int startLine= extension.widgetLineOfWidgetOffset(widgetRegion.getOffset());
-				if (startLine == -1)
-					continue;
+				if (startLine == -1) {
+                    continue;
+                }
 
 				int endLine= extension.widgetLineOfWidgetOffset(widgetRegion.getOffset() + Math.max(widgetRegion.getLength() -1, 0));
-				if (endLine == -1)
-					continue;
+				if (endLine == -1) {
+                    continue;
+                }
 
 				r.x= 0;
 				r.y= JFaceTextUtil.computeLineHeight(textWidget, 0, startLine, startLine)  - fScrollPos;
-				
+
 				r.width= dimension.x;
 				int lines= endLine - startLine;
-				
+
 				r.height= JFaceTextUtil.computeLineHeight(textWidget, startLine, endLine + 1, lines+1);
 
-				if (r.y < dimension.y && annotationAccessExtension != null)  // annotation within visible area
-					annotationAccessExtension.paint(annotation, gc, fCanvas, r);
-				else if (annotationPresentation != null)
-					annotationPresentation.paint(gc, fCanvas, r);
+				if (r.y < dimension.y && annotationAccessExtension != null) {
+                    annotationAccessExtension.paint(annotation, gc, fCanvas, r);
+                } else if (annotationPresentation != null) {
+                    annotationPresentation.paint(gc, fCanvas, r);
+                }
 			}
 		}
 	}
@@ -483,12 +512,14 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 	/*
 	 * @see IVerticalRuler#update()
 	 */
-	public void update() {
+	@Override
+    public void update() {
 		if (fCanvas != null && !fCanvas.isDisposed()) {
 			Display d= fCanvas.getDisplay();
 			if (d != null) {
 				d.asyncExec(new Runnable() {
-					public void run() {
+					@Override
+                    public void run() {
 						redraw();
 					}
 				});
@@ -507,20 +538,19 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 		}
 	}
 
-	/*
-	 * @see IVerticalRuler#setModel(IAnnotationModel)
-	 */
-	/** {@inheritDoc} */
-	public void setModel(IAnnotationModel model) {
+	@Override
+    public void setModel(IAnnotationModel model) {
 		if (model != fModel) {
 
-			if (fModel != null)
-				fModel.removeAnnotationModelListener(fInternalListener);
+			if (fModel != null) {
+                fModel.removeAnnotationModelListener(fInternalListener);
+            }
 
 			fModel= model;
 
-			if (fModel != null)
-				fModel.addAnnotationModelListener(fInternalListener);
+			if (fModel != null) {
+                fModel.addAnnotationModelListener(fInternalListener);
+            }
 
 			update();
 		}
@@ -534,7 +564,8 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 	 *
 	 * @return a {@link org.eclipse.jface.text.source.IAnnotationModel} object.
 	 */
-	public IAnnotationModel getModel() {
+	@Override
+    public IAnnotationModel getModel() {
 		return fModel;
 	}
 
@@ -546,7 +577,8 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 	 *
 	 * @return a int.
 	 */
-	public int getWidth() {
+	@Override
+    public int getWidth() {
 		return fWidth;
 	}
 
@@ -558,27 +590,27 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 	 *
 	 * @return a int.
 	 */
-	public int getLineOfLastMouseButtonActivity() {
+	@Override
+    public int getLineOfLastMouseButtonActivity() {
 		return fLastMouseButtonActivityLine;
 	}
 
-	/*
-	 * @see IVerticalRulerInfo#toDocumentLineNumber(int)
-	 */
-	/** {@inheritDoc} */
-	public int toDocumentLineNumber(int y_coordinate) {
-		if (fTextViewer == null  || y_coordinate == -1)
-			return -1;
+	@Override
+    public int toDocumentLineNumber(int y_coordinate) {
+		if (fTextViewer == null  || y_coordinate == -1) {
+            return -1;
+        }
 
 		StyledText text= fTextViewer.getTextWidget();
 		int line= text.getLineIndex(y_coordinate);
-		
+
 		if (line == text.getLineCount() - 1) {
 			// check whether y_coordinate exceeds last line
-			if (y_coordinate > text.getLinePixel(line + 1))
-				return -1;
+			if (y_coordinate > text.getLinePixel(line + 1)) {
+                return -1;
+            }
 		}
-		
+
 		return widgetLine2ModelLine(fTextViewer, line);
 	}
 
@@ -606,20 +638,12 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 		return widgetLine;
 	}
 
-	/*
-	 * @see IVerticalRulerExtension#setFont(Font)
-	 * @since 2.0
-	 */
-	/** {@inheritDoc} */
-	public void setFont(Font font) {
+	@Override
+    public void setFont(Font font) {
 	}
 
-	/*
-	 * @see IVerticalRulerExtension#setLocationOfLastMouseButtonActivity(int, int)
-	 * @since 2.0
-	 */
-	/** {@inheritDoc} */
-	public void setLocationOfLastMouseButtonActivity(int x, int y) {
+	@Override
+    public void setLocationOfLastMouseButtonActivity(int x, int y) {
 		fLastMouseButtonActivityLine= toDocumentLineNumber(y);
 	}
 
@@ -630,9 +654,11 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 	 * @deprecated will be removed
 	 * @since 2.0
 	 */
-	public void addMouseListener(MouseListener listener) {
-		if (fCanvas != null && !fCanvas.isDisposed())
-			fCanvas.addMouseListener(listener);
+	@Deprecated
+    public void addMouseListener(MouseListener listener) {
+		if (fCanvas != null && !fCanvas.isDisposed()) {
+            fCanvas.addMouseListener(listener);
+        }
 	}
 
 	/**
@@ -642,9 +668,11 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 	 * @deprecated will be removed
 	 * @since 2.0
 	 */
-	public void removeMouseListener(MouseListener listener) {
-		if (fCanvas != null && !fCanvas.isDisposed())
-			fCanvas.removeMouseListener(listener);
+	@Deprecated
+    public void removeMouseListener(MouseListener listener) {
+		if (fCanvas != null && !fCanvas.isDisposed()) {
+            fCanvas.removeMouseListener(listener);
+        }
 	}
 
 	/**
@@ -657,4 +685,4 @@ public class RulerWithIcon implements IVerticalRuler, IVerticalRulerExtension {
 		redraw();
 	}
 }
-	
+
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
index 0f4fc6f84..71135ea1b 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/TaxonNameEditorE4.java
@@ -103,10 +103,8 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 
 /**
- *
  * @author pplitzner
  * @date Aug 24, 2017
- *
  */
 public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable, IPartContentHasDetails,
         IPartContentHasSupplementalData, IPartContentHasMedia, IPartContentHasFactualData, IPartChangeListener,
@@ -136,7 +134,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
     @Inject
     UISynchronize sync;
 
-    private TaxonBase objectAffectedByLastOperation;
+    private TaxonBase<?> objectAffectedByLastOperation;
 
     @Inject
     private EMenuService menuService;
@@ -189,7 +187,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
             @Override
             public boolean setInput(Object input) {
                 if (input instanceof AbstractGroupedContainerE4) {
-                    TaxonBase newSelection = ((AbstractGroupedContainerE4) input).getData();
+                    TaxonBase<?> newSelection = ((AbstractGroupedContainerE4<?>) input).getData();
                     if (selection != newSelection || TaxonNameEditorE4.this.isDirty()) {
                         selection = newSelection;
                         selService.setSelection(new StructuredSelection(selection));
@@ -306,7 +304,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         return conversation;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void update(CdmDataChangeMap events) {
         // redraw();
@@ -340,7 +337,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
     @Override
     public boolean postOperation(Object objectAffectedByOperation) {
         if (objectAffectedByOperation instanceof TaxonBase) {
-            objectAffectedByLastOperation = (TaxonBase) objectAffectedByOperation;
+            objectAffectedByLastOperation = (TaxonBase<?>) objectAffectedByOperation;
         }
 
         redraw(true, true, true, true);
@@ -361,7 +358,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
      * @return true if there are empty names
      */
     public boolean checkForEmptyNames() {
-        for (AbstractGroupedContainerE4 container : getGroupedContainers()) {
+        for (AbstractGroupedContainerE4<?> container : getGroupedContainers()) {
             if (container != null
                     && (container.getName() == null || StringUtils.isEmpty(container.getName().getTitleCache()))) {
                 return true;
@@ -373,7 +370,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
     public Set<AbstractGroupedContainerE4> getEmptyContainers() {
         Set<AbstractGroupedContainerE4> containersWithEmptyNames = new HashSet<>();
 
-        for (AbstractGroupedContainerE4 container : getGroupedContainers()) {
+        for (AbstractGroupedContainerE4<?> container : getGroupedContainers()) {
             if (container.getName() == null || StringUtils.isEmpty(container.getName().getTitleCache())) {
                 containersWithEmptyNames.add(container);
             }
@@ -382,7 +379,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         return containersWithEmptyNames;
     }
 
-    /** {@inheritDoc} */
     @Override
     @Persist
     public void save(IProgressMonitor monitor) {
@@ -401,7 +397,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
                     Messages.MultiPageTaxonEditor_NO_NAME_SPECIFIED_MESSAGE);
             return;
         }
-        for (AbstractGroupedContainerE4 container : getGroupedContainers()) {
+        for (AbstractGroupedContainerE4<?> container : getGroupedContainers()) {
 
             monitor.subTask(Messages.TaxonNameEditor_SAVING_COMPOSITES + container.getTaxonBase().getTitleCache());
             container.persistName();
@@ -460,7 +456,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         setPartName();
 
         // set initial selection
-        TaxonBase initiallySelectedTaxonBase = input.getInitiallySelectedTaxonBase();
+        TaxonBase<?> initiallySelectedTaxonBase = input.getInitiallySelectedTaxonBase();
         if (initiallySelectedTaxonBase != null) {
             selService.setSelection(new StructuredSelection(initiallySelectedTaxonBase));
             getContainer(initiallySelectedTaxonBase).setSelected();
@@ -503,7 +499,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
     public Set<AbstractGroupedContainerE4> getDirtyNames() {
         Set<AbstractGroupedContainerE4> dirtyNames = new HashSet<>();
 
-        for (AbstractGroupedContainerE4 composite : getGroupedContainers()) {
+        for (AbstractGroupedContainerE4<?> composite : getGroupedContainers()) {
             if (composite.isDirty()) {
                 dirtyNames.add(composite);
             }
@@ -565,7 +561,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         eventBroker.post(WorkbenchEventConstants.CURRENT_ACTIVE_EDITOR, null);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void selectionChanged(IWorkbenchPart part, ISelection selection) {
         System.err.println("Bla");
@@ -627,7 +622,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         return true;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void partChanged(Integer eventType, IWorkbenchPartReference partRef) {
         if (!partRef.getPart(false).equals(this)) {
@@ -649,7 +643,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
     public AbstractGroupedContainerE4 getContainer(TaxonBase taxonBase) {
         @SuppressWarnings("rawtypes")
         List<AbstractGroupedContainerE4> groupedContainers = getGroupedContainers();
-        for (AbstractGroupedContainerE4 container : groupedContainers) {
+        for (AbstractGroupedContainerE4<?> container : groupedContainers) {
             if (container.getData().equals(taxonBase) && container.getNameViewer().getTextWidget() != null) {
                 return container;
             }
@@ -669,7 +663,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
 
     protected void setEnabled(boolean enabled, Color background) {
 
-        for (AbstractGroupedContainerE4 groupedContainer : getGroupedContainers()) {
+        for (AbstractGroupedContainerE4<?> groupedContainer : getGroupedContainers()) {
             groupedContainer.setEnabled(enabled);
         }
 
@@ -678,7 +672,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         if (!enabled) {
             getManagedForm().setInput(null);
 
-            for (AbstractGroupedContainerE4 groupedContainer : getGroupedContainers()) {
+            for (AbstractGroupedContainerE4<?> groupedContainer : getGroupedContainers()) {
                 groupedContainer.setBackground(background);
             }
         }
@@ -699,7 +693,7 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         }
 
         if (element instanceof TaxonBase) {
-            AbstractGroupedContainerE4 container = getContainer((TaxonBase) element);
+            AbstractGroupedContainerE4<?> container = getContainer((TaxonBase<?>) element);
             if (container != null) {
                 container.refresh();
             }
@@ -741,9 +735,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         return selService;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean canAttachMedia() {
         return true;
@@ -753,9 +744,6 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
         return input;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public TaxonNameEditorE4 getEditor() {
         return this;
@@ -828,20 +816,15 @@ public class TaxonNameEditorE4 implements IConversationEnabled, IDirtyMarkable,
 
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void update() {
         EPartService partService = TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getService(EPartService.class);
         EModelService modelService = TaxeditorEditorPlugin.getDefault().getWorkbench().getActiveWorkbenchWindow().getService(EModelService.class);
         EditorUtil.openTaxonBaseE4(this.getTaxon().getUuid(), modelService, partService, application);
-
     }
 
     @Override
     public TaxonNode getTaxonNode() {
         return input.getTaxonNode();
     }
-
 }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupE4.java
index 95678e450..a916158a6 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupE4.java
@@ -33,10 +33,8 @@ import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
 /**
- *
  * @author pplitzner
  * @date Aug 24, 2017
- *
  */
 public abstract class AbstractGroupE4 implements IDropTargetableE4{
 
@@ -135,19 +133,18 @@ public abstract class AbstractGroupE4 implements IDropTargetableE4{
     public void dragEntered() {
 		Color color = AbstractUtility.getColor(Resources.COLOR_DRAG_ENTER);
 
-		for(AbstractGroupedContainerE4 container : groupedContainers){
+		for(AbstractGroupedContainerE4<?> container : groupedContainers){
 			container.setBackground(color);
 		}
 	}
 
 	@Override
     public void dragLeft() {
-		for(AbstractGroupedContainerE4 container : groupedContainers){
+		for(AbstractGroupedContainerE4<?> container : groupedContainers){
 			container.restoreColor();
 		}
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public boolean postOperation(Object objectAffectedByOperation) {
 		editor.changed(objectAffectedByOperation);
@@ -176,7 +173,7 @@ public abstract class AbstractGroupE4 implements IDropTargetableE4{
 	public void dispose(){
 		if(getControl() != null){
 		    getControl().setMenu(null);
-			for(AbstractGroupedContainerE4 container : getGroupedContainers()){
+			for(AbstractGroupedContainerE4<?> container : getGroupedContainers()){
 				container.dispose();
 			}
 			getControl().dispose();
@@ -184,7 +181,7 @@ public abstract class AbstractGroupE4 implements IDropTargetableE4{
 	}
 
 	protected void emptyGroup(){
-		for(AbstractGroupedContainerE4 container : groupedContainers){
+		for(AbstractGroupedContainerE4<?> container : groupedContainers){
 		    container.getControl().setMenu(null);
 			container.dispose();
 		}
@@ -192,7 +189,7 @@ public abstract class AbstractGroupE4 implements IDropTargetableE4{
 	}
 
 	protected void setMenuToGroup(){
-        for(AbstractGroupedContainerE4 container : groupedContainers){
+        for(AbstractGroupedContainerE4<?> container : groupedContainers){
             container.setMenu();
 
         }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AcceptedNameContainerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AcceptedNameContainerE4.java
index c9f13efe8..dbf44bac6 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AcceptedNameContainerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AcceptedNameContainerE4.java
@@ -14,6 +14,10 @@ import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
+/**
+ * @author pplitzner
+ * @date 24-08-2017
+ */
 public class AcceptedNameContainerE4 extends AbstractGroupedContainerE4<Taxon> {
 
 	public AcceptedNameContainerE4(AcceptedGroupE4 group, Taxon taxon) {
@@ -27,19 +31,16 @@ public class AcceptedNameContainerE4 extends AbstractGroupedContainerE4<Taxon> {
 		initTextViewer();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected Font getViewerFont() {
 		return AbstractUtility.getFont(Resources.ACCEPTED_TAXON_FONT);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected void updateNonEditableInfo() {
 		// not needed
 	}
 
-
 	@Override
 	protected void updateIcon() {
 		setIcon(ACCEPTED_ICON);
@@ -49,5 +50,4 @@ public class AcceptedNameContainerE4 extends AbstractGroupedContainerE4<Taxon> {
 	protected void updateIndent() {
 		setIndent(ACCEPTED_INDENT);
 	}
-
 }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java
index c6563ba39..381a48582 100755
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/ConceptContainerE4.java
@@ -30,10 +30,8 @@ import eu.etaxonomy.taxeditor.preference.Resources;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
- *
  * @author pplitzner
  * @date Aug 24, 2017
- *
  */
 public class ConceptContainerE4 extends AbstractGroupedContainerE4<Taxon> {
 	TaxonRelationship relationship;
@@ -44,10 +42,8 @@ public class ConceptContainerE4 extends AbstractGroupedContainerE4<Taxon> {
 		super(group, misappliedName);
 		this.conceptType = conceptType;
 		misappliedFormatter = new TaxonRelationshipFormatter();
-
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected void initializeComposite() {
 		setIsDraggable(true);
@@ -103,7 +99,6 @@ public class ConceptContainerE4 extends AbstractGroupedContainerE4<Taxon> {
 		return getTaxonBase();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected Font getViewerFont() {
 		return AbstractUtility.getFont(Resources.MISAPPLIEDNAME_FONT);
@@ -118,8 +113,6 @@ public class ConceptContainerE4 extends AbstractGroupedContainerE4<Taxon> {
 		super.showAnnotations();
 	}
 
-
-	/** {@inheritDoc} */
 	@Override
 	protected void updateNonEditableInfo() {
 		showSec();
@@ -192,5 +185,4 @@ public class ConceptContainerE4 extends AbstractGroupedContainerE4<Taxon> {
 
 		enableFreeText();
 	}
-
 }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/SynonymContainerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/SynonymContainerE4.java
index 6be17b2eb..909e825f3 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/SynonymContainerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/SynonymContainerE4.java
@@ -18,8 +18,8 @@ import eu.etaxonomy.cdm.model.name.HomotypicalGroup;
 import eu.etaxonomy.cdm.model.name.NomenclaturalStatus;
 import eu.etaxonomy.cdm.model.name.TaxonName;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
-import eu.etaxonomy.taxeditor.editor.EditorUtil;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
+import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
@@ -28,7 +28,6 @@ import eu.etaxonomy.taxeditor.preference.Resources;
  *
  * @author p.ciardelli
  * @created 13.01.2009
- * @version 1.0
  */
 public class SynonymContainerE4 extends AbstractGroupedContainerE4<Synonym> {
 
@@ -52,7 +51,6 @@ public class SynonymContainerE4 extends AbstractGroupedContainerE4<Synonym> {
 		this.icon = icon;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected void initializeComposite() {
 		setIsDraggable(true);
@@ -123,18 +121,14 @@ public class SynonymContainerE4 extends AbstractGroupedContainerE4<Synonym> {
 	 */
 	@Override
     protected Font getViewerFont() {
-		return EditorUtil.getFont(Resources.SYNONYM_FONT);
+		return AbstractUtility.getFont(Resources.SYNONYM_FONT);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected void updateNonEditableInfo() {
 		// not needed
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.name.AbstractGroupedContainer#updateIndent()
-	 */
 	@Override
 	protected void updateIndent() {
 		setIndent(this.indent );
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDragListenerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDragListenerE4.java
index 913378f74..4c5195317 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDragListenerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDragListenerE4.java
@@ -14,20 +14,17 @@ import eu.etaxonomy.taxeditor.editor.name.e4.container.AbstractGroupedContainerE
 import eu.etaxonomy.taxeditor.editor.name.e4.container.ConceptContainerE4;
 
 /**
- *
  * @author pplitzner
  * @date 04.09.2017
- *
  */
 public class NameEditorDragListenerE4 extends DragSourceAdapter {
 
-	private AbstractGroupedContainerE4 container;
+	private AbstractGroupedContainerE4<?> container;
 
 	public NameEditorDragListenerE4(AbstractGroupedContainerE4 container){
 		this.container = container;
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public void dragFinished(DragSourceEvent event) {
 		if(!event.doit) {
@@ -39,9 +36,8 @@ public class NameEditorDragListenerE4 extends DragSourceAdapter {
 			managedForm.reflow(true);
 		}
 
-	};
+	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void dragSetData(DragSourceEvent event) {
 		ICdmBase[] cdmBaseObjects = new ICdmBase[]{container.getData()};
@@ -50,7 +46,6 @@ public class NameEditorDragListenerE4 extends DragSourceAdapter {
         }
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void dragStart(DragSourceEvent event) {
 		event.doit = (container.getData() != null) && !(container instanceof ConceptContainerE4);
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDragSourceEffect.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDragSourceEffect.java
index ade85e166..008b055c7 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDragSourceEffect.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDragSourceEffect.java
@@ -9,7 +9,6 @@ import org.eclipse.swt.widgets.Control;
 
 /**
  * @author n.hoffmann
- * @version $Id: $
  */
 public class NameEditorDragSourceEffect extends DragSourceEffect {
 
@@ -17,13 +16,11 @@ public class NameEditorDragSourceEffect extends DragSourceEffect {
 		super(control);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void dragStart(DragSourceEvent event) {
 		super.dragStart(event);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void dragFinished(DragSourceEvent event) {
 		super.dragFinished(event);
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetEffect.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetEffect.java
index be41b3a19..693cde5f9 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetEffect.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetEffect.java
@@ -12,9 +12,7 @@ import eu.etaxonomy.taxeditor.editor.name.e4.IDropTargetableE4;
 import eu.etaxonomy.taxeditor.preference.Resources;
 
 /**
- *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class NameEditorDropTargetEffect extends DropTargetEffect {
 
@@ -22,7 +20,6 @@ public class NameEditorDropTargetEffect extends DropTargetEffect {
 		super(control);
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public void dragEnter(DropTargetEvent dropTargetEvent) {
 		if(dropTargetEvent.widget instanceof IDropTargetableE4){
@@ -30,7 +27,6 @@ public class NameEditorDropTargetEffect extends DropTargetEffect {
 		}
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public void dragLeave(DropTargetEvent dropTargetEvent) {
 		if(dropTargetEvent.widget instanceof Control){
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetListenerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetListenerE4.java
index 729b4a62f..03dc77bc3 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetListenerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/dnd/NameEditorDropTargetListenerE4.java
@@ -31,10 +31,8 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.operation.AbstractPostOperation;
 
 /**
- *
  * @author pplitzner
  * @date Aug 24, 2017
- *
  */
 public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
 
@@ -44,24 +42,20 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
 		this.target = target;
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public void dragEnter(DropTargetEvent dropTargetEvent) {
 		target.dragEntered();
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public void dragLeave(DropTargetEvent dropTargetEvent) {
 		target.dragLeft();
 	}
 
-
-	/** {@inheritDoc} */
 	@Override
     public void drop(DropTargetEvent dropTargetEvent) {
 
-		TaxonBase taxonBase = getDroppedTaxonBase(dropTargetEvent);
+		TaxonBase<?> taxonBase = getDroppedTaxonBase(dropTargetEvent);
 
 		Assert.isNotNull(taxonBase);
 
@@ -77,7 +71,7 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
 		}
 
 		// Execute operations at end of drag event
-		AbstractPostOperation operation = createOperation(taxonBase);
+		AbstractPostOperation<?> operation = createOperation(taxonBase);
 
 		// Execute operation if it has been initiated
 		if (operation == null) {
@@ -144,13 +138,11 @@ public class NameEditorDropTargetListenerE4 extends DropTargetAdapter {
 		return null;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void dropAccept(DropTargetEvent event) {
 		// pass
 	}
 
-
 	private HomotypicalGroup getHomotypicalGroup() {
 		if(target instanceof AbstractHomotypicalGroupContainerE4){
 			return ((AbstractHomotypicalGroupContainerE4) target).getGroup();
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java
index fb35f7389..4cc9fac50 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/ChangeSynonymToAcceptedTaxonHandlerE4.java
@@ -42,10 +42,8 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.ui.dialog.selection.TaxonNodeSelectionDialog;
 
 /**
- *
  * @author pplitzner
  * @since Aug 28, 2017
- *
  */
 public class ChangeSynonymToAcceptedTaxonHandlerE4 implements IPostOperationEnabled {
 	private static final Logger logger = Logger
@@ -102,10 +100,8 @@ public class ChangeSynonymToAcceptedTaxonHandlerE4 implements IPostOperationEnab
 
 			AbstractUtility.executeOperation(operation, sync);
 		}
-
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public boolean postOperation(Object objectAffectedByOperation) {
 
@@ -129,7 +125,6 @@ public class ChangeSynonymToAcceptedTaxonHandlerE4 implements IPostOperationEnab
 		return false;
 	}
 
-
     @CanExecute
     public boolean canExecute(@Named(IServiceConstants.ACTIVE_SELECTION)IStructuredSelection selection,
             MHandledMenuItem menuItem){
@@ -146,5 +141,4 @@ public class ChangeSynonymToAcceptedTaxonHandlerE4 implements IPostOperationEnab
         }
         return canExecute;
     }
-
 }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
index d99c7f0a5..a401a07fb 100755
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/handler/NameEditorMenuPropertyTester.java
@@ -26,7 +26,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  *
  * @author n.hoffmann
  * @created Jun 22, 2010
- * @version 1.0
  */
 public class NameEditorMenuPropertyTester extends PropertyTester {
 
@@ -53,7 +52,6 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
 	public NameEditorMenuPropertyTester() {
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public boolean test(Object receiver, String property, Object[] args,
 			Object expectedValue) {
@@ -143,7 +141,7 @@ public class NameEditorMenuPropertyTester extends PropertyTester {
 
 	public static boolean isSynonymOrTaxonInHomotypicalGroupWithMoreSynonyms(Object selectedElement) {
 		if (isSynonym(selectedElement) || isAccepted(selectedElement)){
-			TaxonBase synonym = (TaxonBase) selectedElement;
+			TaxonBase<?> synonym = (TaxonBase<?>) selectedElement;
 			return synonym.getHomotypicGroup().getTypifiedNames().size()>1;
 		}
 		return false;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java
index 8d6672ab7..cda8ec23d 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptRelationshipTypeOperation.java
@@ -32,7 +32,6 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  *
  * @author n.hoffmann
  * @created 03.02.2009
- * @version 1.0
  */
 public class ChangeConceptRelationshipTypeOperation extends AbstractPostTaxonOperation {
 
@@ -71,10 +70,6 @@ public class ChangeConceptRelationshipTypeOperation extends AbstractPostTaxonOpe
 		this.newRelationshipType = type;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -93,20 +88,12 @@ public class ChangeConceptRelationshipTypeOperation extends AbstractPostTaxonOpe
 		return postExecute(relatedTaxon);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java
index 67ad45475..13a130210 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeConceptToSynonymOperation.java
@@ -37,7 +37,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @author p.ciardelli
  * @author n.hoffmann
  * @created 15.01.2009
- * @version 1.0
  */
 public class ChangeConceptToSynonymOperation extends
 		AbstractPostTaxonOperation {
@@ -81,7 +80,6 @@ public class ChangeConceptToSynonymOperation extends
 		this.homotypicalGroup = homotypicalGroup != null ? homotypicalGroup : HomotypicalGroup.NewInstance();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -104,7 +102,6 @@ public class ChangeConceptToSynonymOperation extends
 		return postExecute(synonym);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -112,7 +109,6 @@ public class ChangeConceptToSynonymOperation extends
 		return null;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperation.java
index 28d6f9ea8..5debb1a81 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicGroupOperation.java
@@ -69,7 +69,6 @@ public class ChangeHomotypicGroupOperation extends AbstractPostTaxonOperation {
 		this.newHomotypicalGroup = newHomotypicalGroup != null ? newHomotypicalGroup : HomotypicalGroup.NewInstance();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -85,13 +84,13 @@ public class ChangeHomotypicGroupOperation extends AbstractPostTaxonOperation {
 		monitor.worked(40);
 		newHomotypicalGroup = HibernateProxyHelper.deproxy(newHomotypicalGroup, HomotypicalGroup.class);
 		newHomotypicalGroup.addTypifiedName(synonymName);
-		
+
 		Taxon acc = synonym.getAcceptedTaxon();
 		if(acc == null || !acc.equals(element)){
 			if(acc != null){
 				acc.removeSynonym(synonym);
 			}
-			
+
 			SynonymType type = SynonymType.HETEROTYPIC_SYNONYM_OF();
 			if(newHomotypicalGroup.getTypifiedNames().contains(element.getName())){
 				type = SynonymType.HOMOTYPIC_SYNONYM_OF();
@@ -104,14 +103,12 @@ public class ChangeHomotypicGroupOperation extends AbstractPostTaxonOperation {
 		return postExecute(synonym);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperation.java
index 210732323..650d7bc2d 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeHomotypicalGroupBasionymOperation.java
@@ -33,8 +33,8 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  */
 public class ChangeHomotypicalGroupBasionymOperation extends
 		AbstractPostTaxonOperation {
-	
-	private final TaxonBase taxonBase;
+
+	private final TaxonBase<?> taxonBase;
 
 	/**
 	 * <p>Constructor for ChangeHomotypicalGroupBasionymOperation.</p>
@@ -52,7 +52,6 @@ public class ChangeHomotypicalGroupBasionymOperation extends
 		this.taxonBase = taxonBase;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -71,7 +70,7 @@ public class ChangeHomotypicalGroupBasionymOperation extends
 		if (oldBasionym != null){
 			Set<TaxonBase> taxonBases = oldBasionym.getTaxonBases();
 			if (!taxonBases.isEmpty()){
-				TaxonBase oldBasionymTaxonBase = taxonBases.iterator().next();
+				TaxonBase<?> oldBasionymTaxonBase = taxonBases.iterator().next();
 				postExecute(oldBasionymTaxonBase);
 			}
 		}
@@ -79,14 +78,12 @@ public class ChangeHomotypicalGroupBasionymOperation extends
 		return postExecute(taxonBase);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
index c6a3cea42..8da89ab9a 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToAcceptedTaxonOperation.java
@@ -77,13 +77,11 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
 		//this.namesInHomotypicGroup = namesInHomotypicalGroup;
 	}
 
-
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 
-		
+
 		UpdateResult result;
 		try {
 			result = CdmStore.getService(ITaxonService.class).changeSynonymToAcceptedTaxon(synonym.getUuid(),
@@ -91,7 +89,7 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
 			        parentNode.getUuid(),
 			        true);
 			if (result.isAbort()){
-				
+
 				MessagingUtils.warningDialog(Messages.ChangeSynonymToAcceptedTaxonOperation_INCONSISTENT_DATA, getClass(), result.toString());
 				return postExecute(null);
 			}
@@ -100,8 +98,8 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
-		
+
+
 		monitor.worked(20);
 		//newTaxon = (Taxon) CdmStore.getService(ITaxonService.class).merge(newTaxon);
 		//element.removeSynonym(synonym);
@@ -121,14 +119,12 @@ public class ChangeSynonymToAcceptedTaxonOperation extends AbstractPersistentPos
 		return postExecute(newNode);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperation.java
index 884a67d8b..3e23a498a 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToConceptOperation.java
@@ -30,7 +30,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @author p.ciardelli
  * @author n.hoffmann
  * @created 21.01.2009
- * @version 1.0
  */
 public class ChangeSynonymToConceptOperation extends AbstractPostTaxonOperation {
 	private final Synonym synonym;
@@ -55,10 +54,6 @@ public class ChangeSynonymToConceptOperation extends AbstractPostTaxonOperation
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -86,20 +81,12 @@ public class ChangeSynonymToConceptOperation extends AbstractPostTaxonOperation
 		return postExecute(fromTaxon);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToHomotypicalGroupBasionymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToHomotypicalGroupBasionymOperation.java
index a080f4da5..64cd9d6d1 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToHomotypicalGroupBasionymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToHomotypicalGroupBasionymOperation.java
@@ -24,7 +24,6 @@ import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
  *
  * @author p.ciardelli
  * @created 14.01.2009
- * @version 1.0
  * @deprecated there will be an operation to set the basionym only that automatically unsets the former basionym
  */
 @Deprecated
@@ -47,10 +46,6 @@ public class ChangeSynonymToHomotypicalGroupBasionymOperation extends AbstractPo
 		this.synonym = synonym;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -73,20 +68,12 @@ public class ChangeSynonymToHomotypicalGroupBasionymOperation extends AbstractPo
 		return postExecute(synonym);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperation.java
index c459cc97a..c3841cd9b 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/ChangeSynonymToMisapplicationOperation.java
@@ -32,7 +32,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * @author p.ciardelli
  * @author n.hoffmann
  * @created 14.01.2009
- * @version 1.0
  */
 public class ChangeSynonymToMisapplicationOperation extends AbstractPostTaxonOperation {
 
@@ -56,7 +55,6 @@ public class ChangeSynonymToMisapplicationOperation extends AbstractPostTaxonOpe
 		this.synonym = synonym;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -91,7 +89,6 @@ public class ChangeSynonymToMisapplicationOperation extends AbstractPostTaxonOpe
 		return postExecute(misapplication);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -106,7 +103,6 @@ public class ChangeSynonymToMisapplicationOperation extends AbstractPostTaxonOpe
 		return postExecute(misapplication);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExistingHomotypicalGroupOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExistingHomotypicalGroupOperation.java
index d9f0cbf56..5c09f4797 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExistingHomotypicalGroupOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInExistingHomotypicalGroupOperation.java
@@ -54,7 +54,6 @@ public class CreateSynonymInExistingHomotypicalGroupOperation extends
 		this.newSynonymName = newSynonymName;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -96,14 +95,12 @@ public class CreateSynonymInExistingHomotypicalGroupOperation extends
 		return postExecute(synonym);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
index 7a0bb9d55..71049fa7d 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/CreateSynonymInNewGroupOperation.java
@@ -55,7 +55,6 @@ public class CreateSynonymInNewGroupOperation extends CreateNewTaxonBaseOperatio
 		this.newSynonymName = newSynonymName;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -79,16 +78,12 @@ public class CreateSynonymInNewGroupOperation extends CreateNewTaxonBaseOperatio
 		return postExecute(newSynonym);
 	}
 
-
-
-    /** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java
index 65b71fad5..942abb459 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteMisapplicationOperation.java
@@ -58,10 +58,6 @@ public class DeleteMisapplicationOperation extends DeleteTaxonBaseOperation {
 		this.element = taxon;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -91,21 +87,18 @@ public class DeleteMisapplicationOperation extends DeleteTaxonBaseOperation {
 		return postExecute(null);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 
 		element.addMisappliedName(misapplication, citation, microcitation);
 
-
 		return postExecute(misapplication);
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java
index 5c534923c..662820d04 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/DeleteSynonymOperation.java
@@ -56,7 +56,6 @@ public class DeleteSynonymOperation extends DeleteTaxonBaseOperation {
 		this.element = taxon;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -84,14 +83,12 @@ public class DeleteSynonymOperation extends DeleteTaxonBaseOperation {
 //		return postExecute(element);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -103,17 +100,11 @@ public class DeleteSynonymOperation extends DeleteTaxonBaseOperation {
 		return postExecute(synonym);
 	}
 
-    /**
-     * @return the result
-     */
     @Override
     public DeleteResult getResult() {
         return result;
     }
 
-    /**
-     * @param result the result to set
-     */
     public void setResult(DeleteResult result) {
         this.result = result;
     }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
index e5224a767..46a08b033 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/operation/SwapSynonymAndAcceptedOperation.java
@@ -24,12 +24,12 @@ import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.SynonymType;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
+import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.operation.AbstractPostTaxonOperation;
 import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.session.ICdmEntitySessionEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
-import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 
 /**
  * <p>SwapSynonymAndAcceptedOperation class.</p>
@@ -62,12 +62,10 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostTaxonOperation
 		super(Messages.SwapSynonymAndAcceptedOperation_SWAP_SYN_ACC_TAXON, undoContext, taxon, postOperationEnabled, cdmEntitySessionEnabled);
 		this.setNameInSource = setNameInSource;
 		this.synonym = synonym;
-		this.nodes = new ArrayList(taxon.getTaxonNodes());
-
+		this.nodes = new ArrayList<TaxonNode>(taxon.getTaxonNodes());
 
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -84,7 +82,6 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostTaxonOperation
 		return postExecute(element);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -92,7 +89,6 @@ public class SwapSynonymAndAcceptedOperation extends AbstractPostTaxonOperation
 		return execute(monitor, info);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistContentProvider.java
index 0e03f1a11..3dfb5a50a 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/checklist/ChecklistContentProvider.java
@@ -15,15 +15,11 @@ import org.eclipse.jface.viewers.IStructuredContentProvider;
 import org.eclipse.jface.viewers.Viewer;
 
 /**
- *
  * @author a.oppermann
  * @created 30.04.2014
- * @version 1.0
  */
 public class ChecklistContentProvider implements IStructuredContentProvider {
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#dispose()
-	 */
+
 	/**
 	 * <p>dispose</p>
 	 */
@@ -32,20 +28,11 @@ public class ChecklistContentProvider implements IStructuredContentProvider {
 
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {
 
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public Object[] getElements(Object inputElement) {
 		if(inputElement instanceof List){
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/CreateConceptRelationMenuE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/CreateConceptRelationMenuE4.java
index 67be32dcd..b26765ffd 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/CreateConceptRelationMenuE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/e4/CreateConceptRelationMenuE4.java
@@ -23,16 +23,13 @@ import eu.etaxonomy.cdm.model.taxon.TaxonRelationshipType;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
- *
  * @author pplitzner
  * @date 21.08.2017
- *
  */
 public class CreateConceptRelationMenuE4 {
 
     public String commandName = "eu.etaxonomy.taxeditor.editor.name.createConceptRelation"; //$NON-NLS-1$
 
-    /** {@inheritDoc} */
     @AboutToShow
     public void aboutToShow(List<MMenuElement> items) {
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java
index ee04b763b..3e88e40a0 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/CreateConceptRelationOperation.java
@@ -27,7 +27,6 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @author p.ciardelli
  * @author n.hoffmann
  * @created 26.01.2009
- * @version 1.0
  */
 public class CreateConceptRelationOperation extends CreateNewTaxonBaseOperation {
 
@@ -58,10 +57,6 @@ public class CreateConceptRelationOperation extends CreateNewTaxonBaseOperation
 		this(label, undoContext, taxon, concept, new TaxonRelationshipTypeInverseContainer(taxonRelationshipType, false), postOperationEnabled);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -80,20 +75,12 @@ public class CreateConceptRelationOperation extends CreateNewTaxonBaseOperation
 		return postExecute(concept);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/DeleteConceptRelationOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/DeleteConceptRelationOperation.java
index 9f71fae56..f8e07b56c 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/DeleteConceptRelationOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/concept/operation/DeleteConceptRelationOperation.java
@@ -28,19 +28,11 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @author p.ciardelli
  * @author n.hoffmann
  * @created 29.01.2009
- * @version 1.0
  */
 public class DeleteConceptRelationOperation extends AbstractPostTaxonOperation {
 
 	private final Set<TaxonRelationship> taxonRelationships;
 
-
-	/**
-	 * @param name
-	 * @param undoContext
-	 * @param relation
-	 * @param postOperationEnabled
-	 */
 	public DeleteConceptRelationOperation(String label,
 			IUndoContext undoContext, Taxon taxon, Set<TaxonRelationship> relations,
 			IPostOperationEnabled postOperationEnabled) {
@@ -49,10 +41,6 @@ public class DeleteConceptRelationOperation extends AbstractPostTaxonOperation {
 		taxonRelationships = relations;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -69,20 +57,12 @@ public class DeleteConceptRelationOperation extends AbstractPostTaxonOperation {
 		return postExecute(element);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return execute(monitor, info);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
index 831f117e8..5301e6f39 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/derivate/operation/DeleteDerivateOperation.java
@@ -31,10 +31,8 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
- *
  * @author pplitzner
  * @date Oct 21, 2014
- *
  */
 public class DeleteDerivateOperation extends AbstractPostOperation<CdmBase> {
 
@@ -53,8 +51,6 @@ public class DeleteDerivateOperation extends AbstractPostOperation<CdmBase> {
         this.treeNode = treeNode;
     }
 
-
-    /** {@inheritDoc} */
     @Override
     public IStatus execute(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
 
@@ -79,14 +75,12 @@ public class DeleteDerivateOperation extends AbstractPostOperation<CdmBase> {
         return Status.OK_STATUS;
     }
 
-    /** {@inheritDoc} */
     @Override
     public IStatus redo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
         //no redo possible
         return Status.CANCEL_STATUS ;
     }
 
-    /** {@inheritDoc} */
     @Override
     public IStatus undo(IProgressMonitor monitor, IAdaptable info) throws ExecutionException {
         //no undo possible
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
index 15ee0e658..212042a66 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveContentProvider.java
@@ -32,7 +32,6 @@ import eu.etaxonomy.taxeditor.store.UsageTermCollection;
  *
  * @author p.ciardelli
  * @author n.hoffmann
- * @version $Id: $
  */
 public class DescriptiveContentProvider implements ITreeContentProvider {
 
@@ -54,10 +53,6 @@ public class DescriptiveContentProvider implements ITreeContentProvider {
 		this.showOnlyIndividualAssociations = showOnlyIndividualAssociations;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public Object[] getChildren(Object parentElement) {
 	    if(parentElement instanceof TreeNode){
@@ -159,7 +154,6 @@ public class DescriptiveContentProvider implements ITreeContentProvider {
 		return featureNodeContainerCache.get(description);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public boolean hasChildren(Object element) {
 		if (element instanceof DescriptionBase<?>){
@@ -235,7 +229,6 @@ public class DescriptiveContentProvider implements ITreeContentProvider {
         return resultDescriptions;
     }
 
-	/** {@inheritDoc} */
 	@Override
     public Object getParent(Object element) {
 	    if (element instanceof FeatureNodeContainer){
@@ -244,7 +237,6 @@ public class DescriptiveContentProvider implements ITreeContentProvider {
 		return null;
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public Object[] getElements(Object inputElement) {
 		return getChildren(inputElement);
@@ -258,7 +250,6 @@ public class DescriptiveContentProvider implements ITreeContentProvider {
 		featureNodeContainerCache.clear();
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveLabelProvider.java
index f87c8571f..35cc7ddec 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/DescriptiveLabelProvider.java
@@ -21,7 +21,6 @@ import eu.etaxonomy.taxeditor.model.ImageResources;
 
 /**
  * @author p.ciardelli
- * @version $Id: $
  */
 public class DescriptiveLabelProvider extends ColumnLabelProvider implements IStyledLabelProvider  {
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
index 2da163fd8..e54bea988 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/FactualDataPartE4.java
@@ -69,7 +69,6 @@ import eu.etaxonomy.taxeditor.workbench.part.ICollapsableExpandable;
 /**
  * @author pplitzner
  * @date 15.08.2017
- *
  */
 public class FactualDataPartE4 extends AbstractCdmEditorPartE4
         implements IPartContentHasDetails, IPartContentHasSupplementalData, ICdmEntitySessionEnabled,
@@ -188,7 +187,6 @@ public class FactualDataPartE4 extends AbstractCdmEditorPartE4
         return Messages.DescriptiveViewPart_FACTUAL_DATA;
     }
 
-    /** {@inheritDoc} */
     @Override
     public void changed(Object object) {
         Object[] expandedObjects = null;
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DescriptionsMenuPropertyTesterE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DescriptionsMenuPropertyTesterE4.java
index 3101adb28..de1e92bc7 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DescriptionsMenuPropertyTesterE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DescriptionsMenuPropertyTesterE4.java
@@ -21,7 +21,6 @@ import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
  *
  * @author p.ciardelli
  * @author n.hoffmann
- * @version $Id: $
  */
 public class DescriptionsMenuPropertyTesterE4 extends PropertyTester {
 
@@ -36,10 +35,6 @@ public class DescriptionsMenuPropertyTesterE4 extends PropertyTester {
 	private static final String BULK_EDITOR = "isBulkEditor"; //$NON-NLS-1$
 	private static final String DERIVATE_EDITOR = "isDerivateEditor"; //$NON-NLS-1$
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.expressions.IPropertyTester#test(java.lang.Object, java.lang.String, java.lang.Object[], java.lang.Object)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public boolean test(Object receiver, String property, Object[] args,
 			Object expectedValue) {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DynamicFeatureMenuE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DynamicFeatureMenuE4.java
index 24280ae3f..fd09edeeb 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DynamicFeatureMenuE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/DynamicFeatureMenuE4.java
@@ -39,14 +39,11 @@ import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 
 /**
- *
  * @author pplitzner
  * @date 15.08.2017
- *
  */
 public class DynamicFeatureMenuE4 {
 
-    /** {@inheritDoc} */
     @AboutToShow
     public void aboutToShow(List<MMenuElement> items, @Named(IServiceConstants.ACTIVE_SELECTION) IStructuredSelection selection) {
         Language globalLanguage = PreferencesUtil.getGlobalLanguage();
@@ -82,7 +79,7 @@ public class DynamicFeatureMenuE4 {
     }
 
     private void createMenuItem(MMenu menu, final DefinedTermBase feature, Language globalLanguage) {
-        final DefinedTermBase deproxiedFeature = HibernateProxyHelper.deproxy(feature, DefinedTermBase.class);
+        final DefinedTermBase<?> deproxiedFeature = HibernateProxyHelper.deproxy(feature, DefinedTermBase.class);
 
         String label = deproxiedFeature.getLabel(globalLanguage);
         if (label == null){
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
index 1d0887728..09bd4f198 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsHandlerE4.java
@@ -61,10 +61,8 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 
 
 /**
- *
  * @author pplitzner
  * @date 15.08.2017
- *
  */
 public class MoveDescriptionElementsHandlerE4 implements IPostOperationEnabled{
     private UUID newAcceptedTaxonNodeUuid;
@@ -193,7 +191,6 @@ public class MoveDescriptionElementsHandlerE4 implements IPostOperationEnabled{
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean postOperation(Object objectAffectedByOperation) {
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsSetNameInSourceHandlerE5.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsSetNameInSourceHandlerE5.java
index 7c3339e84..fc62f3f60 100755
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsSetNameInSourceHandlerE5.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionElementsSetNameInSourceHandlerE5.java
@@ -61,10 +61,8 @@ import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 
 
 /**
- *
  * @author pplitzner
  * @date 15.08.2017
- *
  */
 public class MoveDescriptionElementsSetNameInSourceHandlerE5 implements IPostOperationEnabled{
     private UUID newAcceptedTaxonNodeUuid;
@@ -93,8 +91,8 @@ public class MoveDescriptionElementsSetNameInSourceHandlerE5 implements IPostOpe
         Taxon actualTaxon= null;
 
         List<DescriptionElementBase> elements = new ArrayList<DescriptionElementBase>();
-        DescriptionBase description = null;
-        for (Iterator iter = viewselection.iterator(); iter.hasNext();) {
+        DescriptionBase<?> description = null;
+        for (Iterator<?> iter = viewselection.iterator(); iter.hasNext();) {
             Object object = iter.next();
             if (object instanceof DescriptionElementBase) {
                 UUID uuid = ((DescriptionElementBase) object).getUuid();
@@ -193,7 +191,6 @@ public class MoveDescriptionElementsSetNameInSourceHandlerE5 implements IPostOpe
         }
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean postOperation(Object objectAffectedByOperation) {
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
index 3325d81b7..37c5479e2 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonHandlerE4.java
@@ -48,10 +48,8 @@ import eu.etaxonomy.taxeditor.workbench.WorkbenchUtility;
 import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 
 /**
- *
  * @author pplitzner
  * @date 15.08.2017
- *
  */
 public class MoveDescriptionToOtherTaxonHandlerE4 implements IPostOperationEnabled {
 
@@ -150,11 +148,8 @@ public class MoveDescriptionToOtherTaxonHandlerE4 implements IPostOperationEnabl
             editor.redraw();
            // AbstractUtility.executeOperation(operation, sync);
         }
-
-
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean postOperation(Object objectAffectedByOperation) {
         Display.getDefault().asyncExec(new Runnable(){
@@ -168,10 +163,7 @@ public class MoveDescriptionToOtherTaxonHandlerE4 implements IPostOperationEnabl
                     MessagingUtils.warningDialog(Messages.MoveDescriptionToOtherTaxonHandler_CREATE_FAILED, this, e.getMessage());
                 }
             }
-
         });
-
-
         return true;
     }
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5.java
index 836f93c51..15984dbb3 100755
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/e4/handler/MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5.java
@@ -48,10 +48,8 @@ import eu.etaxonomy.taxeditor.workbench.WorkbenchUtility;
 import eu.etaxonomy.taxeditor.workbench.part.IE4SavablePart;
 
 /**
- *
  * @author pplitzner
  * @date 15.08.2017
- *
  */
 public class MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5 implements IPostOperationEnabled {
 
@@ -154,7 +152,6 @@ public class MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5 implements IPos
 
     }
 
-    /** {@inheritDoc} */
     @Override
     public boolean postOperation(Object objectAffectedByOperation) {
         Display.getDefault().asyncExec(new Runnable(){
@@ -168,10 +165,7 @@ public class MoveDescriptionToOtherTaxonSetNameInSourceHandlerE5 implements IPos
                     MessagingUtils.warningDialog(Messages.MoveDescriptionToOtherTaxonHandler_CREATE_FAILED, this, e.getMessage());
                 }
             }
-
         });
-
-
         return true;
     }
 
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateDescriptionElementOperation.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateDescriptionElementOperation.java
index 0f4ca8b20..b50a3fea4 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateDescriptionElementOperation.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/descriptive/operation/CreateDescriptionElementOperation.java
@@ -35,7 +35,6 @@ import eu.etaxonomy.taxeditor.operation.IPostOperationEnabled;
  * @author p.ciardelli
  * @author n.hoffmann
  * @created 05.02.2009
- * @version 1.0
  */
 public class CreateDescriptionElementOperation extends AbstractPostTaxonOperation {
 
@@ -83,10 +82,6 @@ public class CreateDescriptionElementOperation extends AbstractPostTaxonOperatio
 		this.element = element;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -123,10 +118,6 @@ public class CreateDescriptionElementOperation extends AbstractPostTaxonOperatio
 		return postExecute(element);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
@@ -136,10 +127,6 @@ public class CreateDescriptionElementOperation extends AbstractPostTaxonOperatio
 		return postExecute(element);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
index 3e0224929..e183caeaa 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/media/MediaContentProvider.java
@@ -42,7 +42,6 @@ public class MediaContentProvider implements ITreeContentProvider{
 
 	private static final Object[] NO_CHILDREN = new Object[0];
 
-	/** {@inheritDoc} */
 	@Override
     public Object[] getChildren(Object parentElement) {
 
@@ -103,14 +102,12 @@ public class MediaContentProvider implements ITreeContentProvider{
 		return NO_CHILDREN;
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public Object getParent(Object element) {
 		// TODO Auto-generated method stub
 		return null;
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public boolean hasChildren(Object element) {
 		if (getChildren(element)== null) {
@@ -119,19 +116,14 @@ public class MediaContentProvider implements ITreeContentProvider{
 		return (getChildren(element).length > 0);
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public Object[] getElements(Object inputElement) {
 		return getChildren(inputElement);
 	}
 
-	/**
-	 * <p>dispose</p>
-	 */
 	@Override
     public void dispose() {}
 
-	/** {@inheritDoc} */
 	@Override
     public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
 
@@ -148,8 +140,6 @@ public class MediaContentProvider implements ITreeContentProvider{
 				DescriptionElementBase element = elements.iterator().next();
 				return element.getMedia();
 			}
-
-
 		}
 		return null;
 	}
@@ -157,9 +147,6 @@ public class MediaContentProvider implements ITreeContentProvider{
 	private SpecimenDescription createDerivedUnitFacadeImageGallery(DerivedUnitFacade facade){
 		SpecimenDescription description = SpecimenDescription.NewInstance();
 		description.setImageGallery(true);
-
-
-
 		return description;
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
index 5993e20a9..bff4a80e2 100644
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/view/uses/UsesLabelProvider.java
@@ -15,13 +15,13 @@ import org.eclipse.jface.viewers.ColumnLabelProvider;
 import org.eclipse.jface.viewers.DelegatingStyledCellLabelProvider.IStyledLabelProvider;
 import org.eclipse.jface.viewers.StyledString;
 
-import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.cdm.model.description.TextData;
+import eu.etaxonomy.cdm.model.term.DefinedTerm;
 import eu.etaxonomy.taxeditor.editor.l10n.Messages;
 import eu.etaxonomy.taxeditor.model.FeatureNodeContainer;
 import eu.etaxonomy.taxeditor.store.CdmStore;
@@ -31,7 +31,6 @@ import eu.etaxonomy.taxeditor.store.UsageTermCollection;
  * UsesLabelProvider Class
  * @author a.theys
  * @created mar 13, 2012
- * @version 1.0
  */
 public class UsesLabelProvider extends ColumnLabelProvider implements
 		IStyledLabelProvider {
@@ -40,13 +39,12 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
     private static final String NO_DATA_PROVIDED = Messages.UsesLabelProvider_NO_DATA;
     private static final String SEMICOLON = ";"; //$NON-NLS-1$
 
-    /** {@inheritDoc} */
 	@Override
     public String getText(Object element) {
 		String text = ""; //$NON-NLS-1$
 
 		if (element instanceof DescriptionBase) {
-			text = ((DescriptionBase) element).getTitleCache();
+			text = ((DescriptionBase<?>) element).getTitleCache();
 			if (text == null || text.length() == 0) {
 				text = USE+Messages.UsesLabelProvider_NO_LABEL;
 			}
@@ -164,7 +162,7 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
 		return  text;
 	}
 
-	/** Function dertmining which vocabulary is the term part of
+	/** Function determining which vocabulary is the term part of
 	 *
 	 * @param term
 	 * @param vocabularyExpected
@@ -183,13 +181,9 @@ public class UsesLabelProvider extends ColumnLabelProvider implements
 	return false;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public StyledString getStyledText(Object element) {
 		return new StyledString(this.getText(element),
 				StyledString.QUALIFIER_STYLER);
 	}
-
-
-
 }
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/internal/TaxeditorNavigationPlugin.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/internal/TaxeditorNavigationPlugin.java
index faed12997..6b20e2a74 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/internal/TaxeditorNavigationPlugin.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/internal/TaxeditorNavigationPlugin.java
@@ -11,7 +11,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  * The activator class controls the plug-in life cycle
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class TaxeditorNavigationPlugin extends AbstractUIPlugin {
 
@@ -21,19 +20,15 @@ public class TaxeditorNavigationPlugin extends AbstractUIPlugin {
 
 	// The shared instance
 	private static TaxeditorNavigationPlugin plugin;
-	
+
 	/**
 	 * The constructor
 	 */
 	public TaxeditorNavigationPlugin() {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	/** {@inheritDoc} */
-	public void start(BundleContext context) throws Exception {
+	@Override
+    public void start(BundleContext context) throws Exception {
 		super.start(context);
 
 		NavigatorStateManager stateManager = new NavigatorStateManager();
@@ -41,12 +36,8 @@ public class TaxeditorNavigationPlugin extends AbstractUIPlugin {
 		plugin = this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	/** {@inheritDoc} */
-	public void stop(BundleContext context) throws Exception {
+	@Override
+    public void stop(BundleContext context) throws Exception {
 		plugin = null;
 		super.stop(context);
 	}
diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java
index d7e427d5b..278299ba5 100644
--- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java
+++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/TaxonNodePropertyTester.java
@@ -3,7 +3,6 @@
  * <p>TaxonNodePropertyTester class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 package eu.etaxonomy.taxeditor.navigation.navigator;
 
@@ -26,13 +25,13 @@ public class TaxonNodePropertyTester extends PropertyTester {
 	private static final Object IS_UNPLACED = "isUnplaced"; //$NON-NLS-1$
 	private static final Object IS_EXCLUDED = "isExcluded"; //$NON-NLS-1$
     private static final Object NO_CLASSIFICATION_EXIST = "noClassificationExist";
-	/** {@inheritDoc} */
+
 	@Override
     public boolean test(Object receiver, String property, Object[] args,
 			Object expectedValue) {
 		if (receiver instanceof Collection){
-			if (((Collection)receiver).iterator().hasNext()){
-				receiver = ((Collection)receiver).iterator().next();
+			if (((Collection<?>)receiver).iterator().hasNext()){
+				receiver = ((Collection<?>)receiver).iterator().next();
 			}
 		}
 		if (receiver instanceof TaxonNode && HAS_SYNONYMS.equals(property)) {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java
index 11220ce09..45fa14a09 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/datasource/CdmDataSourceRepository.java
@@ -1,4 +1,3 @@
-
 /**
  * Copyright (C) 2007 EDIT
  * European Distributed Institute of Taxonomy
@@ -8,9 +7,7 @@
  * See LICENSE.TXT at the top of this package for the full license terms.
  *
  * @author n.hoffmann
- * @version $Id: $
  */
-
 package eu.etaxonomy.taxeditor.datasource;
 
 import java.io.File;
@@ -53,8 +50,6 @@ public class CdmDataSourceRepository{
 	private static String lastUsedCdmSourceName;
 	private static String lastUsedCdmSourcePostFix;
 
-
-
 	/**
 	 * <p>Getter for the field <code>lastUsedDataSourceName</code>.</p>
 	 *
@@ -67,7 +62,6 @@ public class CdmDataSourceRepository{
 			lastUsedCdmSourcePostFix = memento != null ? memento.getString(CURRENT_DATASOURCE_POSTFIX) : DEFAULT_DATASOURCE_POSTFIX;
 
 		}
-
 	}
 
 	/**
@@ -81,7 +75,6 @@ public class CdmDataSourceRepository{
 		return true;
 	}
 
-
 	/**
 	 * <p>getAll</p>
 	 *
@@ -92,7 +85,7 @@ public class CdmDataSourceRepository{
 
 		if (CdmPersistentDataSource.getAllDataSources() == null){
 			MessagingUtils.errorDialog("Could not read root element", CdmPersistentDataSource.class,
-					"Could not read element in datasources.xml in .cdmLibrary folder. Maybe your datasources.xml file is broken.", 
+					"Could not read element in datasources.xml in .cdmLibrary folder. Maybe your datasources.xml file is broken.",
 					TaxeditorStorePlugin.PLUGIN_ID, null, true);
 			return remoteSources;
 		}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/DefaultLabelStrategy.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/DefaultLabelStrategy.java
index 4aaa2fef7..85a64d31e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/DefaultLabelStrategy.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/DefaultLabelStrategy.java
@@ -15,14 +15,9 @@ import eu.etaxonomy.taxeditor.store.TermStore;
  * <p>DefaultLabelStrategy class.</p>
  *
  * @author p.ciardelli
- * @version $Id: $
  */
 public class DefaultLabelStrategy implements ILabelImageStrategy {
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.labels.IEditorLabelStrategy#getNameRelationTypeLabel(eu.etaxonomy.cdm.model.name.NameRelationshipType)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public String getNameRelationTypeLabel(NameRelationshipType type) {
 		List<NameRelationshipType> vocab =
@@ -36,10 +31,6 @@ public class DefaultLabelStrategy implements ILabelImageStrategy {
 		return "";
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.labels.IEditorLabelStrategy#getNameRelationInverseTypeLabel(eu.etaxonomy.cdm.model.name.NameRelationshipType)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public String getNameRelationTypeInverseLabel(NameRelationshipType type) {
 
@@ -54,10 +45,6 @@ public class DefaultLabelStrategy implements ILabelImageStrategy {
 		return "";
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.labels.ILabelImageStrategy#getNameRelationImage(eu.etaxonomy.cdm.model.name.NameRelationship)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public Image getNameRelationTypeImage(NameRelationshipType type) {
 		if (NameRelationshipType.BASIONYM().equals(type)) {
@@ -71,10 +58,6 @@ public class DefaultLabelStrategy implements ILabelImageStrategy {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.labels.ILabelImageStrategy#getNameRelationDescription(eu.etaxonomy.cdm.model.name.NameRelationshipType)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public String getNameRelationTypeDescription(NameRelationshipType type) {
 		if (NameRelationshipType.BASIONYM().equals(type)) {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/ILabelImageStrategy.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/ILabelImageStrategy.java
index 63b462878..892b0a82d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/ILabelImageStrategy.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/ILabelImageStrategy.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.labels;
 
@@ -11,7 +11,6 @@ import eu.etaxonomy.cdm.model.name.NameRelationshipType;
  * <p>ILabelImageStrategy interface.</p>
  *
  * @author p.ciardelli
- * @version $Id: $
  */
 public interface ILabelImageStrategy {
 
@@ -22,7 +21,7 @@ public interface ILabelImageStrategy {
 	 * @return a {@link java.lang.String} object.
 	 */
 	String getNameRelationTypeLabel(NameRelationshipType type);
-	
+
 	/**
 	 * <p>getNameRelationTypeInverseLabel</p>
 	 *
@@ -30,7 +29,7 @@ public interface ILabelImageStrategy {
 	 * @return a {@link java.lang.String} object.
 	 */
 	String getNameRelationTypeInverseLabel(NameRelationshipType type);
-	
+
 	/**
 	 * <p>getNameRelationTypeImage</p>
 	 *
@@ -38,7 +37,7 @@ public interface ILabelImageStrategy {
 	 * @return a {@link org.eclipse.swt.graphics.Image} object.
 	 */
 	Image getNameRelationTypeImage(NameRelationshipType type);
-	
+
 	/**
 	 * <p>getNameRelationTypeDescription</p>
 	 *
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/LabelImageProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/LabelImageProvider.java
index 4462668ea..3c000088c 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/LabelImageProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/LabelImageProvider.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.labels;
 
@@ -15,7 +15,6 @@ import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
  * code using a code-specific ILabelImageStrategy.
  *
  * @author p.ciardelli
- * @version $Id: $
  */
 public class LabelImageProvider implements ILabelImageStrategy {
 
@@ -33,8 +32,8 @@ public class LabelImageProvider implements ILabelImageStrategy {
 					equals(NomenclaturalCode.ICZN)) {
 				return new ZoologicalNameLabelStrategy();
 			}
-		} else if (name.getNomenclaturalCode() != null &&
-				name.getNomenclaturalCode().equals(NomenclaturalCode.ICZN)) {
+		} else if (name.getNameType() != null &&
+				name.getNameType().equals(NomenclaturalCode.ICZN)) {
 			return new ZoologicalNameLabelStrategy();
 		}
 		return new DefaultLabelStrategy();
@@ -48,12 +47,13 @@ public class LabelImageProvider implements ILabelImageStrategy {
 	public LabelImageProvider(ILabelImageStrategy strategy) {
 		this.strategy = strategy;
 	}
-	
+
 	/* (non-Javadoc)
 	 * @see eu.etaxonomy.taxeditor.editor.labels.IEditorLabelStrategy#getNameRelationTypeLabel(eu.etaxonomy.cdm.model.name.NameRelationshipType)
 	 */
 	/** {@inheritDoc} */
-	public String getNameRelationTypeLabel(NameRelationshipType type) {
+	@Override
+    public String getNameRelationTypeLabel(NameRelationshipType type) {
 		return strategy.getNameRelationTypeLabel(type);
 	}
 
@@ -61,7 +61,8 @@ public class LabelImageProvider implements ILabelImageStrategy {
 	 * @see eu.etaxonomy.taxeditor.editor.labels.IEditorLabelStrategy#getNameRelationInverseTypeLabel(eu.etaxonomy.cdm.model.name.NameRelationshipType)
 	 */
 	/** {@inheritDoc} */
-	public String getNameRelationTypeInverseLabel(NameRelationshipType type) {
+	@Override
+    public String getNameRelationTypeInverseLabel(NameRelationshipType type) {
 		return strategy.getNameRelationTypeInverseLabel(type);
 	}
 
@@ -69,7 +70,8 @@ public class LabelImageProvider implements ILabelImageStrategy {
 	 * @see eu.etaxonomy.taxeditor.editor.labels.ILabelImageStrategy#getNameRelationImage(eu.etaxonomy.cdm.model.name.NameRelationship)
 	 */
 	/** {@inheritDoc} */
-	public Image getNameRelationTypeImage(NameRelationshipType type) {
+	@Override
+    public Image getNameRelationTypeImage(NameRelationshipType type) {
 		return strategy.getNameRelationTypeImage(type);
 	}
 
@@ -77,7 +79,8 @@ public class LabelImageProvider implements ILabelImageStrategy {
 	 * @see eu.etaxonomy.taxeditor.labels.ILabelImageStrategy#getNameRelationDescription(eu.etaxonomy.cdm.model.name.NameRelationshipType)
 	 */
 	/** {@inheritDoc} */
-	public String getNameRelationTypeDescription(NameRelationshipType type) {
+	@Override
+    public String getNameRelationTypeDescription(NameRelationshipType type) {
 		return strategy.getNameRelationTypeDescription(type);
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/ZoologicalNameLabelStrategy.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/ZoologicalNameLabelStrategy.java
index b7a6e1e67..305028626 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/ZoologicalNameLabelStrategy.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/labels/ZoologicalNameLabelStrategy.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.labels;
 
@@ -11,34 +11,27 @@ import eu.etaxonomy.cdm.model.name.NameRelationshipType;
  * <p>ZoologicalNameLabelStrategy class.</p>
  *
  * @author p.ciardelli
- * @version $Id: $
  */
 public class ZoologicalNameLabelStrategy extends DefaultLabelStrategy {
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.editor.labels.IEditorLabelStrategy#getNameRelationTypeLabel(eu.etaxonomy.cdm.model.name.NameRelationshipType)
-	 */
-	/** {@inheritDoc} */
-	public String getNameRelationTypeLabel(NameRelationshipType type) {
+	@Override
+    public String getNameRelationTypeLabel(NameRelationshipType type) {
 		if (type.equals(NameRelationshipType.BASIONYM())) {
 			return "original combination for";
 		}
 		return super.getNameRelationTypeLabel(type);
 	}
-	
-	/** {@inheritDoc} */
-	public Image getNameRelationTypeImage(NameRelationshipType type) {
+
+	@Override
+    public Image getNameRelationTypeImage(NameRelationshipType type) {
 		if (NameRelationshipType.BASIONYM().equals(type)) {
 			return null;
 		}
 		return super.getNameRelationTypeImage(type);
 	}
-	
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.labels.ILabelImageStrategy#getNameRelationDescription(eu.etaxonomy.cdm.model.name.NameRelationshipType)
-	 */
-	/** {@inheritDoc} */
-	public String getNameRelationTypeDescription(NameRelationshipType type) {
+
+	@Override
+    public String getNameRelationTypeDescription(NameRelationshipType type) {
 		if (NameRelationshipType.BASIONYM().equals(type)) {
 			return "Original Combination";
 		}
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IPartChangeListener.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IPartChangeListener.java
index d3b16a26f..a05016702 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IPartChangeListener.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/IPartChangeListener.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.model;
 
@@ -9,10 +9,9 @@ import org.eclipse.ui.IWorkbenchPartReference;
  * <p>IPartChangeListener interface.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public interface IPartChangeListener {
-	
+
 	/**
 	 * <p>partChanged</p>
 	 *
@@ -20,5 +19,4 @@ public interface IPartChangeListener {
 	 * @param partRef a {@link org.eclipse.ui.IWorkbenchPartReference} object.
 	 */
 	public void partChanged(Integer eventType, IWorkbenchPartReference partRef);
-	
-}
+}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxeditorPartService.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxeditorPartService.java
index 56e5e0b8d..168c4d562 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxeditorPartService.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxeditorPartService.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.model;
 
@@ -17,7 +17,6 @@ import org.eclipse.ui.PlatformUI;
  * <p>TaxeditorPartService class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class TaxeditorPartService implements IPartListener2{
 
@@ -37,19 +36,19 @@ public class TaxeditorPartService implements IPartListener2{
 	public static final int PART_OPENED = 70;
 	/** Constant <code>PART_VISIBLE=80</code> */
 	public static final int PART_VISIBLE = 80;
-	
+
 	/** Constant <code>instance</code> */
 	public static TaxeditorPartService instance = new TaxeditorPartService();
-	
+
 	private IPartService partService;
-	
+
 	private Map<Integer, Set<IPartChangeListener>> listenerMap = new HashMap<Integer, Set<IPartChangeListener>>();
-	
+
 	private TaxeditorPartService() {
 		partService = PlatformUI.getWorkbench().getActiveWorkbenchWindow().getPartService();
 		partService.addPartListener(this);
 	}
-	
+
 	/**
 	 * <p>Getter for the field <code>instance</code>.</p>
 	 *
@@ -58,7 +57,7 @@ public class TaxeditorPartService implements IPartListener2{
 	public static TaxeditorPartService getInstance(){
 		return instance;
 	}
-	
+
 	/**
 	 * <p>addListener</p>
 	 *
@@ -67,15 +66,15 @@ public class TaxeditorPartService implements IPartListener2{
 	 */
 	public void addListener(Integer eventType, IPartChangeListener listener){
 		Set<IPartChangeListener> partChangeListeners = listenerMap.get(eventType);
-		
+
 		if(partChangeListeners == null){
 			partChangeListeners = new HashSet<IPartChangeListener>();
 			listenerMap.put(eventType, partChangeListeners);
 		}
-		
+
 		partChangeListeners.add(listener);
 	}
-	
+
 	/**
 	 * <p>removeListener</p>
 	 *
@@ -84,64 +83,63 @@ public class TaxeditorPartService implements IPartListener2{
 	 */
 	public void removeListener(Integer eventType, IPartChangeListener listener){
 		Set<IPartChangeListener> partChangeListeners = listenerMap.get(eventType);
-		
+
 		if(partChangeListeners == null){
 			return;
 		}
-		
+
 		partChangeListeners.remove(listener);
 	}
-	
+
 	private void notifyListeners(Integer eventType, IWorkbenchPartReference partRef){
 		Set<IPartChangeListener> partChangeListeners = listenerMap.get(eventType);
-		
+
 		if(partChangeListeners == null){
 			return;
 		}
-		
+
 		for(IPartChangeListener listener : partChangeListeners){
 			listener.partChanged(eventType, partRef);
 		}
 	}
-	
 
-	/** {@inheritDoc} */
-	public void partActivated(IWorkbenchPartReference partRef) {
+	@Override
+    public void partActivated(IWorkbenchPartReference partRef) {
 		notifyListeners(PART_ACTIVATED, partRef);
 	}
 
-	/** {@inheritDoc} */
-	public void partBroughtToTop(IWorkbenchPartReference partRef) {
+	@Override
+    public void partBroughtToTop(IWorkbenchPartReference partRef) {
 		notifyListeners(PART_BROUGHT_TO_TOP, partRef);
 	}
 
-	/** {@inheritDoc} */
-	public void partClosed(IWorkbenchPartReference partRef) {
+	@Override
+    public void partClosed(IWorkbenchPartReference partRef) {
 		notifyListeners(PART_CLOSED, partRef);
 	}
 
-	/** {@inheritDoc} */
-	public void partDeactivated(IWorkbenchPartReference partRef) {
+	@Override
+    public void partDeactivated(IWorkbenchPartReference partRef) {
 		notifyListeners(PART_DEAVTICATED, partRef);
 	}
 
-	/** {@inheritDoc} */
-	public void partOpened(IWorkbenchPartReference partRef) {
+	@Override
+    public void partOpened(IWorkbenchPartReference partRef) {
 		notifyListeners(PART_OPENED, partRef);
 	}
 
-	/** {@inheritDoc} */
-	public void partHidden(IWorkbenchPartReference partRef) {
+	@Override
+    public void partHidden(IWorkbenchPartReference partRef) {
 		notifyListeners(PART_HIDDEN, partRef);
 	}
 
-	/** {@inheritDoc} */
-	public void partVisible(IWorkbenchPartReference partRef) {
+	@Override
+    public void partVisible(IWorkbenchPartReference partRef) {
 		notifyListeners(PART_VISIBLE, partRef);
 	}
 
-	/** {@inheritDoc} */
-	public void partInputChanged(IWorkbenchPartReference partRef) {
+	@Override
+    public void partInputChanged(IWorkbenchPartReference partRef) {
 		notifyListeners(PART_INPUT_CHANGED, partRef);
 	}
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTransfer.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTransfer.java
index 36e8b3ca3..78332335f 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTransfer.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/TaxonTransfer.java
@@ -10,19 +10,18 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  *  a drop widget with the same type.
  *
  * @author p.ciardelli
- * @version $Id: $
  */
 public class TaxonTransfer extends ByteArrayTransfer {
 
 	private static final String TAXONTYPENAME = "taxon_type";
-	private static final int TAXONTYPEID = registerType (TAXONTYPENAME);		
+	private static final int TAXONTYPEID = registerType (TAXONTYPENAME);
 	private static final TaxonTransfer INSTANCE = new TaxonTransfer();
-	
+
 	/*
 	 * The object associated with this transfer event
 	 */
 	private TaxonBase<?> taxonBase;
-		
+
 	/*
 	 * Returns the singleton
 	 */
@@ -56,23 +55,20 @@ public class TaxonTransfer extends ByteArrayTransfer {
 	public TaxonBase<?> getTaxon() {
 		return taxonBase;
 	}
-	
-	/* 
+
+	/*
 	 * The type ID is used to identify this transfer
 	 */
-	/** {@inheritDoc} */
 	@Override
 	protected int[] getTypeIds() {
 		return new int[] { TAXONTYPEID };
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected String[] getTypeNames() {
 		return new String[] { TAXONTYPENAME } ;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected void javaToNative(Object object, TransferData transferData) {
 		// No encoding needed since this is a hardcoded string read and written
@@ -82,7 +78,6 @@ public class TaxonTransfer extends ByteArrayTransfer {
 		super.javaToNative(check, transferData);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected Object nativeToJava(TransferData transferData) {
 		Object result = super.nativeToJava(transferData);
@@ -91,7 +86,7 @@ public class TaxonTransfer extends ByteArrayTransfer {
 		}
 		return taxonBase;
 	}
-	
+
 	private boolean isInvalidNativeType(Object result) {
 		// No encoding needed since this is a hardcoded string read and written
 		// in the same process.
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java
index e9b545a71..1ffcc0f3e 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/menu/MeasurementUnitMenuPreferences.java
@@ -11,19 +11,12 @@ import eu.etaxonomy.taxeditor.preference.GeneralTermPreferencePage;
  * <p>MeasurementUnitMenuPreferences class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class MeasurementUnitMenuPreferences extends GeneralTermPreferencePage {
 
-	/**
-	 * <p>Constructor for MeasurementUnitMenuPreferences.</p>
-	 */
 	public MeasurementUnitMenuPreferences() {
 	    super();
         setPredicate(PreferencePredicate.MeasurementUnit);
         type = TermType.MeasurementUnit;
 	}
-
-
-
-}
+}
\ No newline at end of file
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java
index 615bfbf49..9085278ae 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/internal/TaxeditorStorePlugin.java
@@ -9,7 +9,6 @@ import org.osgi.framework.BundleContext;
  * The activator class controls the plug-in life cycle
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class TaxeditorStorePlugin extends AbstractUIPlugin {
 
@@ -26,11 +25,6 @@ public class TaxeditorStorePlugin extends AbstractUIPlugin {
 	public TaxeditorStorePlugin() {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public void start(BundleContext context) throws Exception {
 		super.start(context);
@@ -40,11 +34,6 @@ public class TaxeditorStorePlugin extends AbstractUIPlugin {
 		//PreferencesUtil.setDefaults();
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public void stop(BundleContext context) throws Exception {
 		plugin = null;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java
index 22417a3e0..4ce080493 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/TaxonNodeSelectionDialog.java
@@ -33,7 +33,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 
 /**
  * @author p.ciardelli
- * @version $Id: $
  */
 public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelectionDialog<TaxonNode> implements SelectionListener{
 
@@ -148,7 +147,6 @@ public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelecti
 		return classificationSelection;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected String getTitle(TaxonNode taxonNode) {
 		if(taxonNode != null && taxonNode.getTaxon() != null){
@@ -171,14 +169,11 @@ public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelecti
         };
     }
 
-
-	/** {@inheritDoc} */
 	@Override
 	protected TaxonNode getPersistentObject(UUID uuid) {
 		return CdmStore.getService(ITaxonNodeService.class).find(uuid);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected void callService(String pattern) {
 	    model = CdmStore.getService(IClassificationService.class)
@@ -222,19 +217,16 @@ public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelecti
 		}
     }
 
-	/** {@inheritDoc} */
 	@Override
 	protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
 		return null;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected String[] getNewWizardText() {
 		return null;
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public void widgetSelected(SelectionEvent e) {
 		selectedClassification = classifications.get(classificationSelectionCombo.getSelectionIndex());
@@ -245,9 +237,6 @@ public class TaxonNodeSelectionDialog extends AbstractFilteredCdmResourceSelecti
 		}
 	}
 
-	/** {@inheritDoc} */
 	@Override
     public void widgetDefaultSelected(SelectionEvent e) {}
-
-
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BigDecimalWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BigDecimalWithLabelElement.java
index 5a7a4115c..883c7be13 100755
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BigDecimalWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BigDecimalWithLabelElement.java
@@ -79,8 +79,8 @@ public class BigDecimalWithLabelElement extends NumberWithLabelElement {
             return StringUtils.isBlank(text) ? null : new BigDecimal(text);
         } catch (NumberFormatException e) {
             exception = e;
+            return null;
         }
-        return null;
     }
 
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java
index 839916505..f2ed742d0 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/BrowserElement.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.ui.element;
 
@@ -18,14 +18,13 @@ import org.eclipse.ui.forms.widgets.TableWrapData;
  * <p>BrowserElement class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class BrowserElement extends AbstractCdmFormElement implements ControlListener{
 
 	private Browser browser;
-	
+
 	private String imageUriString;
-	
+
 	/**
 	 * <p>Constructor for BrowserElement.</p>
 	 *
@@ -37,67 +36,55 @@ public class BrowserElement extends AbstractCdmFormElement implements ControlLis
 	protected BrowserElement(CdmFormFactory formFactory, ICdmFormElement parentElement, URI imageUri, int style) {
 		super(formFactory, parentElement);
 		formFactory.createLabel(getLayoutComposite(), "");
-		
+
 		browser = new Browser(getLayoutComposite(), SWT.NONE);
 		addControl(browser);
-		
+
 		getLayoutComposite().setLayoutData(LayoutConstants.FILL());
-		
+
 
 		layoutBrowser();
-		
+
 		showBrowser();
 		browser.addControlListener(this);
-		
+
 		this.setImageUri(imageUri);
 	}
 
-	/**
-	 * 
-	 */
 	private void layoutBrowser() {
 		TableWrapData layoutData = LayoutConstants.FILL();
 		layoutData.heightHint = 1000;
-		
+
 		browser.setLayoutData(layoutData);
 	}
 
-	/**
-	 * 
-	 */
 	private void showBrowser() {
-		
+
 		String html = "";
 		html = "<HTML><HEAD><TITLE></TITLE></HEAD><BODY marginwidth=0 marginheight=0 leftmargin=0 topmargin=0>";
 		html += "<img width=\"" + calculateWidth() + "\" src=\"" + getImageUriString() + "\" />";
 		html += "</BODY></HTML>";
-		
+
 		browser.setText(html);
 	}
-	
+
 	/**
 	 * <p>calculateWidth</p>
 	 *
 	 * @return a int.
 	 */
-	public int calculateWidth() {	
+	public int calculateWidth() {
 		Rectangle boundaries = browser.getBounds();
 		return boundaries.width;
 	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.ControlListener#controlMoved(org.eclipse.swt.events.ControlEvent)
-	 */
-	/** {@inheritDoc} */
-	public void controlMoved(ControlEvent e) {
+
+	@Override
+    public void controlMoved(ControlEvent e) {
 		showBrowser();
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.ControlListener#controlResized(org.eclipse.swt.events.ControlEvent)
-	 */
-	/** {@inheritDoc} */
-	public void controlResized(ControlEvent e) {
+	@Override
+    public void controlResized(ControlEvent e) {
 		showBrowser();
 	}
 
@@ -109,7 +96,7 @@ public class BrowserElement extends AbstractCdmFormElement implements ControlLis
 	public void setImageUri(URI imageUri) {
 		setImageUriString(imageUri != null ? imageUri.toString() : "");
 	}
-	
+
 	/**
 	 * <p>Setter for the field <code>imageUriString</code>.</p>
 	 *
@@ -128,5 +115,4 @@ public class BrowserElement extends AbstractCdmFormElement implements ControlLis
 	public String getImageUriString() {
 		return imageUriString;
 	}
-
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ICdmFormElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ICdmFormElement.java
index 096047585..e67ffbd69 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ICdmFormElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/ICdmFormElement.java
@@ -14,7 +14,6 @@ import org.eclipse.swt.widgets.Control;
  * <p>ICdmFormElement interface.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public interface ICdmFormElement extends IPropertyChangeEmitter, IPropertyChangeListener {
 
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IPropertyChangeEmitter.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IPropertyChangeEmitter.java
index bc033c48e..09609f3bb 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IPropertyChangeEmitter.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IPropertyChangeEmitter.java
@@ -1,15 +1,12 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.ui.element;
 
-
-
 /**
  * <p>IPropertyChangeEmitter interface.</p>
  *
  * @author nho
- * @version $Id: $
  */
 public interface IPropertyChangeEmitter {
 	/**
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/KeyValueViewerElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/KeyValueViewerElement.java
index 5554d73ef..51080a564 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/KeyValueViewerElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/KeyValueViewerElement.java
@@ -22,7 +22,6 @@ import org.eclipse.ui.forms.widgets.TableWrapData;
  * <p>KeyValueViewerElement class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class KeyValueViewerElement extends AbstractCdmFormElement {
 
@@ -42,31 +41,31 @@ public class KeyValueViewerElement extends AbstractCdmFormElement {
 	public KeyValueViewerElement(CdmFormFactory formFactory,
 			ICdmFormElement formElement, String keyHeading, String valueHeading, Map<Object, Object> map) {
 		super(formFactory, formElement);
-		
+
 		label = formFactory.createLabel(getLayoutComposite(), "Meta Data");
 		label.setLayoutData(LayoutConstants.FILL(2, 1));
 		addControl(label);
-		
+
 		tableViewer = new TableViewer(formElement.getLayoutComposite(), SWT.MULTI | SWT.H_SCROLL
 				| SWT.V_SCROLL | SWT.FULL_SELECTION);
 		addControl(tableViewer.getControl());
-		
+
 		createColumns(tableViewer, keyHeading, valueHeading);
-		
+
 		TableWrapData layoutData = LayoutConstants.FILL(2, 1);
 		layoutData.heightHint = 100;
-		
+
 		tableViewer.getControl().setLayoutData(layoutData);
-		
+
 		tableViewer.setContentProvider(new KeyValueContentProvider());
 		tableViewer.setLabelProvider(new KeyValueLabelProvider());
-		
+
 		if(map != null){
 			setInput(map);
 		}
-		
+
 	}
-	
+
 	// This will create the columns for the table
 	private void createColumns(TableViewer viewer, String keyHeading, String valueHeading) {
 		Table table = viewer.getTable();
@@ -94,33 +93,38 @@ public class KeyValueViewerElement extends AbstractCdmFormElement {
 		tableViewer.setInput(map);
 		tableViewer.refresh();
 	}
-	
+
 	private class KeyValueContentProvider implements IStructuredContentProvider{
 
-		public Object[] getElements(Object inputElement) {
+		@Override
+        public Object[] getElements(Object inputElement) {
 			if(inputElement instanceof Map){
 				return ((Map) inputElement).entrySet().toArray();
 			}
 			return null;
 		}
 
-		public void dispose() {}
+		@Override
+        public void dispose() {}
+
+		@Override
+        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
 
-		public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {}
-		
 	}
-	
+
 	private class KeyValueLabelProvider extends LabelProvider implements ITableLabelProvider{
 
-		public Image getColumnImage(Object element, int columnIndex) {
+		@Override
+        public Image getColumnImage(Object element, int columnIndex) {
 			return null;
 		}
 
-		public String getColumnText(Object element, int columnIndex) {
+		@Override
+        public String getColumnText(Object element, int columnIndex) {
 			if(element instanceof Entry){
-			
-				Entry entry = (Entry) element;
-				
+
+				Entry<?,?> entry = (Entry<?,?>) element;
+
 				switch(columnIndex){
 				case 0:
 					return entry.getKey().toString();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RichTextWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RichTextWithLabelElement.java
index ecad572c1..9e0ed2877 100755
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RichTextWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RichTextWithLabelElement.java
@@ -3,45 +3,23 @@
  */
 package eu.etaxonomy.taxeditor.ui.element;
 
-import java.awt.Point;
-
-import org.eclipse.jface.dialogs.MessageDialog;
 import org.eclipse.jface.layout.GridDataFactory;
-import org.eclipse.jface.viewers.CellEditor.LayoutData;
 //import org.eclipse.nebula.widgets.richtext.RichTextEditor;
 //import org.eclipse.nebula.widgets.richtext.RichTextEditorConfiguration;
 //import org.eclipse.nebula.widgets.richtext.toolbar.ToolbarButton;
 //import org.eclipse.nebula.widgets.richtext.toolbar.ToolbarConfiguration;
 import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.KeyAdapter;
-import org.eclipse.swt.events.KeyEvent;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.layout.RowLayout;
-import org.eclipse.swt.widgets.Button;
 import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Listener;
 import org.eclipse.swt.widgets.Text;
-import org.eclipse.ui.forms.widgets.TableWrapData;
-import org.eclipse.ui.forms.widgets.TableWrapLayout;
-
-import eu.etaxonomy.cdm.common.CdmUtils;
-import eu.etaxonomy.taxeditor.preference.Resources;
 
 /**
  * @author n.hoffmann
- * @version $Id: $
  */
 public class RichTextWithLabelElement{ //extends AbstractCdmFormElement implements ModifyListener, IEnableableFormElement,
    //     ISelectable {
 
-    
     //protected RichTextEditor richtextEditor;
     private Label label;
     private boolean buttonVisible = true;
@@ -86,12 +64,12 @@ public class RichTextWithLabelElement{ //extends AbstractCdmFormElement implemen
             boolean isMultiLine, int style, Composite layoutComposite) {
     	layoutComposite.setLayout(new GridLayout(1, true));
 
-		
+
 //		ToolbarConfiguration toolBarConfig = new ToolbarConfiguration();
-//		
+//
 //		RichTextEditorConfiguration config = new RichTextEditorConfiguration();
 //		config.setMinSize(800, 600);
-//		
+//
 //		final RichTextEditor editor = new RichTextEditor(layoutComposite, config);
 //		GridDataFactory.fillDefaults().grab(true, true).applyTo(editor);
 //		//editor.setText(initialText);
@@ -101,9 +79,9 @@ public class RichTextWithLabelElement{ //extends AbstractCdmFormElement implemen
 				SWT.MULTI | SWT.BORDER | SWT.WRAP | SWT.V_SCROLL | SWT.READ_ONLY);
 		GridDataFactory.fillDefaults().grab(true, false).hint(SWT.DEFAULT, 100).applyTo(htmlOutput);
 		htmlOutput.setEditable(true);
-		
-		
-		
+
+
+
 //		editor.addModifyListener(new ModifyListener() {
 //
 //			@Override
@@ -119,7 +97,7 @@ public class RichTextWithLabelElement{ //extends AbstractCdmFormElement implemen
 //			public void keyPressed(KeyEvent e) {
 //				org.eclipse.swt.graphics.Point point = htmlOutput.getSelection();
 //				htmlOutput.setText(htmlOutput.getText() + " - " + point.x + ":"+point.y);
-//			
+//
 //			}
 //		});
 
@@ -133,23 +111,23 @@ public class RichTextWithLabelElement{ //extends AbstractCdmFormElement implemen
 //		});
 
 		// add additional controls for showing interactions
-	
-//    	  createControlPanel(layoutComposite, editor, textHeight); 
-        	 
+
+//    	  createControlPanel(layoutComposite, editor, textHeight);
+
     }
-    
-//    protected void createControlPanel(Composite parent, final RichTextEditor editor, int textHeight) { 
-//    	  Composite controlPanel = new Composite(parent, SWT.NONE); 
+
+//    protected void createControlPanel(Composite parent, final RichTextEditor editor, int textHeight) {
+//    	  Composite controlPanel = new Composite(parent, SWT.NONE);
 //    	  TableWrapLayout layout;
 //    	  layout = LayoutConstants.LAYOUT(3, false);
-//    	  controlPanel.setLayout(layout); 
-//    	  GridDataFactory.fillDefaults().grab(true, false).applyTo(controlPanel); 
-//    	 
-//    	  Label inputLabel = new Label(controlPanel, SWT.NONE); 
-//    	  inputLabel.setText("Text to set:"); 
-//    //	  GridDataFactory.fillDefaults().applyTo(inputLabel); 
-//    	 
-//    	  Text input = new Text(controlPanel, SWT.BORDER); 
+//    	  controlPanel.setLayout(layout);
+//    	  GridDataFactory.fillDefaults().grab(true, false).applyTo(controlPanel);
+//
+//    	  Label inputLabel = new Label(controlPanel, SWT.NONE);
+//    	  inputLabel.setText("Text to set:");
+//    //	  GridDataFactory.fillDefaults().applyTo(inputLabel);
+//
+//    	  Text input = new Text(controlPanel, SWT.BORDER);
 //    	  TableWrapData layoutData;
 //    	  if(isMultiLine){
 //              layoutData = LayoutConstants.FILL_HORIZONTALLY(2, 1);
@@ -158,94 +136,94 @@ public class RichTextWithLabelElement{ //extends AbstractCdmFormElement implemen
 //              layoutData = LayoutConstants.FILL();
 //          }
 //    	  input.setLayoutData(layoutData);
-//    //	  GridDataFactory.fillDefaults().grab(true, false).applyTo(input); 
-//    	 
-//    	  input.addKeyListener(new KeyAdapter() { 
-//    	   @Override 
-//    	   public void keyPressed(KeyEvent e) { 
-//    	    if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) { 
-//    	     editor.setText(input.getText()); 
-//    	    } 
-//    	   } 
-//    	  }); 
-//    	 
-//    	  Button setButton = new Button(controlPanel, SWT.PUSH); 
-//    	  setButton.setText("Set Text"); 
-//    	//  GridDataFactory.defaultsFor(setButton).applyTo(setButton); 
-//    	 
-//    	  setButton.addSelectionListener(new SelectionAdapter() { 
-//    	   @Override 
-//    	   public void widgetSelected(SelectionEvent e) { 
-//    	    editor.setText(input.getText()); 
-//    	   } 
-//    	  }); 
-//    	 
-//    	  Composite buttonPanel = new Composite(controlPanel, SWT.NONE); 
-//    	  buttonPanel.setLayout(new RowLayout()); 
-//    	 // GridDataFactory.fillDefaults().grab(true, false).span(3, 1).applyTo(buttonPanel); 
-//    	 
-//    	  Button getButton = new Button(buttonPanel, SWT.PUSH); 
-//    	  getButton.setText("Get text"); 
-//    	  getButton.addSelectionListener(new SelectionAdapter() { 
-//    	   @Override 
-//    	   public void widgetSelected(SelectionEvent e) { 
-//    	    MessageDialog.openInformation(null, "Editor Input", 
-//    	      editor.getText()); 
-//    	   } 
-//    	  }); 
-//    	 
-//    	  final Button enableButton = new Button(buttonPanel, SWT.PUSH); 
-//    	  enableButton.setText("Disable"); 
-//    	  enableButton.addSelectionListener(new SelectionAdapter() { 
-//    	   @Override 
-//    	   public void widgetSelected(SelectionEvent e) { 
-//    	    boolean editable = editor.isEditable(); 
-//    	    editor.setEditable(!editable); 
-//    	 
-//    	    enableButton.setText(editable ? "Enable" : "Disable"); 
-//    	   } 
-//    	  }); 
-//    	 
-//    	  final Button updateButton = new Button(buttonPanel, SWT.PUSH); 
-//    	  updateButton.setText("Update Toolbar"); 
-//    	 
-//    	  final ToolbarButton button = new ToolbarButton("javaButton", 
-//    	    "myJavaCommand", "Execute Java", "other", 
-//    	    null) { 
-//    	 
-//    	   @Override 
-//    	   public Object execute() { 
-//    	    MessageDialog.openInformation(null, "Information", 
-//    	      "Java callback: " + editor.getSelectedHTML()); 
-//    	 
-//    	    editor.insertHTML("<em>" + editor.getSelectedHTML() + "</em>"); 
-//    	    return null; 
-//    	   } 
-//    	  }; 
-//    	 
-//    	  updateButton.addSelectionListener(new SelectionAdapter() { 
-//    	   @Override 
-//    	   public void widgetSelected(SelectionEvent e) { 
-//    	    if (!buttonVisible) { 
-//    	     editor.addToolbarButton(button); 
-//    	    } else { 
-//    	     editor.removeToolbarButton(button); 
-//    	    } 
-//    	    buttonVisible = !buttonVisible; 
-//    	    editor.updateToolbar(); 
-//    	   } 
-//    	  }); 
-//    	 
-//    	  Button setFocusButton = new Button(buttonPanel, SWT.PUSH); 
-//    	  setFocusButton.setText("Set Focus"); 
-//    	  setFocusButton.addSelectionListener(new SelectionAdapter() { 
-//    	   @Override 
-//    	   public void widgetSelected(SelectionEvent e) { 
-//    	    editor.setFocus(); 
-//    	   } 
-//    	  }); 
-//    	 
-//    	 } 
+//    //	  GridDataFactory.fillDefaults().grab(true, false).applyTo(input);
+//
+//    	  input.addKeyListener(new KeyAdapter() {
+//    	   @Override
+//    	   public void keyPressed(KeyEvent e) {
+//    	    if (e.keyCode == SWT.CR || e.keyCode == SWT.KEYPAD_CR) {
+//    	     editor.setText(input.getText());
+//    	    }
+//    	   }
+//    	  });
+//
+//    	  Button setButton = new Button(controlPanel, SWT.PUSH);
+//    	  setButton.setText("Set Text");
+//    	//  GridDataFactory.defaultsFor(setButton).applyTo(setButton);
+//
+//    	  setButton.addSelectionListener(new SelectionAdapter() {
+//    	   @Override
+//    	   public void widgetSelected(SelectionEvent e) {
+//    	    editor.setText(input.getText());
+//    	   }
+//    	  });
+//
+//    	  Composite buttonPanel = new Composite(controlPanel, SWT.NONE);
+//    	  buttonPanel.setLayout(new RowLayout());
+//    	 // GridDataFactory.fillDefaults().grab(true, false).span(3, 1).applyTo(buttonPanel);
+//
+//    	  Button getButton = new Button(buttonPanel, SWT.PUSH);
+//    	  getButton.setText("Get text");
+//    	  getButton.addSelectionListener(new SelectionAdapter() {
+//    	   @Override
+//    	   public void widgetSelected(SelectionEvent e) {
+//    	    MessageDialog.openInformation(null, "Editor Input",
+//    	      editor.getText());
+//    	   }
+//    	  });
+//
+//    	  final Button enableButton = new Button(buttonPanel, SWT.PUSH);
+//    	  enableButton.setText("Disable");
+//    	  enableButton.addSelectionListener(new SelectionAdapter() {
+//    	   @Override
+//    	   public void widgetSelected(SelectionEvent e) {
+//    	    boolean editable = editor.isEditable();
+//    	    editor.setEditable(!editable);
+//
+//    	    enableButton.setText(editable ? "Enable" : "Disable");
+//    	   }
+//    	  });
+//
+//    	  final Button updateButton = new Button(buttonPanel, SWT.PUSH);
+//    	  updateButton.setText("Update Toolbar");
+//
+//    	  final ToolbarButton button = new ToolbarButton("javaButton",
+//    	    "myJavaCommand", "Execute Java", "other",
+//    	    null) {
+//
+//    	   @Override
+//    	   public Object execute() {
+//    	    MessageDialog.openInformation(null, "Information",
+//    	      "Java callback: " + editor.getSelectedHTML());
+//
+//    	    editor.insertHTML("<em>" + editor.getSelectedHTML() + "</em>");
+//    	    return null;
+//    	   }
+//    	  };
+//
+//    	  updateButton.addSelectionListener(new SelectionAdapter() {
+//    	   @Override
+//    	   public void widgetSelected(SelectionEvent e) {
+//    	    if (!buttonVisible) {
+//    	     editor.addToolbarButton(button);
+//    	    } else {
+//    	     editor.removeToolbarButton(button);
+//    	    }
+//    	    buttonVisible = !buttonVisible;
+//    	    editor.updateToolbar();
+//    	   }
+//    	  });
+//
+//    	  Button setFocusButton = new Button(buttonPanel, SWT.PUSH);
+//    	  setFocusButton.setText("Set Focus");
+//    	  setFocusButton.addSelectionListener(new SelectionAdapter() {
+//    	   @Override
+//    	   public void widgetSelected(SelectionEvent e) {
+//    	    editor.setFocus();
+//    	   }
+//    	  });
+//
+//    	 }
 //
 //    protected void initLabel(CdmFormFactory formFactory, String labelString, boolean isMultiLine, Composite layoutComposite) {
 //        if (labelString != null) {
@@ -262,8 +240,8 @@ public class RichTextWithLabelElement{ //extends AbstractCdmFormElement implemen
 //        }
 //    }
 //
-//   
-//    
+//
+//
 //
 //    /** {@inheritDoc} */
 //    @Override
@@ -281,13 +259,13 @@ public class RichTextWithLabelElement{ //extends AbstractCdmFormElement implemen
 //	@Override
 //	public void setIrrelevant(boolean irrelevant) {
 //		// TODO Auto-generated method stub
-//		
+//
 //	}
 //
 //	@Override
 //	public void setEnabled(boolean enabled) {
 //		// TODO Auto-generated method stub
-//		
+//
 //	}
 //
 //	@Override
@@ -299,8 +277,8 @@ public class RichTextWithLabelElement{ //extends AbstractCdmFormElement implemen
 //	@Override
 //	public void modifyText(ModifyEvent e) {
 //		// TODO Auto-generated method stub
-//		
+//
 //	}
 
-   
+
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextActionElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextActionElement.java
index aadf8713e..300ef1546 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextActionElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextActionElement.java
@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package eu.etaxonomy.taxeditor.ui.element;
 
@@ -19,7 +19,6 @@ import eu.etaxonomy.cdm.common.CdmUtils;
  * <p>TextActionElement class.</p>
  *
  * @author nho
- * @version $Id: $
  */
 public class TextActionElement extends AbstractCdmFormElement implements ModifyListener, ISelectable{
 
@@ -40,21 +39,21 @@ public class TextActionElement extends AbstractCdmFormElement implements ModifyL
 	 */
 	protected TextActionElement(CdmFormFactory toolkit, ICdmFormElement parentElement, String labelString, String buttonLabel, String initialText, int style) {
 		super(toolkit, parentElement);
-		
+
 		label = toolkit.createLabel(getLayoutComposite(), labelString, SWT.WRAP);
 		addControl(label);
-		
+
 		box = formFactory.createComposite(getLayoutComposite());
 		box.setLayout(LayoutConstants.LAYOUT(2, false));
 		box.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
 		addControl(box);
-		
+
 		text = toolkit.createText(box, "", style);
 		addControl(text);
 		text.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
-		
+
 		setText(CdmUtils.Nz(initialText));
-		
+
 		button = toolkit.createButton(box, buttonLabel, SWT.PUSH);
 		addControl(button);
 	}
@@ -95,14 +94,11 @@ public class TextActionElement extends AbstractCdmFormElement implements ModifyL
 		button.removeSelectionListener(listener);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events.ModifyEvent)
-	 */
-	/** {@inheritDoc} */
-	public void modifyText(ModifyEvent e) {
+	@Override
+    public void modifyText(ModifyEvent e) {
 		propertyChange(null);
 	}
-	
+
 	/**
 	 * <p>addModifyListener</p>
 	 *
@@ -111,7 +107,7 @@ public class TextActionElement extends AbstractCdmFormElement implements ModifyL
 	public void addModifyListener(ModifyListener listener){
 		text.addModifyListener(listener);
 	}
-	
+
 	/**
 	 * <p>removeModifyListener</p>
 	 *
@@ -120,13 +116,12 @@ public class TextActionElement extends AbstractCdmFormElement implements ModifyL
 	public void removeModifyListener(ModifyListener listener){
 		text.removeModifyListener(listener);
 	}
-	
-	/** {@inheritDoc} */
+
 	@Override
 	public void setBackground(Color color) {
 		label.setBackground(color);
 	}
-	
+
 	@Override
 	public void setSelected(boolean selected) {
 		setBackground(selected ? SELECTED : getPersistentBackground());
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
index 6ddbe9f9e..ffaeb6126 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/TextWithLabelElement.java
@@ -21,7 +21,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
 
 /**
  * @author n.hoffmann
- * @version $Id: $
  */
 public class TextWithLabelElement extends AbstractCdmFormElement implements ModifyListener, IEnableableFormElement,
         ISelectable {
@@ -158,7 +157,6 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
         StoreUtil.setTextWithoutModifyListeners(text, string);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void modifyText(ModifyEvent e) {
         if(e.widget==text && !isMultiLine){
@@ -180,7 +178,6 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
         firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e));
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setEnabled(boolean enabled) {
         text.setEnabled(enabled);
@@ -193,7 +190,6 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
         return text.isEnabled();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setIrrelevant(boolean irrelevant) {
         String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
@@ -202,7 +198,6 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
         text.setBackground(color);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setBackground(Color color) {
         if (label != null) {
@@ -215,7 +210,6 @@ public class TextWithLabelElement extends AbstractCdmFormElement implements Modi
         setBackground(selected ? SELECTED : getPersistentBackground());
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setFocus() {
         text.setFocus();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementController.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementController.java
index 9c31ae1a4..91413df91 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementController.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementController.java
@@ -28,7 +28,6 @@ import eu.etaxonomy.taxeditor.ui.mvc.interfaces.CdmCompositeController;
  * </p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class TextWithLabelElementController extends AbstractCdmFormElement implements ModifyListener, IEnableableFormElement,
         ISelectable, CdmCompositeController {
@@ -119,20 +118,11 @@ public class TextWithLabelElementController extends AbstractCdmFormElement imple
         StoreUtil.setTextWithoutModifyListeners(text, string);
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see
-     * org.eclipse.swt.events.ModifyListener#modifyText(org.eclipse.swt.events
-     * .ModifyEvent)
-     */
-    /** {@inheritDoc} */
     @Override
     public void modifyText(ModifyEvent e) {
         firePropertyChangeEvent(new CdmPropertyChangeEvent(this, e));
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setEnabled(boolean enabled) {
         text.setEnabled(enabled);
@@ -140,15 +130,11 @@ public class TextWithLabelElementController extends AbstractCdmFormElement imple
         text.setForeground(getColor(symbolicName));
     }
 
-    /* (non-Javadoc)
-     * @see eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement#isEnabled()
-     */
     @Override
     public boolean isEnabled() {
         return text.isEnabled();
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setIrrelevant(boolean irrelevant) {
         String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT : Resources.COLOR_COMPOSITE_BACKGROUND;
@@ -157,7 +143,6 @@ public class TextWithLabelElementController extends AbstractCdmFormElement imple
         text.setBackground(color);
     }
 
-    /** {@inheritDoc} */
     @Override
     public void setBackground(Color color) {
 //        if (label != null) {
@@ -170,12 +155,6 @@ public class TextWithLabelElementController extends AbstractCdmFormElement imple
         setBackground(selected ? SELECTED : getPersistentBackground());
     }
 
-    /*
-     * (non-Javadoc)
-     *
-     * @see eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement#setFocus()
-     */
-    /** {@inheritDoc} */
     @Override
     public void setFocus() {
         text.setFocus();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
index 7ea27db1e..c784cb5be 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
@@ -54,9 +54,7 @@ import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
  * @param <ELEMENT> An element that can be added (multiple times) to this entity.
  *
  * @author n.hoffmann
- * @version $Id: $
  */
-
 public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT> extends AbstractFormSection<ENTITY> implements IExpansionListener, Observer {
 
     private static final EnumSet<CRUD> UPDATE = EnumSet.of(CRUD.UPDATE);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ITaxonBaseDetailSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ITaxonBaseDetailSection.java
index f8436d5bf..8ccac28ac 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ITaxonBaseDetailSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ITaxonBaseDetailSection.java
@@ -6,7 +6,6 @@ import eu.etaxonomy.cdm.model.taxon.TaxonBase;
  * <p>ITaxonDetailSection interface.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public interface ITaxonBaseDetailSection{
 
@@ -17,9 +16,5 @@ public interface ITaxonBaseDetailSection{
 	 */
 	public abstract void setTaxonBase(TaxonBase taxon);
 
-	/**
-	 * 
-	 * @return
-	 */
 	public abstract TaxonBase getTaxonBase();
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
index 17bbd3964..2f46a6a7b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/StatisticalMeasurementValueElement.java
@@ -32,7 +32,6 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
  *
  * @author n.hoffmann
  * @created Sep 15, 2010
- * @version 1.0
  */
 public class StatisticalMeasurementValueElement extends
 		AbstractEntityCollectionElement<StatisticalMeasurementValue> {
@@ -56,7 +55,6 @@ public class StatisticalMeasurementValueElement extends
 		super(formFactory, section, entity, removeListener, null, style);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void setEntity(StatisticalMeasurementValue entity) {
 		this.entity = entity;
@@ -67,7 +65,6 @@ public class StatisticalMeasurementValueElement extends
 		section_modifiers.setEntity(entity);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void createControls(ICdmFormElement element, int style) {
 		number_value = formFactory.createBigDecimalTextWithLabelElement(element, "Value", 0, style);
@@ -76,7 +73,6 @@ public class StatisticalMeasurementValueElement extends
 		section_modifiers.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void handleEvent(Object eventSource) {
 		if(eventSource == number_value){
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
index c01d79a02..e348c51d1 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/CategoricalDataDetailElement.java
@@ -15,7 +15,6 @@ import eu.etaxonomy.taxeditor.ui.section.description.StateDataSection;
  * <p>CategoricalDataDetailElement class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class CategoricalDataDetailElement extends AbstractDetailedDescriptionDetailElement<CategoricalData> {
 
@@ -35,7 +34,6 @@ public class CategoricalDataDetailElement extends AbstractDetailedDescriptionDet
 		super(formFactory, formElement, entity, style);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected void createControls(ICdmFormElement formElement,
 			CategoricalData entity, int style) {
@@ -52,10 +50,6 @@ public class CategoricalDataDetailElement extends AbstractDetailedDescriptionDet
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.section.AbstractCdmDetailElement#handleEvent(java.lang.Object)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public void handleEvent(Object eventSource) {
 	    super.handleEvent(eventSource);
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
index 6430a94f8..98de82f34 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/detail/QuantitativeDataDetailElement.java
@@ -19,7 +19,6 @@ import eu.etaxonomy.taxeditor.ui.section.description.StatisticalMeasurementValue
  * <p>QuantitativeDataDetailElement class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class QuantitativeDataDetailElement extends
 		AbstractDetailedDescriptionDetailElement<QuantitativeData> {
@@ -40,7 +39,6 @@ public class QuantitativeDataDetailElement extends
 		super(formFactory, formElement, entity, style);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected void createControls(ICdmFormElement formElement,
 			QuantitativeData entity, int style) {
@@ -57,7 +55,6 @@ public class QuantitativeDataDetailElement extends
         }
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void handleEvent(Object eventSource) {
 		if(eventSource == comboMeasurementUnit){
@@ -67,5 +64,4 @@ public class QuantitativeDataDetailElement extends
 			// FIXME
 		}
 	}
-
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java
index 9c6a09902..b9aa72f3d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/description/operation/ChangeDescriptionElementType.java
@@ -37,7 +37,6 @@ import eu.etaxonomy.taxeditor.view.e4.details.DetailsPartE4;
  *
  * @author e.-m.lee
  * @date 25.05.2010
- * @version $Id: $
  */
 public class ChangeDescriptionElementType extends AbstractPostTaxonOperation {
 
@@ -62,14 +61,10 @@ public class ChangeDescriptionElementType extends AbstractPostTaxonOperation {
 		}
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus execute(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
-		DescriptionBase inDescription = sourceElement.getInDescription();
+		DescriptionBase<?> inDescription = sourceElement.getInDescription();
 		Feature feature = sourceElement.getFeature();
 
 		if(sourceElement instanceof TextData){
@@ -111,20 +106,12 @@ public class ChangeDescriptionElementType extends AbstractPostTaxonOperation {
 		return postExecute(destinationElement);
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus redo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
 		return null;
 	}
 
-	/* (non-Javadoc)
-	 * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public IStatus undo(IProgressMonitor monitor, IAdaptable info)
 			throws ExecutionException {
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationPartSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationPartSection.java
index 4cda88d81..0905bf963 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationPartSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaRepresentationPartSection.java
@@ -20,7 +20,6 @@ import eu.etaxonomy.taxeditor.ui.section.DefaultCdmBaseComparator;
  * <p>MediaRepresentationPartSection class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class MediaRepresentationPartSection extends
 		AbstractEntityCollectionSection<MediaRepresentation, MediaRepresentationPart> {
@@ -39,20 +38,16 @@ public class MediaRepresentationPartSection extends
 		formFactory.addPropertyChangeListener(this);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void addElement(MediaRepresentationPart element) {
 		getEntity().addRepresentationPart(element);
 	}
-
-	/** {@inheritDoc} */
 	@Override
 	public MediaRepresentationPart createNewElement() {
 		// FIXME we are supporting image only at the moment
 		return ImageFile.NewInstance(null, null);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public Collection<MediaRepresentationPart> getCollection(
 			MediaRepresentation entity) {
@@ -64,19 +59,16 @@ public class MediaRepresentationPartSection extends
         return new DefaultCdmBaseComparator<>();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public String getEmptyString() {
 		return "No media representation parts yet.";
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected String getTooltipString() {
 		return "Create new media representation part.";
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void removeElement(MediaRepresentationPart element) {
 		getEntity().removeRepresentationPart(element);
@@ -94,17 +86,11 @@ public class MediaRepresentationPartSection extends
 		}
 	}
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public MediaRepresentationPart addExisting() {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean allowAddExisting() {
         return false;
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaSection.java
index 227b12808..182a6dd9d 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/media/MediaSection.java
@@ -19,7 +19,6 @@ import eu.etaxonomy.taxeditor.ui.section.DefaultCdmBaseComparator;
  * <p>MediaSection class.</p>
  *
  * @author nho
- * @version $Id: $
  */
 public class MediaSection extends AbstractEntityCollectionSection<IdentifiableMediaEntity, Media>{
 
@@ -35,13 +34,11 @@ public class MediaSection extends AbstractEntityCollectionSection<IdentifiableMe
 		super(cdmFormFactory, conversation, parentElement, "Media", style);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public Media createNewElement() {
 		return Media.NewInstance();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public Collection<Media> getCollection(IdentifiableMediaEntity entity) {
 		return entity.getMedia();
@@ -52,46 +49,33 @@ public class MediaSection extends AbstractEntityCollectionSection<IdentifiableMe
         return new DefaultCdmBaseComparator<>();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public String getEmptyString() {
 		return "No media yet.";
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected String getTooltipString() {
 		return "Create new media";
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void addElement(Media element) {
 		getEntity().addMedia(element);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void removeElement(Media element) {
 		getEntity().removeMedia(element);
 	}
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Media addExisting() {
-        return MediaSelectionDialog.select(getShell(), //getConversationHolder(),
-                null);
+        return MediaSelectionDialog.select(getShell(), null);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean allowAddExisting() {
         return true;
     }
-
-
 }
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java
index ec8caf6af..3a29ac01b 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AnnotationElement.java
@@ -19,7 +19,6 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractEntityCollectionElement;
  * <p>AnnotationElement class.</p>
  *
  * @author nho
- * @version $Id: $
  */
 public class AnnotationElement extends AbstractEntityCollectionElement<Annotation>{
 
@@ -39,10 +38,6 @@ public class AnnotationElement extends AbstractEntityCollectionElement<Annotatio
 		super(cdmFormFactory, formElement, annotation, removeListener, null, style);
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.forms.entitysections.AbstractEntitySetComposite#createControls(org.eclipse.swt.widgets.Composite)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public void createControls(ICdmFormElement element, int style) {
 		combo_annotationType = formFactory.createDefinedTermComboElement(TermType.AnnotationType, this, "Annotation Type", null, style);
@@ -50,10 +45,6 @@ public class AnnotationElement extends AbstractEntityCollectionElement<Annotatio
 		text = formFactory.createMultiLineTextWithLabel(this, "Annotation", 100, style);
 	}
 
-	/* (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.forms.entitysections.AbstractEntitySetComposite#setEntity(eu.etaxonomy.cdm.model.common.AnnotatableEntity)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public void setEntity(Annotation entity) {
 		this.entity = entity;
@@ -61,11 +52,6 @@ public class AnnotationElement extends AbstractEntityCollectionElement<Annotatio
 		text.setText(entity.getText());
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see eu.etaxonomy.taxeditor.section.AbstractEntityCollectionElement#handleEvent(java.lang.Object)
-	 */
-	/** {@inheritDoc} */
 	@Override
 	public void handleEvent(Object eventSource) {
 		if(eventSource == combo_annotationType){
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionSection.java
index 4ac9797f8..efeab0c16 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/ExtensionSection.java
@@ -18,7 +18,6 @@ import eu.etaxonomy.taxeditor.ui.section.DefaultCdmBaseComparator;
  * <p>ExtensionSection class.</p>
  *
  * @author nho
- * @version $Id: $
  */
 public class ExtensionSection extends AbstractEntityCollectionSection<IdentifiableEntity, Extension> {
 
@@ -34,13 +33,11 @@ public class ExtensionSection extends AbstractEntityCollectionSection<Identifiab
 		super(cdmFormFactory, conversation,parentElement, "Extensions", style);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public Extension createNewElement() {
 		return Extension.NewInstance();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public Collection<Extension> getCollection(IdentifiableEntity entity) {
 		return entity.getExtensions();
@@ -51,44 +48,32 @@ public class ExtensionSection extends AbstractEntityCollectionSection<Identifiab
         return new DefaultCdmBaseComparator<>();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public String getEmptyString() {
 		return "No extensions yet.";
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected String getTooltipString() {
 		return "Create a new extension";
 	}
 
-
-	/** {@inheritDoc} */
 	@Override
 	public void addElement(Extension element) {
 		getEntity().addExtension(element);
 	}
 
-
-	/** {@inheritDoc} */
 	@Override
 	public void removeElement(Extension element) {
 		getEntity().removeExtension(element);
 	}
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Extension addExisting() {
         // TODO Auto-generated method stub
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean allowAddExisting() {
         // TODO Auto-generated method stub
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java
index 3cc294202..52d1570fa 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/HeadlineSection.java
@@ -16,7 +16,6 @@ import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
  * <p>HeadlineSection class.</p>
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class HeadlineSection extends AbstractFormSection<ICdmBase> {
 
@@ -32,14 +31,13 @@ public class HeadlineSection extends AbstractFormSection<ICdmBase> {
 		super(cdmFormFactory, parentElement, style);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void setEntity(ICdmBase cdmBase) {
 		ICdmBase entity = HibernateProxyHelper.deproxy(cdmBase);
 		super.setEntity(entity);
 
 		String simpleName = entity.getClass().getSimpleName();
-        String titleString = entity instanceof IdentifiableEntity ? ": " + ((IdentifiableEntity) entity).generateTitle() : "";
+        String titleString = entity instanceof IdentifiableEntity ? ": " + ((IdentifiableEntity<?>) entity).generateTitle() : "";
         titleString = StoreUtil.cleanTitleString(titleString);
         setText(simpleName + titleString);
 		layout();
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java
index 09a3b8bf9..13837b269 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/MarkerSection.java
@@ -15,7 +15,6 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AbstractUnboundEntityCol
  * <p>MarkerSection class.</p>
  *
  * @author nho
- * @version $Id: $
  */
 public class MarkerSection extends AbstractUnboundEntityCollectionSection<AnnotatableEntity, Marker> {
 
@@ -31,7 +30,6 @@ public class MarkerSection extends AbstractUnboundEntityCollectionSection<Annota
 		super(cdmFormFactory, conversation, parentElement, "Marker", style);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public Marker createNewElement() {
 		Marker marker = Marker.NewInstance();
@@ -39,25 +37,21 @@ public class MarkerSection extends AbstractUnboundEntityCollectionSection<Annota
         return marker;
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public String getEmptyString() {
 		return "No markers yet.";
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected String getTooltipString() {
 		return "Create a new marker";
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void addElement(Marker element) {
 		getEntity().addMarker(element);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void removeElement(Marker element) {
 		getEntity().removeMarker(element);
@@ -73,18 +67,12 @@ public class MarkerSection extends AbstractUnboundEntityCollectionSection<Annota
         return new DefaultCdmBaseComparator<>();
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Marker addExisting() {
         // TODO Auto-generated method stub
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean allowAddExisting() {
         // TODO Auto-generated method stub
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java
index 40fefb69a..2900ec370 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/RightsSection.java
@@ -19,7 +19,6 @@ import eu.etaxonomy.taxeditor.ui.section.DefaultCdmBaseComparator;
  * <p>RightsSection class.</p>
  *
  * @author nho
- * @version $Id: $
  */
 public class RightsSection extends AbstractEntityCollectionSection<IdentifiableEntity, Rights> {
 
@@ -35,13 +34,11 @@ public class RightsSection extends AbstractEntityCollectionSection<IdentifiableE
 		super(cdmFormFactory, conversation, parentElement, "Rights", style);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public Rights createNewElement() {
 		return Rights.NewInstance();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public Collection<Rights> getCollection(IdentifiableEntity entity) {
 		return entity.getRights();
@@ -52,49 +49,34 @@ public class RightsSection extends AbstractEntityCollectionSection<IdentifiableE
         return new DefaultCdmBaseComparator<>();
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public String getEmptyString() {
 		return "No rights yet.";
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	protected String getTooltipString() {
 		// TODO Auto-generated method stub
 		return "Create new rights.";
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void addElement(Rights element) {
 		getEntity().addRights(element);
 	}
 
-	/** {@inheritDoc} */
 	@Override
 	public void removeElement(Rights element) {
 		getEntity().removeRights(element);
 	}
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Rights addExisting() {
-        return RightsSelectionDialog.select(getShell(), //getConversationHolder(),
-                null);
+        return RightsSelectionDialog.select(getShell(), null);
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean allowAddExisting() {
         return true;
     }
-
-
-
-
 }
diff --git a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/webapp/TaxeditorWebappPlugin.java b/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/webapp/TaxeditorWebappPlugin.java
index 83c094968..cc786145e 100644
--- a/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/webapp/TaxeditorWebappPlugin.java
+++ b/eu.etaxonomy.taxeditor.webapp/src/main/java/eu/etaxonomy/taxeditor/webapp/TaxeditorWebappPlugin.java
@@ -9,7 +9,6 @@ import org.osgi.framework.BundleContext;
  * The activator class controls the plug-in life cycle
  *
  * @author n.hoffmann
- * @version $Id: $
  */
 public class TaxeditorWebappPlugin extends AbstractUIPlugin {
 
@@ -26,22 +25,12 @@ public class TaxeditorWebappPlugin extends AbstractUIPlugin {
 	public TaxeditorWebappPlugin() {
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public void start(BundleContext context) throws Exception {
 		super.start(context);
 		plugin = this;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	/** {@inheritDoc} */
 	@Override
     public void stop(BundleContext context) throws Exception {
 		plugin = null;
