cleanup

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 a72f5af6add955b610289118ac641fa2b4430d1f..932071f0fdbd436d72edac9bcb18131e6e3f8d27 100644 (file)
--- 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
@@ -31,11 +31,6 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
                return new ApplicationWorkbenchWindowAdvisor(configurer);
        }
 
-       /**
-        * <p>getInitialWindowPerspectiveId</p>
-        *
-        * @return a {@link java.lang.String} object.
-        */
        @Override
     public String getInitialWindowPerspectiveId() {
 //         if (PreferencesUtil.getBooleanValue(IPreferenceKeys.SHOW_CHECKLIST_PERSPECTIVE)){
@@ -77,8 +72,7 @@ public class ApplicationWorkbenchAdvisor extends WorkbenchAdvisor {
            private Throwable previousT;
 
                @Override
-               public void handle(StatusAdapter statusAdapter, int style)
-               {
+               public void handle(StatusAdapter statusAdapter, int style){
 
                    if(statusAdapter.getStatus().matches(IStatus.ERROR)) {
 

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainerE4.java
index a15613310a329c773a92719be7e74a95360cb3a5..4a656a09acfd595e018531758e5daf9e278ff56a 100755 (executable)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/container/AbstractGroupedContainerE4.java
@@ -172,7 +172,6 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
                        @Override
                        public void focusLost(FocusEvent e) {
                                super.focusLost(e);
-
                                persistName();
                        }
                };
@@ -448,7 +447,6 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
                        getTaxonBase().setTitleCache((getTaxonBase().generateTitle()));
                        setDirty(false);
                        getNameViewer().getTextWidget().setEnabled(true);
-
                }
        }
 
@@ -893,13 +891,11 @@ abstract public class AbstractGroupedContainerE4<T extends TaxonBase> implements
        @Override
        public void initialize(IManagedForm form) {
                // TODO Auto-generated method stub
-
        }
 
        @Override
        public void dispose() {
                if (getControl() != null) {
-
                        getControl().dispose();
                }
        }

diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateSynonymInHomotypicalGroupHandlerE4.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateSynonymInHomotypicalGroupHandlerE4.java
index 0a30c168b3590f4fd697c06e54bad8a999baf5e8..b3bf61274ede985761b1ad6432557257714df05e 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateSynonymInHomotypicalGroupHandlerE4.java
+++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/name/e4/handler/CreateSynonymInHomotypicalGroupHandlerE4.java
@@ -43,13 +43,13 @@ public class CreateSynonymInHomotypicalGroupHandlerE4 {
 
         TaxonNameEditorE4 editor = (TaxonNameEditorE4) activePart.getObject();
 
-               Object selecteObject = selection.getFirstElement();
+               Object selectedObject = selection.getFirstElement();
 
-               if(! (selecteObject instanceof Synonym)){
+               if(! (selectedObject instanceof Synonym)){
                        return ;
                }
 
-               Synonym synonym = (Synonym) selecteObject;
+               Synonym synonym = (Synonym) selectedObject;
 
                HomotypicalGroup group = synonym.getHomotypicGroup();
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
index de988d2cfd06bb3d543cb23f74bab4eda306454a..47c37affbb8f541d128c1c69bc4280f11b544be2 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizard.java
@@ -41,11 +41,6 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizardParentChild<Taxon
     private boolean isOpenInEditor = false;
     private boolean success = true;
 
-    /**
-     * <p>Constructor for AbstractNewEntityWizard.</p>
-     *
-     * @param <T> a T object.
-     */
     @Inject
     public NewTaxonNodeWizard(){
         setWindowTitle(Messages.TaxonNodeWizardPage_new);
@@ -68,23 +63,15 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizardParentChild<Taxon
                UpdateResult result;
                TaxonNode parent = getParentEntity();
 
-               Map<Language, LanguageString> nodes = ((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).getMultiLanguageTextExcludedNotes();
+               Map<Language, LanguageString> notes = ((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).getMultiLanguageTextExcludedNotes();
                UUID refUuid = parent.getReference() != null? parent.getReference().getUuid(): null;
 
-               TaxonNodeStatus status = null;
-               if( ((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).isUnplaced()){
-                   status = TaxonNodeStatus.UNPLACED;
-               }else if( ((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).isPlacementDoubtful()){
-                   status = TaxonNodeStatus.DOUBTFUL;
-               }else if (((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).isExcluded()){
-                   status = TaxonNodeStatus.EXCLUDED;
-               }
+               TaxonNodeStatus status = ((TaxonNodeDetailElement)taxonNodePage.getDetailElement()).getTaxonNodeStatus();
                if (status == null){
-                   nodes = null;
+                   notes = null;
                }
                result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, refUuid, parent.getMicroReference(),
-                        status, nodes);
-
+                        status, notes);
 
                if (result.isOk()){
                    this.setEntity((TaxonNode)result.getCdmEntity());
@@ -127,14 +114,6 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizardParentChild<Taxon
 //        return null;
 //    }
 
-
-    /**
-     * <p>
-     * openInEditor
-     * </p>
-     *
-     * @return a boolean.
-     */
     public boolean openInEditor() {
         return isOpenInEditor ;
     }
@@ -143,20 +122,10 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizardParentChild<Taxon
         this.isOpenInEditor = isOpenInEditor;
     }
 
-    /**
-     * <p>openEmpty</p>
-     *
-     * @return a boolean.
-     */
     public boolean openEmpty(){
         return openInEditor() && openEmptyEditor;
     }
 
-    /**
-     * <p>getTaxonNode</p>
-     *
-     * @return a {@link eu.etaxonomy.cdm.model.taxon.TaxonNode} object.
-     */
     public TaxonNode getTaxonNode(){
         if(generatedTaxonNodeUuid != null){
             return CdmStore.getService(ITaxonNodeService.class).load(generatedTaxonNodeUuid);
@@ -177,12 +146,10 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizardParentChild<Taxon
         this.wizardPageListener = wizardPageListener;
     }
 
-
     public boolean isSuccess() {
         return success;
     }
 
-
     public void setSuccess(boolean success) {
         this.success = success;
     }
@@ -197,6 +164,4 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizardParentChild<Taxon
             }
         }
     }
-
-
 }

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardDialog.java
index c1b0cf141a9f7ba8be2859fa1a641b547a236429..e419b64cd3622f41ed444f58c2badfbc106e4f09 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardDialog.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/newWizard/NewTaxonNodeWizardDialog.java
@@ -20,16 +20,12 @@ import org.eclipse.swt.widgets.Shell;
 /**
  * @author k.luther
  * @since 23.01.2019
- *
  */
 public class NewTaxonNodeWizardDialog extends WizardDialog {
 
     private Button finishAndOpen;
     private IWizard newTaxonNodeWizard;
-    /**
-     * @param parentShell
-     * @param newWizard
-     */
+
     public NewTaxonNodeWizardDialog(Shell parentShell, IWizard newWizard) {
         super(parentShell, newWizard);
         newTaxonNodeWizard = newWizard;
@@ -40,17 +36,11 @@ public class NewTaxonNodeWizardDialog extends WizardDialog {
         finishAndOpen = createButton(parent, IDialogConstants.FINISH_ID,"Finish and Open", false);
 
         finishAndOpen.addSelectionListener(new SelectionListener() {
-            /*
-             * @see SelectionListener.widgetSelected (SelectionEvent)
-             */
             @Override
             public void widgetSelected(SelectionEvent e) {
                 ((NewTaxonNodeWizard)newTaxonNodeWizard).setOpenInEditor(true);
                 finishPressed();
             }
-            /*
-             * @see SelectionListener.widgetDefaultSelected(SelectionEvent)
-             */
             @Override
             public void widgetDefaultSelected(SelectionEvent e) {
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
index f4e7849f97ba8b29d0f88cf3fc5416b509b78a4d..4bb84ab8772c4ab415a1b4826443a4372d13ab0c 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/parser/ParseHandler.java
@@ -105,7 +105,7 @@ public class ParseHandler{
         * Creates an empty <code>TaxonName</code> instance with the nomenclatural code
         * currently set in preferences.
         *
-        * @return a {@link eu.etaxonomy.cdm.model.name.TaxonNameBase} object.
+        * @return the newly created {@link TaxonName}.
         */
        public static TaxonName createEmptyName(){
                return (TaxonName)nonViralNameParser.getNonViralNameInstance("", PreferencesUtil.getPreferredNomenclaturalCode());

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
index 18ed90797581c8ec7490d401988c82f90235bd9a..ea2347b31eb82d3bec4bfe01be7fe9606752adb0 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/preference/PreferencesUtil.java
@@ -221,7 +221,6 @@ public class PreferencesUtil implements IPreferenceKeys {
     public static String getStringValue(String name, boolean local) {
 
         CdmPreference pref = getDBPreferenceValue(name);
-        String prefValue = null;
 
         boolean override = getOverrideForPreference(name);
 

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
index efc061e84acb9cf98a1559bbdfac1da656f0ba72..c13d8d89cdfd2513851ed245c2c4cd4a548bc42b 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeDetailElement.java
@@ -92,17 +92,9 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
         return multiLanguageTextStatusNotes.getMultilanguageText();
     }
 
-    public boolean isExcluded() {
-        return status == null? false : status.equals(TaxonNodeStatus.EXCLUDED);
-    }
-
-    public boolean isUnplaced() {
-        return status == null? false : status.equals(TaxonNodeStatus.UNPLACED);
-    }
-
-    public boolean isPlacementDoubtful() {
-        return status == null? false : status.equals(TaxonNodeStatus.DOUBTFUL);
-    }
+       public TaxonNodeStatus getTaxonNodeStatus(){
+           return status;
+       }
 
     public Reference getRef() {
         return selection_Ref.getEntity();

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
index 06c7a1487190ef74108208b41aea0954fe7e2398..a6faaf11cc57c4d3a687f328c82caf64dc2860cb 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/classification/TaxonNodeWizardPage.java
@@ -74,7 +74,6 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<TaxonNode>
 
        }
 
-       /** {@inheritDoc} */
        @Override
        public TaxonNodeDetailElement createElement(ICdmFormElement rootElement) {
            TaxonNodeDetailElement detailElement = formFactory.createTaxonNodeDetailElement(rootElement, this.isCreateNew);
@@ -91,9 +90,6 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<TaxonNode>
                return detailElement;
        }
 
-
-
-    /** {@inheritDoc} */
        @Override
        public void propertyChange(PropertyChangeEvent event) {
                checkComplete();
@@ -127,16 +123,8 @@ public class TaxonNodeWizardPage extends AbstractCdmEntityWizardPage<TaxonNode>
                setPageComplete(false);
        }
 
-       /**
-        * <p>
-        * Getter for the field <code>parentTreeNode</code>.
-        * </p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.model.taxon.ITaxonTreeNode} object.
-        */
        public TaxonNode getParentTreeNode() {
-               return ((TaxonNodeDetailElement) getDetailElement())
-                               .getParentTreeNode();
+               return ((TaxonNodeDetailElement) getDetailElement()).getParentTreeNode();
        }
 
        public CreateTaxonDTO createTaxon() {