cleanup

diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
index fc9462d4780777aa002ae3745fbec37c37044883..d0a210dd2043baa544301d4800b72d1283925175 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/EnumComboElement.java
@@ -66,14 +66,12 @@ public class EnumComboElement<T extends IEnumTerm<T>> extends
                                Collection<NomenclaturalCode> result = new ArrayList<>(Arrays.asList(NomenclaturalCode.values()));
                result.remove(NomenclaturalCode.ICVCN);
                 return  result;
-
                        }
 
                        @Override
                        public Class<NomenclaturalCode> getClazz() {
                                return NomenclaturalCode.class;
                        }
-
                },
                new CdmEnumDataHolder<ReferenceType>(){
 

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 9ce1fac49852b06e7e37a5a447638ea73663b332..bebab91a0035fb3b18142861094dce58f7c77ee8 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
@@ -49,10 +49,8 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 import eu.etaxonomy.taxeditor.ui.selection.TaxonNodeSelectionElement;
 
 /**
- *
  * @author n.hoffmann
  * @created Sep 27, 2010
- * @version 1.0
  */
 public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode> {
 
@@ -60,36 +58,22 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
        private Classification classification;
        private TaxonNode parentNode;
        private Taxon taxon;
+    private boolean complete;
+    private TaxonNodeStatus status = null;
+    private Map<Language, LanguageString> multilanguageTextCache;
 
        private TaxonNodeSelectionElement selection_parentTaxonNode;
        private EntitySelectionElement<Taxon> selection_reuseExistingTaxon;
        private EntitySelectionElement<TaxonName> selection_reuseExistingName;
-
     private EntitySelectionElement<Reference> selection_SecRef;
        private EntitySelectionElement<Reference> selection_Ref;
-
-
-    TextWithLabelElement textTaxonSec;
-
+    private TextWithLabelElement textTaxonSec;
        private TextWithLabelElement microReference;
-
-
     private TextWithLabelElement textNewTaxonName;
-
        private TaxonNodeAgentRelationCollectionSection selectionNodeAgentRelation;
-
-       private EnumComboElement combo_status;
-//     private CheckboxElement checkbox_excluded;
+       private EnumComboElement<TaxonNodeStatus> combo_status;
        private CheckboxElement checkbox_publish;
-//     private CheckboxElement checkbox_placementDoubtful;
-
     private MultilanguageTextElement multiLanguageTextStatusNotes;
-    private Map<Language, LanguageString> multilanguageTextCache;
-
-
-       private boolean complete;
-
-       private TaxonNodeStatus status = null;
 
        public TaxonNodeDetailElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement, boolean isCreateNew) {
@@ -97,36 +81,20 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                createNew = isCreateNew;
        }
 
-
        public Map<Language, LanguageString> getMultiLanguageTextExcludedNotes() {
         return multiLanguageTextStatusNotes.getMultilanguageText();
     }
 
-
-
     public boolean isExcluded() {
-        if (status == null){
-            return false;
-        }
-        return status.equals(TaxonNodeStatus.EXCLUDED);
+        return status == null? false : status.equals(TaxonNodeStatus.EXCLUDED);
     }
 
-
-
     public boolean isUnplaced() {
-        if (status == null){
-            return false;
-        }
-        return status.equals(TaxonNodeStatus.UNPLACED);
+        return status == null? false : status.equals(TaxonNodeStatus.UNPLACED);
     }
 
-
-
     public boolean isPlacementDoubtful() {
-        if (status == null){
-            return false;
-        }
-        return status.equals(TaxonNodeStatus.DOUBTFUL);
+        return status == null? false : status.equals(TaxonNodeStatus.DOUBTFUL);
     }
 
     public Reference getRef() {
@@ -139,7 +107,6 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
         return microReference.getText();
     }
 
-       /** {@inheritDoc} */
        @Override
        protected void createControls(ICdmFormElement formElement,
                TaxonNode entity, int style) {
@@ -180,7 +147,6 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                    textNewTaxonName.setFocus();
                } else{
                    textNewTaxonName = formFactory.createTextWithLabelElement(formElement,"Taxon", "", style);
-
                }
            }else{
                taxon = getEntity().getTaxon();
@@ -208,20 +174,14 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                 textTaxonSec.setText(taxon.getSec().getTitleCache());
             }
             textTaxonSec.setEnabled(false);
-
-
-
            }
 
-
         if (!isCreateNew()){
             if (entity.getReference() != null){
                 selection_Ref.setEntity(entity.getReference());
             }
-
         }
 
-
         Taxon tax = null;
         if (entity.getTaxon() != null){
             tax = entity.getTaxon();
@@ -229,7 +189,6 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
         checkbox_publish = formFactory.createCheckbox(formElement,
                 "Taxon is published", tax != null? tax.isPublish(): true, style);
 
-
         checkbox_publish.setEnabled(isCreateNew());
 
         combo_status = formFactory.createEnumComboElement(TaxonNodeStatus.class, formElement, style, true);
@@ -239,7 +198,6 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
 
         if(isCreateNew()){
 
-
                   String defaultPublish = PreferencesUtil.getStringValue(PreferencePredicate.DefaultBehaviourForPublishFlag.getKey());
                if (defaultPublish != null && defaultPublish.equals(PublishEnum.Publish.getKey())){
                    checkbox_publish.setSelection(true);
@@ -252,31 +210,26 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                        checkbox_publish.setSelection(true);
                    }
                }
-
            } else{
             setTreeNode(entity);
             complete = true;
         }
 
-
                if (isCreateNew()){
                    preFillTaxonName();
                }
 
-
            multiLanguageTextStatusNotes = formFactory.createMultiLanguageTextElement(formElement, "Status Notes", null, 50, style);
            if (!isCreateNew()){
                multiLanguageTextStatusNotes.setMultilanguageText(entity.getStatusNote());
                multiLanguageTextStatusNotes.setEnabled(entity.getStatus() != null);
            }
 
-
                if (!isCreateNew()){
                    selectionNodeAgentRelation = formFactory.createTaxonNodeAgentRelationCollectionSection(formElement, getConversationHolder(), StoreUtil.getSectionStyle(TaxonNodeAgentRelationCollectionSection.class, entity.getClass().getCanonicalName()));
                    selectionNodeAgentRelation.setEntity(entity);
                    selectionNodeAgentRelation.setLayoutData(LayoutConstants.FILL_HORIZONTALLY(2, 1));
                }
-
        }
 
        private void preFillTaxonName() {
@@ -305,10 +258,8 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                 }
             }
         }
-
     }
 
-       /** {@inheritDoc} */
        @Override
        public void handleEvent(Object eventSource) {
                if (eventSource == selection_parentTaxonNode) {
@@ -368,7 +319,7 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
         }
 
                if (eventSource == combo_status) {
-            status = (TaxonNodeStatus) combo_status.getSelection();
+            status = combo_status.getSelection();
             if (status == null){
                 if (multiLanguageTextStatusNotes.getMultilanguageText() != null && !multiLanguageTextStatusNotes.getMultilanguageText().isEmpty()){
                     multilanguageTextCache = new HashMap<>();
@@ -400,7 +351,6 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                 }
             }
 
-
             multiLanguageTextStatusNotes.setEnabled(status != null);
 
             complete = true;
@@ -429,8 +379,6 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                return classification;
        }
 
-
-
        public TaxonNode getParentTreeNode() {
                return parentNode;
        }
@@ -453,10 +401,9 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                            selection_parentTaxonNode.setClassification(classification);
                    selection_SecRef.setEntity(parentTreeNode.getTaxon().getSec());
                        }
-
-
                }
        }
+
        @Override
        protected void updateControlStates(){
         Collection<Object> except = new ArrayList<Object>();
@@ -499,8 +446,6 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
                 this.textTaxonSec.setText(taxon.getSec().getTitleCache());
             }
                }
-
-
        }
 
        private void setTaxon(TaxonName taxonName) {
@@ -580,6 +525,4 @@ public class TaxonNodeDetailElement extends AbstractCdmDetailElement<TaxonNode>
         }
         updateControlStates();
     }
-
-
 }