ref #8785: adapt to changes in method signature of mergeDescriptions

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / src / main / java / eu / etaxonomy / taxeditor / editor / ViewerConfiguration.java

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 4563d3dfd3112bf20ac6dd4f216eb2bf60641336..e38f1c6280f00a87a09f728dfc9c1b98e02d1cc4 100644 (file)
--- 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;
 //     }
-       
-       
+
+
 }