cleanup
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 19 Jan 2021 17:54:32 +0000 (18:54 +0100)
committerAndreas Müller <a.mueller@bgbm.org>
Tue, 19 Jan 2021 17:54:55 +0000 (18:54 +0100)
18 files changed:
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/AbstractComboElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/AbstractFormSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/CdmFormFactory.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/IRelevantFormElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/TextWithLabelElementController.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractCdmDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractEntityCollectionSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/AbstractIdentifiableEntityDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/ICdmDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/agent/TeamMemberSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/AuthorshipDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NameDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/name/NonViralNameDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/occurrence/dna/AbstractUnboundEntityCollectionSection.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonBaseDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonOfRelationshipElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/selection/EntitySelectionElement.java

index 5cf48bb519f85ca0289a91ebddaa0791be3db824..f0998fb2ad61b6bcc43c7a85e39e1361296cfc96 100644 (file)
@@ -41,9 +41,9 @@ import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
  * @author pplitzner
  * @date Aug 11, 2016
  */
-public abstract class AbstractComboElement<T> 
-               extends AbstractCdmFormElement 
-               implements SelectionListener, IEnableableFormElement, 
+public abstract class AbstractComboElement<T>
+               extends AbstractCdmFormElement
+               implements SelectionListener, IEnableableFormElement,
                        ISelectable, DisposeListener {
 
     protected static final int DEFAULT_VISIBLE_ITEMS = 10;
index c5718b7d4236df8c163087073995b3dc62f71574..31318516135136707c44628867838868d638a7e2 100644 (file)
@@ -49,7 +49,9 @@ import eu.etaxonomy.taxeditor.model.MessagingUtils;
  * @param <T>
  */
 //TODO shouldn't ENTITY be bound with super class ICdmBase for example (AbstractFormSection<ENTITY extends ICdmBase>)?
-public abstract class AbstractFormSection<ENTITY> extends Section implements ISelectionChangedListener, IEntityElement<ENTITY>, IConversationEnabled {
+public abstract class AbstractFormSection<ENTITY>
+        extends Section
+        implements ISelectionChangedListener, IEntityElement<ENTITY>, IConversationEnabled {
 
     /**
      * The default number of columns in detail sections
@@ -71,22 +73,7 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        private Color persistentBackgroundColor;
 
        /**
-        * <p>
         * Constructor for AbstractFormSection.
-        * </p>
-        *
-        * @param conversation
-        *            TODO
-        * @param style
-        *            a int.
-        * @param formFactory
-        *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
-        *            object.
-        * @param parentElement
-        *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-        *            object.
-        * @param <ENTITY>
-        *            a ENTITY object.
         */
     protected AbstractFormSection(CdmFormFactory formFactory, ICdmFormElement parentElement, int style) {
                super(parentElement.getLayoutComposite(), style);
@@ -108,27 +95,10 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
                client.setLayout(layout);
 
                this.setClient(client);
-
        }
 
-           /**
-     * <p>
+       /**
      * Constructor for AbstractFormSection.
-     * </p>
-     *
-     * @param formFactory
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
-     *            object.
-     * @param conversation
-     *            a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}
-     *            object.
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param selectionProvider
-     *            a {@link org.eclipse.jface.viewers.ISelectionProvider} object.
-     * @param style
-     *            a int.
      */
     protected AbstractFormSection(CdmFormFactory formFactory, ICdmFormElement parentElement, ISelectionProvider selectionProvider, int style) {
         this(formFactory, parentElement, style);
@@ -136,18 +106,13 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
     }
 
        /**
-        * <p>
         * Getter for the field <code>propertyChangeListeners</code>.
-        * </p>
-        *
-        * @return a {@link java.util.Set} object.
         */
        @Override
     public List<IPropertyChangeListener> getPropertyChangeListeners() {
                return propertyChangeListeners;
        }
 
-       /** {@inheritDoc} */
        @Override
     public void setPropertyChangeListeners(
                        List<IPropertyChangeListener> propertyChangeListeners) {
@@ -155,23 +120,14 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        }
 
        /**
-        * <p>
         * Setter for the field <code>entity</code>.
-        * </p>
-        *
-        * @param entity
-        *            a ENTITY object.
         */
        public void setEntity(ENTITY entity) {
                this.entity = entity;
        }
 
        /**
-        * <p>
         * Getter for the field <code>entity</code>.
-        * </p>
-        *
-        * @return a ENTITY object.
         */
        @Override
     public ENTITY getEntity() {
@@ -179,36 +135,19 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        }
 
        /**
-        * <p>
         * getToggle
-        * </p>
-        *
-        * @return a {@link org.eclipse.ui.forms.widgets.ToggleHyperlink} object.
         */
        public ToggleHyperlink getToggle() {
                return this.toggle;
        }
 
        /**
-        * <p>
         * getSection
-        * </p>
-        *
-        * @return a {@link eu.etaxonomy.taxeditor.ui.element.AbstractFormSection}
-        *         object.
         */
        public AbstractFormSection<ENTITY> getSection() {
                return this;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * eu.etaxonomy.taxeditor.forms.IPropertyChangeEmitter#firePropertyChangeEvent
-        * ()
-        */
-       /** {@inheritDoc} */
        @Override
     public void firePropertyChangeEvent(CdmPropertyChangeEvent event) {
         Assert.isNotNull(propertyChangeListeners, "No property change listeners.");
@@ -247,38 +186,16 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
                                originatingEvent));
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see org.eclipse.swt.widgets.Composite#setFocus()
-        */
-       /** {@inheritDoc} */
        @Override
        public boolean setFocus() {
                return getClient().setFocus();
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.jface.util.IPropertyChangeListener#propertyChange(org.eclipse
-        * .jface.util.PropertyChangeEvent)
-        */
-       /** {@inheritDoc} */
        @Override
     public void propertyChange(PropertyChangeEvent event) {
                firePropertyChangeEvent(new CdmPropertyChangeEvent(this, event));
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.swt.widgets.Control#setBackground(org.eclipse.swt.graphics
-        * .Color)
-        */
-       /** {@inheritDoc} */
        @Override
        public void setBackground(Color color) {
                for (ICdmFormElement element : getElements()) {
@@ -299,15 +216,6 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
                return persistentBackgroundColor;
        }
 
-
-       /**
-        * <p>
-        * widgetSelected
-        * </p>
-        *
-        * @param e
-        *            a {@link org.eclipse.swt.events.SelectionEvent} object.
-        */
        public void widgetSelected(SelectionEvent e) {
         Widget widget = e.widget;
 
@@ -337,7 +245,6 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
                }
        }
 
-       /** {@inheritDoc} */
        @Override
     public void setSelected(boolean selected) {
                if (selected) {
@@ -348,7 +255,6 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
                }
        }
 
-       /** {@inheritDoc} */
        @Override
     public void selectionChanged(SelectionChangedEvent event) {
                if (event.getSelection() == CdmFormFactory.EMPTY_SELECTION) {
@@ -366,54 +272,23 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
                }
        }
 
-       /**
-        * <p>
-        * addSelectionListener
-        * </p>
-        *
-        * @param listener
-        *            a {@link org.eclipse.swt.events.SelectionListener} object.
-        */
        public void addSelectionListener(SelectionListener listener) {
                addListener(SWT.Selection, new TypedListener(listener));
        }
 
-       /**
-        * <p>
-        * removeSelectionListener
-        * </p>
-        *
-        * @param listener
-        *            a {@link org.eclipse.swt.events.SelectionListener} object.
-        */
        public void removeSelectionListener(SelectionListener listener) {
                removeListener(SWT.Selection, listener);
        }
 
-       /** {@inheritDoc} */
        @Override
     public void addElement(ICdmFormElement element) {
                elements.add(element);
        }
 
-       /**
-        * <p>
-        * removeElement
-        * </p>
-        *
-        * @param element
-        *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-        *            object.
-        */
        protected void removeElement(ICdmFormElement element) {
                elements.remove(element);
        }
 
-       /**
-        * <p>
-        * removeElements
-        * </p>
-        */
        @Override
     public void removeElements() {
                for (Iterator<ICdmFormElement> formElementIterator = getElements().iterator();formElementIterator.hasNext();) {
@@ -452,11 +327,7 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        }
 
        /**
-        * <p>
         * Getter for the field <code>parentElement</code>.
-        * </p>
-        *
-        * @return a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement} object.
         */
        @Override
     public ICdmFormElement getParentElement() {
@@ -464,24 +335,13 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        }
 
        /**
-        * <p>
         * Getter for the field <code>elements</code>.
-        * </p>
-        *
-        * @return a {@link java.util.Set} object.
         */
        @Override
     public Set<ICdmFormElement> getElements() {
                return elements;
        }
 
-       /**
-        * <p>
-        * getControls
-        * </p>
-        *
-        * @return a {@link java.util.Set} object.
-        */
        @Override
     public Set<Control> getControls() {
                Set<Control> controls = new HashSet<>();
@@ -493,26 +353,17 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
                return controls;
        }
 
-       /** {@inheritDoc} */
        @Override
        public void dispose() {
                removeElements();
                super.dispose();
        }
 
-       /**
-        * <p>
-        * getLayoutComposite
-        * </p>
-        *
-        * @return a {@link org.eclipse.swt.widgets.Composite} object.
-        */
        @Override
     public Composite getLayoutComposite() {
                return (Composite) getClient();
        }
 
-       /** {@inheritDoc} */
        @Override
     public boolean containsFormElement(ICdmFormElement formElement) {
                if (formElement == this) {
@@ -529,36 +380,18 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
        }
 
        /**
-        * <p>
         * Getter for the field <code>formFactory</code>.
-        * </p>
-        *
-        * @return a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory} object.
         */
        @Override
     public CdmFormFactory getFormFactory() {
                return formFactory;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see eu.etaxonomy.taxeditor.forms.ICdmFormElement#refresh()
-        */
        @Override
     public void refresh() {
                // empty default implementation
-
        }
 
-       /**
-        * <p>
-        * getConversationHolder
-        * </p>
-        *
-        * @return a {@link eu.etaxonomy.cdm.api.conversation.ConversationHolder}
-        *         object.
-        */
        @Override
     public ConversationHolder getConversationHolder() {
            if(AbstractUtility.getActivePart() instanceof IConversationEnabled){
@@ -580,7 +413,6 @@ public abstract class AbstractFormSection<ENTITY> extends Section implements ISe
 
        }
 
-       /** {@inheritDoc} */
        @Override
     public void update(CdmDataChangeMap changeEvents) {
 
index 6be1d9ec05c8b284c233c57ed4785b2ca485337e..c895b7d1a221fbb7ea511919abf9b0d22ac699a4 100644 (file)
@@ -53,10 +53,10 @@ import org.joda.time.DateTime;
 import org.joda.time.Partial;
 import org.springframework.security.core.GrantedAuthority;
 
-import eu.etaxonomy.cdm.common.URI;
 import eu.etaxonomy.cdm.api.conversation.ConversationHolder;
 import eu.etaxonomy.cdm.api.facade.DerivedUnitFacade;
 import eu.etaxonomy.cdm.common.DOI;
+import eu.etaxonomy.cdm.common.URI;
 import eu.etaxonomy.cdm.hibernate.HibernateProxyHelper;
 import eu.etaxonomy.cdm.model.agent.ORCID;
 import eu.etaxonomy.cdm.model.agent.Person;
@@ -947,6 +947,7 @@ public class CdmFormFactory extends FormToolkit {
         parentElement.addElement(element);
         return element;
     }
+
     /**
      * @deprecated Use {@link #createDefinedTermComboElement(TermType, ICdmFormElement, String, DefinedTermBase, int)} instead
      */
@@ -1004,6 +1005,7 @@ public class CdmFormFactory extends FormToolkit {
             int style) {
         return  this.createDefinedTermComboElement(null, null, terms, parentElement, labelString, selection, true, style, false, null);
     }
+
        public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
                List<T> terms,
                ICdmFormElement parentElement,
@@ -1013,6 +1015,7 @@ public class CdmFormFactory extends FormToolkit {
                int style) {
            return  this.createDefinedTermComboElement(null, null, terms, parentElement, labelString, selection, addEmptyElement, style, false, null);
        }
+
     public <T extends DefinedTermBase> TermComboElement<T> createDefinedTermComboElement(
                        TermType termType,
                        ICdmFormElement parentElement,
@@ -1056,6 +1059,7 @@ public class CdmFormFactory extends FormToolkit {
                int style,
                boolean useAbbrevLabel,
                Comparator<T> comparator) {
+
            if(termType!=null){
                TermComboElement<T> element = new TermComboElement<T>(this, parentElement, termType, labelString, selection, addEmptyElement, style, useAbbrevLabel, comparator);
                adapt(element);
@@ -1344,23 +1348,7 @@ public class CdmFormFactory extends FormToolkit {
     }
 
     /**
-     * <p>
      * createToggleableTextField
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param initialText
-     *            a {@link java.lang.String} object.
-     * @param initialState
-     *            a boolean.
-     * @param style
-     *            a int.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement}
-     *         object.
      */
     public ToggleableTextElement createToggleableTextField(ICdmFormElement parentElement, String labelString,
             String initialText, boolean initialState, int style) {
@@ -1373,21 +1361,7 @@ public class CdmFormFactory extends FormToolkit {
     }
 
     /**
-     * <p>
      * createTimePeriodElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param timePeriod
-     *            a {@link eu.etaxonomy.cdm.model.common.TimePeriod} object.
-     * @param style
-     *            a int.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.TimePeriodElement}
-     *         object.
      */
     public TimePeriodElement createTimePeriodElement(ICdmFormElement parentElement, String labelString,
             TimePeriod timePeriod, int style) {
@@ -1398,21 +1372,7 @@ public class CdmFormFactory extends FormToolkit {
     }
 
     /**
-     * <p>
      * createVerbatimTimePeriodElement
-     * </p>
-     *
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param labelString
-     *            a {@link java.lang.String} object.
-     * @param timePeriod
-     *            a {@link eu.etaxonomy.cdm.model.common.VerbatimTimePeriod} object.
-     * @param style
-     *            a int.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.VerbatimTimePeriodElement}
-     *         object.
      */
     public VerbatimTimePeriodElement createVerbatimTimePeriodElement(ICdmFormElement parentElement, String labelString,
             VerbatimTimePeriod timePeriod, int style) {
@@ -1422,24 +1382,8 @@ public class CdmFormFactory extends FormToolkit {
         return element;
     }
 
-
-
        /**
-        * <p>
         * createGatheringEventUnitElement
-        * </p>
-        *
-        * @param parentElement
-        *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-        *            object.
-        * @param labelString
-        *            a {@link java.lang.String} object.
-        * @param timePeriod
-        *            a {@link eu.etaxonomy.cdm.model.common.GatheringEvent} object.
-        * @param style
-        *            a int.
-        * @return a {@link eu.etaxonomy.taxeditor.ui.element.GatheringEventUnitElement}
-        *         object.
         */
        public GatheringEventUnitElement createGatheringEventUnitElement(
                        ICdmFormElement parentElement,
@@ -1459,18 +1403,7 @@ public class CdmFormFactory extends FormToolkit {
        }
 
     /**
-     * <p>
      * createPointElement
-     * </p>
-     *
-     * @param style
-     *            a int.
-     * @param parentElement
-     *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-     *            object.
-     * @param point
-     *            a {@link eu.etaxonomy.cdm.model.location.Point} object.
-     * @return a {@link eu.etaxonomy.taxeditor.ui.element.PointElement} object.
      */
     public PointElement createPointElement(ICdmFormElement parentElement, Point point, int style) {
         PointElement element = new PointElement(this, parentElement, point, style);
index f9ab61a36f1f6061c58e424a49ae9f4fda07e0bb..6103281e06d9f46aee42be9901f9b936cdcf60d6 100644 (file)
@@ -1,15 +1,15 @@
 /**
 * 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.
 */
 package eu.etaxonomy.taxeditor.ui.element;
 
 /**
- * <p>IRelevantFormElement interface.</p>
+ * IRelevantFormElement interface.
  *
  * @author n.hoffmann
  * @created May 10, 2010
index 91413df912e6667b118618aba796e43b052ec01a..91b3f65cdc3354c74fbe71a5df36d718a3cb2f89 100644 (file)
@@ -29,8 +29,9 @@ import eu.etaxonomy.taxeditor.ui.mvc.interfaces.CdmCompositeController;
  *
  * @author n.hoffmann
  */
-public class TextWithLabelElementController extends AbstractCdmFormElement implements ModifyListener, IEnableableFormElement,
-        ISelectable, CdmCompositeController {
+public class TextWithLabelElementController
+        extends AbstractCdmFormElement
+        implements ModifyListener, IEnableableFormElement, ISelectable, CdmCompositeController {
 
     protected Text text;
 //    private Label label;
index 4b0fd712874628546836e681885b50bb3a1eea23..f32e795b43283737f58022cf496afab3f37a84b3 100644 (file)
@@ -45,8 +45,8 @@ import eu.etaxonomy.taxeditor.ui.element.LayoutConstants;
  * @author n.hoffmann
  * @created Feb 26, 2010
  */
-public abstract class AbstractCdmDetailElement<T> 
-               extends AbstractCdmFormElement 
+public abstract class AbstractCdmDetailElement<T>
+               extends AbstractCdmFormElement
                implements ICdmDetailElement<T>, Observer{
 
        private T entity;
@@ -140,6 +140,17 @@ public abstract class AbstractCdmDetailElement<T>
            return enabled;
        }
 
+    @Override
+    public void setEnabled(boolean enabled) {
+        setEnabled(enabled, null);
+    }
+
+    @Override
+    public void setIrrelevant(boolean irrelevant) {
+        this.irrelevant = irrelevant;
+        setIrrelevant(irrelevant, null);
+    }
+
        /**
         * <p>
         * Setter for the field <code>irrelevant</code>.
@@ -168,17 +179,6 @@ public abstract class AbstractCdmDetailElement<T>
                }
        }
 
-       @Override
-    public void setEnabled(boolean enabled) {
-               setEnabled(enabled, null);
-       }
-
-       @Override
-    public void setIrrelevant(boolean irrelevant) {
-               this.irrelevant = irrelevant;
-               setIrrelevant(irrelevant, null);
-       }
-
        /**
         * Create all content elements
         */
index a5a26767d851787b37881bd2fad9b0392f976bc7..6fb66665da24ec028bacbc3a4479a2f814c2b489 100644 (file)
@@ -53,15 +53,17 @@ import eu.etaxonomy.taxeditor.ui.element.CdmFormFactory;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 
 /**
- * This class visualizes an CDM entity of type ENTITY and additionally provides the functionality to add
- * other elements of type ELEMENT to them.
+ * This class visualizes an CDM entity of type ENTITY and additionally provides
+ * the functionality to add other elements of type ELEMENT to them.
  *
  * @param <ENTITY> A CDM entity which should be visualized by this section.
  * @param <ELEMENT> An element that can be added (multiple times) to this entity.
  *
  * @author n.hoffmann
  */
-public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT> extends AbstractFormSection<ENTITY> implements IExpansionListener, Observer {
+public abstract class AbstractEntityCollectionSection<ENTITY, ELEMENT>
+        extends AbstractFormSection<ENTITY>
+        implements IExpansionListener, Observer {
 
     private static final EnumSet<CRUD> UPDATE = EnumSet.of(CRUD.UPDATE);
 
index e8fe0dc9017d461fc05342c99a1e404550dbf8ee..f1a1d93cacae30709d45326b98c4caaf866b0a4a 100644 (file)
@@ -22,7 +22,7 @@ import eu.etaxonomy.taxeditor.ui.element.ToggleableTextElement;
 /**
  * @author n.hoffmann
  */
-public abstract class AbstractIdentifiableEntityDetailElement<T extends IIdentifiableEntity> 
+public abstract class AbstractIdentifiableEntityDetailElement<T extends IIdentifiableEntity>
                extends AbstractCdmDetailElement<T> {
 
     private static final EnumSet<CRUD> UPDATE = EnumSet.of(CRUD.UPDATE);
index 42b76fd3a534a23996a452013c20297b2297632a..bdaa815ebf9fd29cd012ad77b24ae0688d0b1cda 100644 (file)
@@ -15,11 +15,9 @@ import eu.etaxonomy.taxeditor.ui.element.IEntityElement;
 /**
  * @author pplitzner
  * @date 30.07.2013
- *
  */
-public interface ICdmDetailElement<T> 
+public interface ICdmDetailElement<T>
                extends IEntityElement<T>, IEnableableFormElement, IConversationEnabled{
 
     public abstract void setEntity(T entity);
-
-}
+}
\ No newline at end of file
index d8a9b64e845d0c54133e7fdfb607bfc7c988f38c..78e69ea14dee819e6a9127fb04d44d481db089fe 100644 (file)
@@ -25,7 +25,6 @@ import eu.etaxonomy.taxeditor.ui.section.AbstractIdentifiableEntityDetailElement
  *
  * @author n.hoffmann
  * @created Apr 26, 2010
- * @version 1.0
  */
 public class TeamDetailElement extends AbstractIdentifiableEntityDetailElement<Team> {
 
index bb8ed81d0fedf91ac1fd297f5622bfa99caf9ca7..5c2600225ba4c6d4ab213ad2a607407523c35595 100644 (file)
@@ -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.agent;
 
 import java.util.Collection;
@@ -21,11 +20,10 @@ import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
 import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.AbstractUnboundEntityCollectionSection;
 
 /**
- * <p>TeamMemberSection class.</p>
+ * TeamMemberSection class.
  *
  * @author n.hoffmann
  * @created Apr 30, 2010
- * @version 1.0
  */
 public class TeamMemberSection extends AbstractUnboundEntityCollectionSection<Team, Person> {
 
@@ -44,37 +42,31 @@ public class TeamMemberSection extends AbstractUnboundEntityCollectionSection<Te
                isNomenclaturalTeam = isNomenclatural;
        }
 
-       /** {@inheritDoc} */
        @Override
        public String getTitleString() {
                return "Team Members";
        }
 
-       /** {@inheritDoc} */
        @Override
        public void addElement(Person element) {
                getEntity().addTeamMember(element);
        }
 
-       /** {@inheritDoc} */
        @Override
        public Person createNewElement() {
                return Person.NewTitledInstance("");
        }
 
-       /** {@inheritDoc} */
        @Override
        public String getEmptyString() {
                return "No persons yet.";
        }
 
-       /** {@inheritDoc} */
        @Override
        protected String getTooltipString() {
                return "Add a member to this team";
        }
 
-       /** {@inheritDoc} */
        @Override
        public void removeElement(Person element) {
                getEntity().removeTeamMember(element);
@@ -107,24 +99,15 @@ public class TeamMemberSection extends AbstractUnboundEntityCollectionSection<Te
         };
     }
 
-    /**
-     * @return
-     */
     public boolean isNomenclaturalTeam() {
        return isNomenclaturalTeam;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public Person addExisting() {
         return null;
     }
 
-    /**
-     * {@inheritDoc}
-     */
     @Override
     public boolean allowAddExisting() {
         return false;
index a2705b39aa6afdcf11b5ea16873d417bbe4c457a..5226bb04bda0301492ec77396d50bd23de3c8386 100644 (file)
@@ -32,34 +32,23 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
  * @author n.hoffmann
  * @created Mar 4, 2010
  */
-public class AuthorshipDetailElement 
+public class AuthorshipDetailElement
                extends AbstractIdentifiableEntityDetailElement<INonViralName> {
 
     @SuppressWarnings("rawtypes")
-       private EntitySelectionElement<TeamOrPersonBase> selectionExBasionymAuthor;
+    private EntitySelectionElement<TeamOrPersonBase> selectionExBasionymAuthor;
     @SuppressWarnings("rawtypes")
-       private EntitySelectionElement<TeamOrPersonBase> selectionBasionymAuthor;
+    private EntitySelectionElement<TeamOrPersonBase> selectionBasionymAuthor;
     @SuppressWarnings("rawtypes")
-       private EntitySelectionElement<TeamOrPersonBase> selectionExCombinationAuthor;
+    private EntitySelectionElement<TeamOrPersonBase> selectionExCombinationAuthor;
     @SuppressWarnings("rawtypes")
-       private EntitySelectionElement<TeamOrPersonBase> selectionCombinationAuthor;
+    private EntitySelectionElement<TeamOrPersonBase> selectionCombinationAuthor;
 
     private NumberWithLabelElement text_publicationYear;
     private NumberWithLabelElement text_originalPublicationYear;
-       
+
     /**
-        * <p>
         * Constructor for AuthorshipDetailElement.
-        * </p>
-        *
-        * @param cdmFormFactory
-        *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
-        *            object.
-        * @param formElement
-        *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-        *            object.
-        * @param style
-        *            a int.
         */
        public AuthorshipDetailElement(CdmFormFactory cdmFormFactory,
                        ICdmFormElement formElement, int style) {
@@ -75,7 +64,7 @@ public class AuthorshipDetailElement
                                "Authorship Cache", entity.getAuthorshipCache(),
                                entity.isProtectedAuthorshipCache(), style);
                addElement(toggleable_cache);
-          }
+           }
            NomenclaturalCode code = entity.getNameType();
 
            if (config == null || config.isAuthorshipSectionActivated()){
@@ -113,7 +102,7 @@ public class AuthorshipDetailElement
            }
        }
 
-       @Override
+    @Override
        public void updateContent() {
                if (getEntity() == null) {
                        setEntity(TaxonNameFactory.NewNonViralInstance(null));
@@ -163,9 +152,9 @@ public class AuthorshipDetailElement
 //                     toggleable_cache.setText(getEntity().getAuthorshipCache());
 //             }
 
-//              we have to notify the parent if this is embedded in the nonviral name
-//              section
-//              maybe we can handle this a little bit more elegant
+//             we have to notify the parent if this is embedded in the nonviral name
+//             section
+//             maybe we can handle this a little bit more elegant
 //             if (getParentElement() instanceof AbstractCdmDetailSection)
                        firePropertyChangeEvent(new CdmPropertyChangeEvent(
                                        getParentElement(), null));
index e23b92a9d4a0b7bdcbd3471bd4e47d4ce1d5993d..c25a0fd0e7175a83c9b493d5380b76e4bd52bd98 100644 (file)
@@ -48,20 +48,18 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<I
 
     private final Logger logger = Logger.getLogger(NameDetailElement.class);
 
-       private TermComboElement<Rank> combo_rank;
+    private SelectionArbitrator selectionArbitrator;
+
+    private TermComboElement<Rank> combo_rank;
        private TextWithLabelElement text_appendedPhrase;
        private TextWithLabelElement text_uninomial;
        private TextWithLabelElement text_infragenericEpithet;
        private TextWithLabelElement text_specificEpithet;
        private TextWithLabelElement text_infraspecificEpithet;
-       private SelectionArbitrator selectionArbitrator;
        private CheckboxElement checkbox_anamorphic;
        private TextWithLabelElement text_cultivarName;
        private TextWithLabelElement text_subGenusAuthorship;
-
        private TextWithLabelElement text_breed;
-       //private NumberWithLabelElement text_publicationYear;
-       //private NumberWithLabelElement text_originalPublicationYear;
 
        private NameDetailsConfigurator config;
 
@@ -129,14 +127,14 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<I
            }
        }
 
-       /**
-        * <p>clearCheckRankWarnings</p>
+    /**
+        * clearCheckRankWarnings
         */
        protected void clearCheckRankWarnings() {
                if(getEntity().hasProblem(ParserProblem.CheckRank)){
                        getEntity().removeParsingProblem(ParserProblem.CheckRank);
 
-                       // FIXME this has to be reafctored completely. See tickets #1959, #1663, #1957, #1958
+                       // FIXME this has to be refactored completely. See tickets #1959, #1663, #1957, #1958
 //                     TaxonNameEditor nameEditor = (TaxonNameEditor) EditorUtil.getActiveEditorPage(Page.NAME);
 //                     nameEditor.getSelectedContainer().getNameViewer().clearErrors();
                }
@@ -207,7 +205,6 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<I
        private void createCultivarNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style) {
                ICultivarPlantName cultivarName = (ICultivarPlantName)nonViralName;
                text_cultivarName = formFactory.createTextWithLabelElement(formElement, "Cultivar Name", cultivarName.getCultivarName(), style);
-
        }
 
        private void createBotanicalNameParts(ICdmFormElement formElement, INonViralName nonViralName, int style){
@@ -237,7 +234,8 @@ public class NameDetailElement extends AbstractIdentifiableEntityDetailElement<I
        }
 
        private void createInfragenerericEpithetControls(ICdmFormElement element, INonViralName nonViralName, int style){
-               if (nonViralName.getNameType() == null || nonViralName.getNameType().equals(NomenclaturalCode.ICZN)){
+               //TODO can't we unify the 2 cases?
+           if (nonViralName.getNameType() == null || nonViralName.getNameType().equals(NomenclaturalCode.ICZN)){
                        if(nonViralName.getRank() != null && nonViralName.getRank().isLower(Rank.GENUS()) ){
                                text_infragenericEpithet = formFactory.createTextWithLabelElement(element, "Infrageneric Epithet", nonViralName.getInfraGenericEpithet(), style);
                        }
index f82b52bdd4402d7f90b5b1792f24e3840f94598f..0dd3e17b4e35a047e1b28f98b243574d11640a38 100644 (file)
@@ -59,7 +59,6 @@ public class NonViralNameDetailElement
                text_nameApprobation = formFactory.createTextWithLabelElement(formElement, "Name Approbation", entity.getNameApprobation(),style);
             }
             textLsid = formFactory.createLsidWithExceptionLabelElement(formElement, "Lsid", entity.getLsid(), style);
-
         }else{
                if (config.isNameCacheActivated()){
                        toggleable_cache = formFactory.createToggleableTextField(formElement, "Cache", entity.getTitleCache(), entity.isProtectedTitleCache() || entity.isProtectedFullTitleCache(), style);
@@ -179,7 +178,7 @@ public class NonViralNameDetailElement
             ((IBacterialName)getEntity()).setNameApprobation(text_nameApprobation.getText());
         }
        }
-       
+
        private boolean checkForDeletableParts(NomenclaturalCode selection) {
                NomenclaturalCode actualCode =  getEntity().getNameType();
                if (selection.equals(actualCode)){
index c74652163ba9f71ac8675e3258fef163306c3c58..277fc11a643f56e13ef7b2bcc7b356cf207b90ca 100644 (file)
@@ -46,13 +46,6 @@ public abstract class AbstractUnboundEntityCollectionSection<ENTITY, ELEMENT> ex
 
     private boolean addUnboundElement = false;
 
-    /**
-     * @param formFactory
-     * @param conversation
-     * @param parentElement
-     * @param title
-     * @param style
-     */
     public AbstractUnboundEntityCollectionSection(CdmFormFactory formFactory, ConversationHolder conversation, ICdmFormElement parentElement, String title, int style) {
         super(formFactory, conversation, parentElement, title, style);
     }
@@ -79,9 +72,7 @@ public abstract class AbstractUnboundEntityCollectionSection<ENTITY, ELEMENT> ex
         ToolBarManager toolBarManager = new ToolBarManager(SWT.FLAT);
 
         Action addAction = new Action("add", IAction.AS_PUSH_BUTTON){
-            /* (non-Javadoc)
-             * @see org.eclipse.jface.action.Action#run()
-             */
+
             @Override
             public void run() {
                 addUnboundElement = true;
index 83ad912f50362ed1e849da5f67c1abdf1facdc1a..4014273a5eed24d7bd80899f773f2ee9023b975c 100644 (file)
@@ -92,9 +92,6 @@ public class TaxonBaseDetailElement extends AbstractIdentifiableEntityDetailElem
                if(entity instanceof Synonym){
                    //#6198 removed type as it is currently not handled correctly in the editor
 //                 combo_relationshipType = formFactory.createDefinedTermComboElement(TermType.SynonymType, formElement, "Synonym Type", ((Synonym) entity).getType(), style);
-                       //#7334 removed pro parte and partial as they are handled as concept relationships now
-//             checkProParte = formFactory.createCheckbox(formElement, "Pro Parte Synonym", ((Synonym) entity).isProParte(), style);
-//             checkPartial= formFactory.createCheckbox(formElement, "Partial Synonym", ((Synonym) entity).isPartial(), style);
                }
        }
 
index 3dde74c0dd1b3d22afc6717341006ee8a5299a53..a52231cd581468ef2e93e96c88777246ae64fb4a 100644 (file)
@@ -97,18 +97,16 @@ public class TaxonOfRelationshipElement extends  AbstractIdentifiableEntityDetai
     }
        @Override
     public void setWarnForReferencingObjects(ICdmFormElement formElement, int defaultReferencingObjects){
-        if (getEntity() instanceof Taxon){
-            Taxon taxon = getEntity();
-            if (taxon.getId() != 0){
-                long referencingObjectsCount = CdmStore.getCommonService().getReferencingObjectsCount(taxon);
-
-                if (referencingObjectsCount > defaultReferencingObjects){
-                    setWarnForReferencedObjects(formFactory.createLabel(formElement, CdmUtils.Nz("The "+ taxon.getUserFriendlyTypeName()+" is referenced by " + (referencingObjectsCount - defaultReferencingObjects)+ " other object(s), if you change it, it is changed for all these objects")));
-                    getWarnForReferencedObjects().setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
-                    getWarnForReferencedObjects().setLayout(LayoutConstants.FILL(2, 3));
-                    getWarnForReferencedObjects().setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
-                    formFactory.createLabel(formElement, "");
-                }
+        Taxon taxon = getEntity();
+        if (taxon.getId() != 0){
+            long referencingObjectsCount = CdmStore.getCommonService().getReferencingObjectsCount(taxon);
+
+            if (referencingObjectsCount > defaultReferencingObjects){
+                setWarnForReferencedObjects(formFactory.createLabel(formElement, CdmUtils.Nz("The "+ taxon.getUserFriendlyTypeName()+" is referenced by " + (referencingObjectsCount - defaultReferencingObjects)+ " other object(s), if you change it, it is changed for all these objects")));
+                getWarnForReferencedObjects().setBackground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+                getWarnForReferencedObjects().setLayout(LayoutConstants.FILL(2, 3));
+                getWarnForReferencedObjects().setForeground(Display.getCurrent().getSystemColor(SWT.COLOR_RED));
+                formFactory.createLabel(formElement, "");
             }
         }
     }
index 8299ee30849259d37ab442512360aff192076879..933feec2253e3eda33e8f8721f1725656d73fd63 100644 (file)
@@ -39,6 +39,7 @@ import eu.etaxonomy.cdm.model.permission.CRUD;
 import eu.etaxonomy.cdm.model.permission.Group;\r
 import eu.etaxonomy.cdm.model.permission.User;\r
 import eu.etaxonomy.cdm.model.reference.Reference;\r
+import eu.etaxonomy.taxeditor.model.AbstractUtility;\r
 import eu.etaxonomy.taxeditor.model.ImageResources;\r
 import eu.etaxonomy.taxeditor.preference.Resources;\r
 import eu.etaxonomy.taxeditor.store.CdmStore;\r
@@ -61,9 +62,10 @@ import eu.etaxonomy.taxeditor.ui.section.grantedAuthority.GrantedAuthorityLabelT
  * @author n.hoffmann\r
  * @created Nov 17, 2009\r
  */\r
-public class EntitySelectionElement<T extends CdmBase> extends\r
-               AbstractCdmFormElement implements  SelectionListener, IEnableableFormElement, ISelectableElement, IEntityElement<T>, ILabeledElement, //IConversationEnabled,\r
-               Observer {\r
+public class EntitySelectionElement<T extends CdmBase>\r
+        extends AbstractCdmFormElement\r
+        implements  SelectionListener, IEnableableFormElement, ISelectableElement,\r
+            IEntityElement<T>, ILabeledElement, Observer {\r
 \r
        private static final EnumSet<CRUD> UPDATE = EnumSet.of(CRUD.UPDATE);\r
        private static final EnumSet<CRUD> DELETE = EnumSet.of(CRUD.DELETE);\r
@@ -185,8 +187,7 @@ public class EntitySelectionElement<T extends CdmBase> extends
                addControl(text);\r
 \r
                text.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());\r
-               text.setBackground(StoreUtil\r
-                               .getColor(Resources.COLOR_TEXT_DISABLED_BACKGROUND));\r
+               text.setBackground(AbstractUtility.getColor(Resources.COLOR_TEXT_DISABLED_BACKGROUND));\r
                if (limit != null){\r
                    text.setTextLimit(limit);\r
                }\r
@@ -232,18 +233,17 @@ public class EntitySelectionElement<T extends CdmBase> extends
        @Override\r
     public void widgetSelected(SelectionEvent e) {\r
            if (e.getSource().equals(button_selection) ){\r
-               T selection = SelectionDialogFactory.getSelectionFromDialog(clazz, getShell(), //getConversationHolder(),\r
+               T selection = SelectionDialogFactory.getSelectionFromDialog(clazz, getShell(),\r
                        getEntity(), getParentElement());\r
             setSelectionInternal(selection);\r
             if(!getLayoutComposite().isDisposed()){\r
                 StoreUtil.reflowParentScrolledForm(getLayoutComposite(), true);\r
             }\r
            }else{\r
-               Reference selection = SelectionDialogFactory.getSelectionFromExtDialog(Reference.class, getShell(),//null,\r
+               Reference selection = SelectionDialogFactory.getSelectionFromExtDialog(Reference.class, getShell(),\r
                        getParentElement());\r
             setSelectionInternal((T)selection);\r
            }\r
-\r
        }\r
 \r
     public T getFilteredEntity() {\r
@@ -370,7 +370,7 @@ public class EntitySelectionElement<T extends CdmBase> extends
                String colorId = irrelevant ? Resources.COLOR_COMPOSITE_IRRELEVANT\r
                                : Resources.COLOR_TEXT_DISABLED_BACKGROUND;\r
 \r
-               Color color = StoreUtil.getColor(colorId);\r
+               Color color = AbstractUtility.getColor(colorId);\r
                text.setBackground(color);\r
        }\r
 \r