cleanup

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
index b8980595a32a526d1999a9a3c122706a04a67652..766c89b7082cef3d595c681822cf3904af69ce89 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/model/DescriptionHelper.java
@@ -220,7 +220,7 @@ public class DescriptionHelper {
                        }
                }else if (element instanceof OriginalSourceBase) {
                        try{
-                               OriginalSourceBase<?> originalSource = (OriginalSourceBase<?>) element;
+                               OriginalSourceBase originalSource = (OriginalSourceBase) element;
 //                             ISourceable sourcedObject = originalSource.getSourcedObj();
                                //due to #5743 the bidirectionality for sourced object had to be removed
 

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 ad6bf55ff73f0afcbaa9bc6a6b4af13fc7788ed2..b8b92f1f21e17565b6ecfe712acfab0ceed334ef 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
@@ -78,8 +78,8 @@ public class NewTaxonNodeWizard extends AbstractNewEntityWizardParentChild<Taxon
                    notes = null;
                }
 
-               result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(), taxon, source, parent.getMicroReference(),
-                        status, notes);
+               result = CdmStore.getService(ITaxonNodeService.class).createNewTaxonNode(parent.getUuid(),
+                       taxon, source, parent.getMicroReference(), status, notes);
 
 
                if (result.isOk()){

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
index 7dca6d885d6de775d98b0257bf00d19b65932af7..6a9e663b1c28b75f3593b6ec23d8146c1050acf9 100755 (executable)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/configurator/StructuredDescriptionAggregationConfigurationWizardPage.java
@@ -276,10 +276,8 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
         for (AggregationSourceMode mode :AggregationSourceMode.list(AggregationMode.ToParent, AggregationType.StructuredDescription) ){
             comboSourceModeChildParent.add(mode.getLabel());
             comboSourceModeChildParent.setData(mode.getLabel(), mode);
-
         }
 
-
         comboSourceModeChildParent.setEnabled(false);
         comboSourceModeChildParent.select(0);
         comboSourceModeChildParent.addListener(SWT.Selection, this);
@@ -290,7 +288,6 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
         sourceTypeViewer = CheckboxTableViewer.newCheckList(control, SWT.BORDER | SWT.SINGLE);
         sourceTypeViewer.setContentProvider(new ArrayContentProvider());
 
-
         sourceTypeViewer.addCheckStateListener(new ICheckStateListener(){
             @Override
             public void checkStateChanged(    CheckStateChangedEvent event){
@@ -338,7 +335,6 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
                 sourceTypeViewer.getTable().setEnabled(true);
             }
         }
-
     }
 
     public List<TaxonNode> getSelectedTaxonNodes(){
@@ -351,6 +347,4 @@ public class StructuredDescriptionAggregationConfigurationWizardPage extends Agg
         }
         return result;
     }
-
-
-}
+}
\ No newline at end of file

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 d4c43f74b0b5110d367efa97403e2e14d5c9c9aa..7b6956ee503ef2ab06da049b88d5398d6b1f3da3 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
@@ -82,8 +82,6 @@ public class TaxonNodeDetailElement extends AbstractSingleSourceElement<TaxonNod
        private EntitySelectionElement<TaxonName> selection_reuseExistingName;
     private EntitySelectionElement<Reference> selection_SecRef;
 
-//    private OriginalSourceElement singleSourceSection;
-
     private TextWithLabelElement textTaxonSec;
        private TextWithLabelElement microReference;
     private TextWithLabelElement textNewTaxonName;
@@ -118,7 +116,7 @@ public class TaxonNodeDetailElement extends AbstractSingleSourceElement<TaxonNod
     }
 
        @Override
-       public void createControls(ICdmFormElement formElement,TaxonNode entity, int style) {
+       public void createControls(ICdmFormElement formElement, TaxonNode entity, int style) {
 //         taxon = entity.getTaxon();
 
            Label taxonTitle = new Label(getLayoutComposite(), SWT.NULL);
@@ -126,8 +124,6 @@ public class TaxonNodeDetailElement extends AbstractSingleSourceElement<TaxonNod
            taxonTitle.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
            taxonTitle.setFont(FONT_BOLD);
 
-
-
            if (isCreateNew()){
                textNewTaxonName = formFactory.createTextWithLabelElement(formElement,
                     Messages.TaxonNodeWizardPage_NEW_TAXON, "", style);
@@ -258,20 +254,15 @@ public class TaxonNodeDetailElement extends AbstractSingleSourceElement<TaxonNod
 
         }
         singleSourceSection.setIndent(10);
-//        singleSourceSection.set
-
-//         super.createControls(formElement, entity, style);
 
            setSourceLabel(Messages.TaxonNodeWizardPage_PLACEMENT_SOURCE);
 
-
                selectionNodeAgentRelation = formFactory.createTaxonNodeAgentRelationCollectionSection(formElement, getConversationHolder(), StoreUtil.getSectionStyle(TaxonNodeAgentRelationCollectionSection.class, entity.getClass().getCanonicalName()));
                selectionNodeAgentRelation.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
         selectionNodeAgentRelation.setEntity(entity);
         selectionNodeAgentRelation.setIndent(10);
         selectionNodeAgentRelation.setFont(AbstractUtility.getFont(Resources.COLOR_FONT_DEFAULT));
         setBackground(getPersistentBackground());
-
        }
 
     private void setDefaultPublish() {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
index cae68a30e1dbe3b8eb8276a77f84a186025ba8c0..d8f12fc6958962c87afbc8fed6211e87f2ded467 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameTypeDesignationElement.java
@@ -79,7 +79,6 @@ public class NameTypeDesignationElement extends
 
        }
 
-       /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
                if (eventSource == checkbox_conservedType) {

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractSourcedEntityElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractSourcedEntityElement.java
index 70bd6caa5aa8e2a8851ca18571f2825b8cac9b46..453a68698daa6db801454944b21e9b03a200fa4d 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractSourcedEntityElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/supplemental/AbstractSourcedEntityElement.java
@@ -6,7 +6,6 @@
  * 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.
  */
-
 package eu.etaxonomy.taxeditor.ui.section.supplemental;
 
 import org.eclipse.swt.events.SelectionListener;