ref #7827 Code cleanup

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java
index 2ec556ff5f2169ebc4981be525bc08662e5d6189..199a29bcd2dfe763d4f58793e132c176c3e28a9a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/TermContentProvider.java
@@ -27,42 +27,23 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */\r
 public class TermContentProvider implements ITreeContentProvider {\r
 \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.jface.viewers.IContentProvider#dispose()\r
-        */\r
        @Override\r
        public void dispose() {\r
-               // TODO Auto-generated method stub\r
-\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.jface.viewers.IContentProvider#inputChanged(org.eclipse.jface.viewers.Viewer, java.lang.Object, java.lang.Object)\r
-        */\r
        @Override\r
        public void inputChanged(Viewer viewer, Object oldInput, Object newInput) {\r
-               // TODO Auto-generated method stub\r
-\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.jface.viewers.IStructuredContentProvider#getElements(java.lang.Object)\r
-        */\r
        @Override\r
        public Object[] getElements(Object inputElement) {\r
-\r
                Collection<TermVocabulary> inputElements = (Collection<TermVocabulary>) inputElement;\r
                return inputElements.toArray();\r
-\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)\r
-        */\r
        @Override\r
        public Object[] getChildren(Object parentElement) {\r
            Collection<Object> children = new HashSet<>();\r
-\r
                if(parentElement instanceof TermVocabulary){\r
                        return getTopLevelElements((TermVocabulary)parentElement);\r
                } else if (parentElement instanceof DefinedTermBase) {\r
@@ -83,7 +64,6 @@ public class TermContentProvider implements ITreeContentProvider {
         * TODO: Needs to be implemented in cdmlib\r
         */\r
        private Object[] getTopLevelElements(TermVocabulary vocabulary) {\r
-\r
                SortedSet<DefinedTermBase> terms = vocabulary.getTermsOrderedByLabels(CdmStore.getDefaultLanguage());\r
                Set<DefinedTermBase> topLevelTerms = new HashSet<DefinedTermBase>();\r
 \r
@@ -95,12 +75,8 @@ public class TermContentProvider implements ITreeContentProvider {
                return topLevelTerms.toArray();\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)\r
-        */\r
        @Override\r
        public Object getParent(Object element) {\r
-\r
                if(element instanceof DefinedTermBase){\r
                        DefinedTermBase definedTermBase = (DefinedTermBase)element;\r
                        if (definedTermBase.getPartOf() != null) {\r
@@ -115,9 +91,6 @@ public class TermContentProvider implements ITreeContentProvider {
 \r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)\r
-        */\r
        @Override\r
        public boolean hasChildren(Object element) {\r
                if (getChildren(element) != null){\r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermEditorE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermEditorE4.java
index 41ed8c186fc4dd70dcec31dd4a705e3748424d73..b5a1799772febb1cbe18b5ecc7e2e5c92e9a038a 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermEditorE4.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/e4/DefinedTermEditorE4.java
@@ -223,16 +223,10 @@ IPartContentHasDetails, IPartContentHasSupplementalData, IE4SavablePart, IContex
         return input;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextAboutToStop(IMemento memento, IProgressMonitor monitor) {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextStop(IMemento memento, IProgressMonitor monitor) {
         //close view when workbench closes
@@ -244,23 +238,14 @@ IPartContentHasDetails, IPartContentHasSupplementalData, IE4SavablePart, IContex
         }
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextStart(IMemento memento, IProgressMonitor monitor) {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void contextRefresh(IProgressMonitor monitor) {
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public void workbenchShutdown(IMemento memento, IProgressMonitor monitor) {
     }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
index 670f45a407be085149fde52ca028a28864f6b609..8e478c673a2707ac07064b5ce7ca7afd38bbf675 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/input/TermEditorInput.java
@@ -53,9 +53,6 @@ public class TermEditorInput extends AbstractDefinedTermEditorInput<DefinedTerm>
                return termType.getMessage();
        }
 
-       /* (non-Javadoc)
-        * @see eu.etaxonomy.taxeditor.editor.definedterm.input.AbstractDefinedTermEditorInput#getTermClasses()
-        */
        @Override
        public List<String> getTermClasses() {
                return termClasses;
@@ -86,17 +83,13 @@ public class TermEditorInput extends AbstractDefinedTermEditorInput<DefinedTerm>
                }
            }
        }
-    /**
-     * {@inheritDoc}
-     */
-    @Override
+
+       @Override
     public Set<TermVocabulary<DefinedTermBase>>  getRootEntities() {
         return getVocabularies();
     }
-    /**
-     * {@inheritDoc}
-     */
-    @Override
+
+       @Override
     public void merge() {
         CdmStore.getService(IVocabularyService.class).merge(new ArrayList<TermVocabulary>(getRootEntities()), true);
         updateDefaultFeatureTree();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
index d9cb5078a3c070b074b0a9f0e208fe613d17b028..2bffa234182020df65e500812a454359115156a7 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/editor/definedterm/operation/MoveDefinedTermOperation.java
@@ -39,11 +39,6 @@ public class MoveDefinedTermOperation extends AbstractPostTaxonOperation {
        private final TermBase targetTermOrVocabulary;// the target VOCABULARY or DefinedTerm we are moving these to\r
        private final int currentLocation;\r
 \r
-       /**\r
-        * @param label\r
-        * @param undoContext\r
-        * @param postOperationEnabled\r
-        */\r
        public MoveDefinedTermOperation(String label,\r
                IUndoContext undoContext,\r
                TermBase target,\r
@@ -57,9 +52,6 @@ public class MoveDefinedTermOperation extends AbstractPostTaxonOperation {
                this.currentLocation = currentLocation;\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.commands.operations.AbstractOperation#execute(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
-        */\r
        @Override\r
        public IStatus execute(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
@@ -128,7 +120,6 @@ public class MoveDefinedTermOperation extends AbstractPostTaxonOperation {
                        }\r
 \r
                }\r
-               //return null;\r
                return postExecute(targetTermOrVocabulary);\r
        }\r
 \r
@@ -152,24 +143,15 @@ public class MoveDefinedTermOperation extends AbstractPostTaxonOperation {
                return term;\r
        }\r
 \r
-\r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.commands.operations.AbstractOperation#redo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
-        */\r
        @Override\r
        public IStatus redo(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
-               // TODO Auto-generated method stub\r
                return null;\r
        }\r
 \r
-       /* (non-Javadoc)\r
-        * @see org.eclipse.core.commands.operations.AbstractOperation#undo(org.eclipse.core.runtime.IProgressMonitor, org.eclipse.core.runtime.IAdaptable)\r
-        */\r
        @Override\r
        public IStatus undo(IProgressMonitor monitor, IAdaptable info)\r
                        throws ExecutionException {\r
-               // TODO Auto-generated method stub\r
                return null;\r
        }\r
 \r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/DistributionContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/DistributionContentProvider.java
index 66629b1cdd91ab4acd4dfdc688a4bef31ffffdfe..d9e94a465d50fda42e63773828ab2cac0237e449 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/DistributionContentProvider.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/wizard/DistributionContentProvider.java
@@ -24,9 +24,6 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
  */
 public class DistributionContentProvider extends TermContentProvider {
 
-    /* (non-Javadoc)
-     * @see org.eclipse.jface.viewers.ITreeContentProvider#getChildren(java.lang.Object)
-     */
     @Override
     public Object[] getChildren(Object parentElement) {
         Set<NamedAreaWrapper> allChildrenWrapper = new HashSet();
@@ -56,7 +53,6 @@ public class DistributionContentProvider extends TermContentProvider {
         return null;
     }
 
-
     /**
     *
     * @param vocabulary
@@ -79,12 +75,8 @@ public class DistributionContentProvider extends TermContentProvider {
        return topLevelTerms.toArray();
    }
 
-   /* (non-Javadoc)
-    * @see org.eclipse.jface.viewers.ITreeContentProvider#getParent(java.lang.Object)
-    */
    @Override
    public Object getParent(Object element) {
-
        if(element instanceof NamedAreaWrapper){
            if (((NamedAreaWrapper)element).parent!= null){
                return ((NamedAreaWrapper)element).parent;
@@ -101,9 +93,6 @@ public class DistributionContentProvider extends TermContentProvider {
 
    }
 
-   /* (non-Javadoc)
-    * @see org.eclipse.jface.viewers.ITreeContentProvider#hasChildren(java.lang.Object)
-    */
    @Override
    public boolean hasChildren(Object element) {
        if (element instanceof TermVocabulary){
@@ -144,7 +133,6 @@ public class DistributionContentProvider extends TermContentProvider {
            return false;
 
        }
-
        return false;
    }
 }