cleanup
authorAndreas Müller <a.mueller@bgbm.org>
Tue, 31 May 2022 16:12:13 +0000 (18:12 +0200)
committerAndreas Müller <a.mueller@bgbm.org>
Tue, 31 May 2022 16:12:13 +0000 (18:12 +0200)
20 files changed:
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationException.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmChangeListener.java
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmDataChangeService.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java
eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java
eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveTaxonNodeHandlerE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectorSelectionDialog.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/TermTreeDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeContentProvider.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataViewerE4.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElementTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElementTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElementTest.java
eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElementTest.java

index 36acd3dadb67c8b0290bfcb72fa437f764134818..690ebb6073923bf52a27656447a7894a9ee28ddc 100644 (file)
@@ -19,5 +19,4 @@ public class CdmApplicationException extends Exception {
     public CdmApplicationException(Exception ex) {
         super(ex);
     }
-
-}
+}
\ No newline at end of file
index 8351dcbc844170d4cf66e5430e38e30c8e189497..3a3f9e4f4be00f251b52016571af6df3a545e049 100644 (file)
@@ -15,5 +15,4 @@ package eu.etaxonomy.cdm.api.application;
 public interface ICdmChangeListener {
 
     public void onChange(CdmChangeEvent event);
-
-}
+}
\ No newline at end of file
index 04440bcaa8d87a15114b1346d3766d4853ece67a..d7928f70af33c2b18fad2b813a566f97f2541fe8 100644 (file)
@@ -14,7 +14,6 @@ import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Properties;
 import java.util.Set;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -168,7 +167,7 @@ public class CharacterMatrixPart implements IE4SavablePart, IConversationEnabled
             matrix.createTable(treeView, true, true);
             thisPart.setLabel(descriptiveDataSet.getTitleCache());
             matrix.loadDescriptions( true, true);
-           
+
         }
     }
 
index 3a1713e8620ec9b9d68800cee0143a13cbd3f54e..1130d242b7bd3ed203519d42325e2790144d4f9a 100755 (executable)
@@ -28,31 +28,23 @@ import org.eclipse.e4.ui.services.IServiceConstants;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.window.Window;
 import org.eclipse.jface.wizard.WizardDialog;
-import org.eclipse.nebula.widgets.nattable.data.IRowDataProvider;
-import org.eclipse.swt.widgets.Display;
 
 import eu.etaxonomy.cdm.api.application.CdmApplicationState;
 import eu.etaxonomy.cdm.api.service.IDescriptiveDataSetService;
 import eu.etaxonomy.cdm.api.service.UpdateResult;
 import eu.etaxonomy.cdm.api.service.description.AggregationMode;
 import eu.etaxonomy.cdm.api.service.description.StructuredDescriptionAggregationConfiguration;
-import eu.etaxonomy.cdm.api.service.dto.DescriptionBaseDto;
 import eu.etaxonomy.cdm.api.service.dto.TaxonRowWrapperDTO;
 import eu.etaxonomy.cdm.common.monitor.IProgressMonitor;
 import eu.etaxonomy.cdm.common.monitor.IRemotingProgressMonitor;
 import eu.etaxonomy.cdm.filter.TaxonNodeFilter;
-import eu.etaxonomy.cdm.model.common.CdmBase;
-import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptiveDataSet;
 import eu.etaxonomy.cdm.model.description.TaxonDescription;
-import eu.etaxonomy.cdm.persistence.dto.DescriptiveDataSetBaseDto;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
 import eu.etaxonomy.cdm.persistence.dto.TermDto;
 import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrix;
 import eu.etaxonomy.taxeditor.editor.descriptiveDataSet.matrix.CharacterMatrixPart;
 import eu.etaxonomy.taxeditor.editor.internal.TaxeditorEditorPlugin;
-import eu.etaxonomy.taxeditor.event.EventUtility;
-import eu.etaxonomy.taxeditor.event.WorkbenchEventConstants;
 import eu.etaxonomy.taxeditor.model.AbstractUtility;
 import eu.etaxonomy.taxeditor.model.MessagingUtils;
 import eu.etaxonomy.taxeditor.operation.IFeedbackGenerator;
@@ -71,13 +63,13 @@ public class AggregationHandler {
 
         // dependent on the selection the specimens are filtered
         CharacterMatrixPart matrixPart = (CharacterMatrixPart) activePart.getObject();
-       
+
         CharacterMatrix matrix = matrixPart.getMatrix();
         if(StoreUtil.promptCheckIsDirty(matrixPart)){
             return;
         }
 
-        
+
         //ranks
         UUID minRankUuid = matrix.getDescriptiveDataSet().getMinRank() != null? matrix.getDescriptiveDataSet().getMinRank().getUuid(): null;
         UUID maxRankUuid = matrix.getDescriptiveDataSet().getMaxRank() != null? matrix.getDescriptiveDataSet().getMaxRank().getUuid(): null;
@@ -126,7 +118,7 @@ public class AggregationHandler {
         if (open != Window.OK){
             return;
         }
-        
+
         //job
         String jobLabel = "Aggregate Descriptive Dataset";
         UUID monitorUuid =  CdmApplicationState.getLongRunningTasksService().invoke(config);
@@ -159,20 +151,16 @@ public class AggregationHandler {
                                        TaxonRowWrapperDTO rowWrapper = CdmStore.getService(IDescriptiveDataSetService.class).createTaxonRowWrapper(updatedObj, matrix.getDescriptiveDataSet().getUuid());
                                        boolean isRemoved = matrixPart.getMatrix().getDescriptions().remove(rowWrapper);
                                        matrixPart.getMatrix().getDescriptions().add(rowWrapper);
-
                        }
-                      
-                    
                 }
             } catch (InterruptedException e) {
                 return;
             }
-            
+
             monitor.done();
         });
 
         job.schedule();
-        
     }
 
     @CanExecute
index da718cca50686d07087c48a60c5ed9967c3378a9..41c634fb0f70328564f12eb841e7645523517fcb 100755 (executable)
@@ -80,20 +80,15 @@ import eu.etaxonomy.taxeditor.store.CdmStore;
 import eu.etaxonomy.taxeditor.store.LoginManager;
 import eu.etaxonomy.taxeditor.store.internal.TaxeditorStorePlugin;
 import eu.etaxonomy.taxeditor.ui.dialog.RemotingLoginDialog;
-import eu.etaxonomy.taxeditor.workbench.datasource.ICdmServerError;
-
-
 
 /**
  * @author cmathew
  * @date 20 Jan 2015
  */
-public class RemotingLoginDialogLocal extends RemotingLoginDialog implements ICdmServerError{
+public class RemotingLoginDialogLocal extends RemotingLoginDialog {
 
     private Logger logger = Logger.getLogger(getClass());
 
-
-
 //    protected Shell shlConnect;
 //    private Text txtCdmServerStatus;
 //    private Text txtCdmInstanceStatus;
index a4803d9e87ed450885f2f9c1fecd32883485ff3d..59192fe14617a0d64541c73179ca16cef499898b 100644 (file)
@@ -175,8 +175,6 @@ public class MoveTaxonNodeHandlerE4 extends CdmHandlerE4 {
             }
         }
 
-
-
         if(parentTaxonNode != null){
             if(NavigationUtil.isDirty(parentTaxonNode, partService)){
                 MessageDialog.openWarning(shell,
index ab17e7ff7d1c5f94f789eb662025ef7b6a3b5bff..7acb7c9b31b2e66b3846e9e5e3471307e34024a1 100755 (executable)
@@ -8,7 +8,6 @@
 */
 package eu.etaxonomy.taxeditor.ui.dialog.selection;
 
-import java.lang.reflect.Member;
 import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.Iterator;
@@ -56,13 +55,13 @@ public class CollectorSelectionDialog extends AgentSelectionDialog<AgentBase<?>>
         super(shell, title, multi, settings, agent, selectTeamMember);
         if (selectTeamMember && agent instanceof Team){
                this.collectorTeam = (Team)agent;
-               
+
        }
 
     }
     public static <S extends AgentBase> S select(Shell shell,
             S entity, boolean selectTeamMember) {
-       
+
         CollectorSelectionDialog dialog = new CollectorSelectionDialog(shell,
                 "Choose Collector", false, CollectorSelectionDialog.class.getCanonicalName(), entity, selectTeamMember);
         return  (S) getSelectionFromDialog(dialog);
@@ -72,7 +71,7 @@ public class CollectorSelectionDialog extends AgentSelectionDialog<AgentBase<?>>
     protected ILabelProvider createListLabelProvider() {
         return new CollectorLabelProvider();
     }
-    
+
     @Override
        protected AbstractNewEntityWizard getNewEntityWizard(String parameter) {
        if(TEAM.equals(parameter)){
@@ -84,7 +83,6 @@ public class CollectorSelectionDialog extends AgentSelectionDialog<AgentBase<?>>
         else{
             throw new IllegalArgumentException("Could not determine the desired wizard.");
         }
-    
        }
 
     public class CollectorLabelProvider extends LabelProvider {
@@ -116,9 +114,8 @@ public class CollectorSelectionDialog extends AgentSelectionDialog<AgentBase<?>>
 
             return title;
         }
-
-
     }
+
     @Override
     protected void callService(String pattern) {
         Class clazz = AgentBase.class;
@@ -128,10 +125,10 @@ public class CollectorSelectionDialog extends AgentSelectionDialog<AgentBase<?>>
         Set<UUID> memberUuids = new HashSet<>();
         if (collectorTeam != null && selectTeamMember){
                List<Person> teamMembers = this.collectorTeam.getTeamMembers();
-               
+
             teamMembers.forEach(member -> memberUuids.add(member.getUuid()));
         }
-        
+
         model = CdmStore.getService(IAgentService.class).getUuidAndTitleCacheWithCollectorTitleCache(clazz, limitOfInitialElements, pattern);
         if (collectorTeam == null){
                return;
index d147e6d42d0c012f789fe15e016736cab117fc83..0c9a1d31f34a2e275f4b9d76adfe3075a459c8c9 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.element;
 
 import java.util.ArrayList;
@@ -37,13 +36,9 @@ import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement;
 import eu.etaxonomy.taxeditor.ui.translation.TranslationWizard;
 
 /**
- * <p>
- * MultilanguageTextElement class.
- * </p>
  *
  * @author n.hoffmann
  * @created Sep 29, 2010
- * @version 1.0
  */
 public class MultilanguageTextElement extends AbstractCdmFormElement implements
                SelectionListener, IEnableableFormElement {
@@ -54,13 +49,6 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                        super();
                }
 
-               /*
-                * (non-Javadoc)
-                *
-                * @see
-                * org.eclipse.swt.events.SelectionAdapter#widgetSelected(org.eclipse
-                * .swt.events.SelectionEvent)
-                */
                @Override
                public void widgetSelected(SelectionEvent e) {
                        Map<Language, LanguageString> multilanguageText = getMultilanguageText();
@@ -78,7 +66,6 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                                combo_language.setTerms(getLanguages());
                                updateControls();
                        }
-
                }
        }
 
@@ -93,26 +80,6 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
 
        private Map<Language, LanguageString> multilanguageText;
 
-       /**
-        * <p>
-        * Constructor for MultilanguageTextElement.
-        * </p>
-        *
-        * @param formFactory
-        *            a {@link eu.etaxonomy.taxeditor.ui.element.CdmFormFactory}
-        *            object.
-        * @param formElement
-        *            a {@link eu.etaxonomy.taxeditor.ui.element.ICdmFormElement}
-        *            object.
-        * @param labelString
-        *            a {@link java.lang.String} object.
-        * @param multilanguageText
-        *            a {@link java.util.Map} object.
-        * @param textHeight
-        *            a {@link java.lang.Integer} object.
-        * @param style
-        *            a int.
-        */
        public MultilanguageTextElement(CdmFormFactory formFactory,
                        ICdmFormElement formElement, String labelString,
                        Map<Language, LanguageString> multilanguageText,
@@ -163,14 +130,6 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                return languageList;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.swt.events.SelectionListener#widgetSelected(org.eclipse.swt
-        * .events.SelectionEvent)
-        */
-       /** {@inheritDoc} */
        @Override
        public void widgetSelected(SelectionEvent e) {
            if (PreferencesUtil.isMultilanguageTextEditingCapability()) {
@@ -184,26 +143,10 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
            }
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * org.eclipse.swt.events.SelectionListener#widgetDefaultSelected(org.eclipse
-        * .swt.events.SelectionEvent)
-        */
-       /** {@inheritDoc} */
        @Override
        public void widgetDefaultSelected(SelectionEvent e) {
        }
 
-       /**
-        * <p>
-        * Setter for the field <code>multilanguageText</code>.
-        * </p>
-        *
-        * @param multilanguageText
-        *            the multilanguageText to set
-        */
        public void setMultilanguageText(
                        Map<Language, LanguageString> multilanguageText) {
                this.multilanguageText = multilanguageText;
@@ -215,7 +158,6 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                        }
                        updateControls();
                }
-
        }
 
        @Override
@@ -232,12 +174,8 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                    this.element_languageString.setText(multilanguageText.get(CdmStore.getDefaultLanguage()).getText());
                }
            }
-
        }
 
-       /**
-        *
-        */
        private void updateControls() {
                LanguageString preferredLanguageString = MultilanguageTextHelper
                                .getPreferredLanguageString(getMultilanguageText(),
@@ -252,25 +190,10 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                }
        }
 
-       /**
-        * <p>
-        * Getter for the field <code>multilanguageText</code>.
-        * </p>
-        *
-        * @return the multilanguageText
-        */
        public Map<Language, LanguageString> getMultilanguageText() {
                return multilanguageText;
        }
 
-       /*
-        * (non-Javadoc)
-        *
-        * @see
-        * eu.etaxonomy.taxeditor.forms.AbstractCdmFormElement#propertyChange(org
-        * .eclipse.jface.util.PropertyChangeEvent)
-        */
-       /** {@inheritDoc} */
        @Override
        public void propertyChange(PropertyChangeEvent event) {
                if (event == null) {
@@ -298,7 +221,6 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
                combo_language.setEnabled(enabled);
            }
            element_languageString.setEnabled(enabled);
-
        }
 
        public void setIndent(int indent){
@@ -309,5 +231,4 @@ public class MultilanguageTextElement extends AbstractCdmFormElement implements
     public boolean isEnabled() {
         return isEnabled;
     }
-
-}
+}
\ No newline at end of file
index a60b1e41c469f4663d252cdf9904a0d5391e294a..fdf19ed5ffb73ae63acf8dfad96ca1d03a84c4c5 100644 (file)
@@ -22,10 +22,8 @@ import eu.etaxonomy.taxeditor.ui.element.TextWithLabelElement;
 import eu.etaxonomy.taxeditor.ui.section.AbstractCdmDetailElement;
 
 /**
- *
  * @author pplitzner
  * @since Dec 21, 2017
- *
  */
 public class TermTreeDetailElement extends AbstractCdmDetailElement<TermTreeDto> {
 
@@ -40,7 +38,6 @@ public class TermTreeDetailElement extends AbstractCdmDetailElement<TermTreeDto>
                super(formFactory, formElement);
        }
 
-
        @Override
        protected void createControls(ICdmFormElement formElement, TermTreeDto entity, int style) {
            Label lblTermType = new Label(formElement.getLayoutComposite(), style);
@@ -62,8 +59,6 @@ public class TermTreeDetailElement extends AbstractCdmDetailElement<TermTreeDto>
            if (entity.containsSubtrees()){
                isFlat.setEnabled(false);
            }
-
-
        }
 
        @Override
@@ -87,6 +82,5 @@ public class TermTreeDetailElement extends AbstractCdmDetailElement<TermTreeDto>
                getEntity().setFlat(isFlat.getSelection());
            }
            EventUtility.postEvent(WorkbenchEventConstants.ADD_SAVE_CANDIDATE, getEntity());
-
        }
 }
\ No newline at end of file
index 8e92ff33be51a67858f7763279bfe8de1982547a..3862e0bf983f2c0b1d26d88077049cca58b2e5db 100644 (file)
@@ -34,7 +34,6 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement;
 /**
  * @author n.hoffmann
  * @date Dec 1, 2011
- *
  */
 public class TaxonRelationshipDetailElement extends AbstractSingleSourceElement<TaxonRelationship> {//TODO: use AbstractSingleSourcedElement
 
@@ -48,7 +47,6 @@ public class TaxonRelationshipDetailElement extends AbstractSingleSourceElement<
        private  EntitySelectionElement<Reference> sensuReference;
        private TextWithLabelElement text_sensu_microreference;
 
-
 //     private TextWithLabelElement text_secundum_microreference;
 
        private TextWithLabelElement text_appendedPhrase;
@@ -197,10 +195,7 @@ public class TaxonRelationshipDetailElement extends AbstractSingleSourceElement<
                     formElement, "Related Taxon", getRelatedTaxon(),
                     EntitySelectionElement.SELECTABLE, style);
             checkBoxDoubtful = formFactory.createCheckbox(formElement, "Relation Doubtful", entity.isDoubtful(), style);
-
-
                }
-
        }
 
        private Taxon getRelatedTaxon() {
@@ -273,7 +268,6 @@ public class TaxonRelationshipDetailElement extends AbstractSingleSourceElement<
        @Override
        public void refresh(){
                 updateContent();
-
         }
 
        @Override
@@ -282,7 +276,6 @@ public class TaxonRelationshipDetailElement extends AbstractSingleSourceElement<
                if (taxonElement!=null) {
                        taxonElement.setEntity(entity.getFromTaxon());
         }
-
        }
 
     @Override
@@ -290,7 +283,4 @@ public class TaxonRelationshipDetailElement extends AbstractSingleSourceElement<
         // TODO Auto-generated method stub
         return null;
     }
-
-
-
-}
+}
\ No newline at end of file
index d919578322ff410fb3d26f1a32d05c2119e5108c..b657f6800d78027998c664f8c22b55f0aecef4f9 100644 (file)
@@ -18,10 +18,6 @@ import org.eclipse.jface.viewers.ITreeContentProvider;
 import eu.etaxonomy.cdm.api.service.ITaxonNodeService;
 import eu.etaxonomy.cdm.model.taxon.TaxonNode;
 import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDto;
-import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByNameComparator;
-import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoByRankAndNameComparator;
-import eu.etaxonomy.cdm.persistence.dto.TaxonNodeDtoNaturalComparator;
-import eu.etaxonomy.taxeditor.preference.NavigatorOrderEnum;
 import eu.etaxonomy.taxeditor.preference.PreferencesUtil;
 import eu.etaxonomy.taxeditor.store.CdmStore;
 
@@ -38,7 +34,7 @@ public class TaxonTreeNodeContentProvider implements ITreeContentProvider {
     @Override
     public Object[] getElements(Object inputElement) {
         if(inputElement instanceof Collection){
-            return ((Collection) inputElement).toArray();
+            return ((Collection<?>) inputElement).toArray();
         }
         return this.getChildren(inputElement);
     }
@@ -62,7 +58,7 @@ public class TaxonTreeNodeContentProvider implements ITreeContentProvider {
 //            children = childrenSet.toArray();
 //        }
         List<TaxonNodeDto> childrenList = null;
-        
+
         if(parentElement instanceof TaxonNode){
                childrenList = taxonNodeService.listChildNodesAsTaxonNodeDto((TaxonNode)parentElement);
         }else {
@@ -74,7 +70,7 @@ public class TaxonTreeNodeContentProvider implements ITreeContentProvider {
         return children != null ? children : NO_CHILDREN;
     }
 
-       
+
 
     @Override
     public Object getParent(Object element) {
index cf8d5743931aec2c11237ef685ccc14d70cc18df..e3fbf613ebcece2c96c21f5a85c90fff1e03aebb 100644 (file)
@@ -1,4 +1,3 @@
-// $Id$
 /**
 * Copyright (C) 2017 EDIT
 * European Distributed Institute of Taxonomy
@@ -14,7 +13,6 @@ import javax.inject.Inject;
 
 import org.eclipse.e4.core.contexts.ContextInjectionFactory;
 import org.eclipse.e4.core.contexts.IEclipseContext;
-import org.eclipse.e4.core.services.log.Logger;
 import org.eclipse.e4.ui.model.application.ui.basic.MPart;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.StructuredSelection;
@@ -38,11 +36,8 @@ import eu.etaxonomy.taxeditor.workbench.part.ISelectionElementEditingPart;
 /**
  * @author pplitzner
  * @date 18.07.2017
- *
  */
 public class DetailsPartE4 extends AbstractCdmEditorPartE4 implements IPartContentHasSupplementalData, IPartContentHasFactualData {
-       @Inject
-       private Logger logger;
 
        @Inject
     public DetailsPartE4() {
index fb9c0cda111d7867a7fcc8ac9a6dcc6ae8c3a798..a1474bd1dd5c8fba1537caa14d240249ee3929fd 100755 (executable)
@@ -15,13 +15,11 @@ import java.util.Set;
 
 import javax.inject.Inject;
 
-import org.apache.lucene.search.BulkScorer;
 import org.eclipse.e4.core.di.annotations.Optional;
 import org.eclipse.e4.ui.di.UIEventTopic;
 import org.eclipse.jface.viewers.ISelection;
 import org.eclipse.jface.viewers.IStructuredSelection;
 import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.jface.viewers.StructuredSelection;
 import org.eclipse.jface.viewers.TreeNode;
 import org.eclipse.swt.SWT;
 import org.springframework.security.core.GrantedAuthority;
@@ -32,7 +30,6 @@ import eu.etaxonomy.cdm.ext.occurrence.gbif.GbifResponse;
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.agent.Team;
 import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
-import eu.etaxonomy.cdm.model.common.CdmBase;
 import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.description.CategoricalData;
 import eu.etaxonomy.cdm.model.description.Character;
@@ -55,7 +52,6 @@ import eu.etaxonomy.cdm.model.permission.CRUD;
 import eu.etaxonomy.cdm.model.permission.Group;
 import eu.etaxonomy.cdm.model.permission.User;
 import eu.etaxonomy.cdm.model.reference.Reference;
-import eu.etaxonomy.cdm.model.taxon.SecundumSource;
 import eu.etaxonomy.cdm.model.taxon.Synonym;
 import eu.etaxonomy.cdm.model.taxon.Taxon;
 import eu.etaxonomy.cdm.model.taxon.TaxonBase;
@@ -85,7 +81,6 @@ import eu.etaxonomy.taxeditor.store.StoreUtil;
 import eu.etaxonomy.taxeditor.store.UsageTermCollection;
 import eu.etaxonomy.taxeditor.termtree.e4.ICharacterEditor;
 import eu.etaxonomy.taxeditor.ui.element.ICdmFormElement;
-import eu.etaxonomy.taxeditor.ui.element.IEnableableFormElement;
 import eu.etaxonomy.taxeditor.ui.element.RootElement;
 import eu.etaxonomy.taxeditor.ui.section.agent.PersonDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.agent.TeamDetailSection;
@@ -138,7 +133,6 @@ import eu.etaxonomy.taxeditor.ui.section.occurrence.dna.TissueSampleGeneralDetai
 import eu.etaxonomy.taxeditor.ui.section.occurrence.media.MediaSpecimenGeneralDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.reference.NomenclaturalSourceDetailSection;
 import eu.etaxonomy.taxeditor.ui.section.reference.ReferenceDetailSection;
-import eu.etaxonomy.taxeditor.ui.section.reference.SecundumSourceSection;
 import eu.etaxonomy.taxeditor.ui.section.supplemental.RightsSection;
 import eu.etaxonomy.taxeditor.ui.section.supplemental.identifier.DerivedUnitFacadeIdentifierSection;
 import eu.etaxonomy.taxeditor.ui.section.taxon.ParsingMessagesSection;
@@ -214,8 +208,8 @@ public class DetailsViewerE4 extends AbstractCdmDataViewer {
             input = DerivedUnitFacade.NewInstance(SpecimenOrObservationType.FieldUnit, (FieldUnit) input);
         }
         super.setInput(input);
-        
-        
+
+
     }
 
     @Override
@@ -273,7 +267,7 @@ public class DetailsViewerE4 extends AbstractCdmDataViewer {
             createTeamOrPersonBaseDetailSection(rootElement);
 
         } else if (input instanceof DescriptionBase) {
-            if ((((DescriptionBase)input).isComputed() || ((DescriptionBase)input).isCloneForSource())&& PreferencesUtil.isComputedDesciptionHandlingDisabled()){
+            if ((((DescriptionBase<?>)input).isComputed() || ((DescriptionBase<?>)input).isCloneForSource())&& PreferencesUtil.isComputedDesciptionHandlingDisabled()){
                 this.setDetailsEnabled(false);
             }
             if(input instanceof SpecimenDescription){
@@ -295,10 +289,10 @@ public class DetailsViewerE4 extends AbstractCdmDataViewer {
                 } else if (isUseDescription) {
                     createUseDescriptionSection(rootElement);
                 } else if (input instanceof TaxonDescription){
-                    createTaxonDescriptionSection(rootElement, !(((DescriptionBase) input).isComputed() && PreferencesUtil.isComputedDesciptionHandlingDisabled()));
+                    createTaxonDescriptionSection(rootElement, !(((DescriptionBase<?>) input).isComputed() && PreferencesUtil.isComputedDesciptionHandlingDisabled()));
 
                 } else{
-                    createDescriptionSection(rootElement, false, !(((DescriptionBase) input).isComputed() && PreferencesUtil.isComputedDesciptionHandlingDisabled()));
+                    createDescriptionSection(rootElement, false, !(((DescriptionBase<?>) input).isComputed() && PreferencesUtil.isComputedDesciptionHandlingDisabled()));
                 }
             }
         } else if (input instanceof DescriptionElementBase){
@@ -487,7 +481,7 @@ public class DetailsViewerE4 extends AbstractCdmDataViewer {
         TaxonBase<?> taxonBase = (TaxonBase<?>)getInput();
         if (hasPermission){
             // check for subtree permissions as well.
-            
+
             Taxon acceptedTaxon = null;
             if (taxonBase instanceof Taxon){
                 acceptedTaxon = (Taxon)taxonBase;
@@ -1020,8 +1014,8 @@ public class DetailsViewerE4 extends AbstractCdmDataViewer {
     @Optional
     private void updateView(@UIEventTopic(WorkbenchEventConstants.REFRESH_DETAILS_DISTRIBUTION)String nameCache){
         if(nameCache != null && getInput() instanceof Distribution && this.activePart instanceof IDistributionEditorPart){
-           if (part instanceof CdmSectionPart && ((CdmSectionPart)part).getSection() instanceof DescriptionElementDetailSection){
-               for (ICdmFormElement element: ((DescriptionElementDetailSection)((CdmSectionPart)part).getSection()).getElements()){
+           if (part instanceof CdmSectionPart && ((CdmSectionPart<?>)part).getSection() instanceof DescriptionElementDetailSection){
+               for (ICdmFormElement element: ((DescriptionElementDetailSection)((CdmSectionPart<?>)part).getSection()).getElements()){
                    if (element instanceof DescriptionElementDetailElement){
                        for(ICdmFormElement descriptionElement:((DescriptionElementDetailElement)element).getElements()){
                            if (descriptionElement instanceof DistributionDetailElement){
index 565b3c7e42cca8cbd1c07fa9298a166b0a8d482f..6c066be0eacd4f52bc8e9598b89d46f3ec0213c8 100644 (file)
@@ -91,7 +91,6 @@ public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
                            showEmptyPage();
                            return;
                        }
-
                    }
                }
                // do not show supplemental data for feature nodes
@@ -125,7 +124,7 @@ public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
             }
                else if(structuredSelection.getFirstElement() instanceof DescriptionBase ){
 
-                if (((DescriptionBase)structuredSelection.getFirstElement()).isComputed() || ((DescriptionBase)structuredSelection.getFirstElement()).isCloneForSource()){
+                if (((DescriptionBase<?>)structuredSelection.getFirstElement()).isComputed() || ((DescriptionBase<?>)structuredSelection.getFirstElement()).isCloneForSource()){
                     if (PreferencesUtil.isComputedDesciptionHandlingDisabled()){
                         setEnabled(false);
                     }else{
@@ -170,7 +169,6 @@ public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
                             null,
                             e,
                             true);
-
                 }
                }
         }
@@ -188,4 +186,4 @@ public class SupplementalDataPartE4 extends AbstractCdmEditorPartE4 {
             viewer.refresh();
         }
     }
-}
+}
\ No newline at end of file
index 20fff4d48a1c2110e33e68e20615981158c62dbb..4e7a2134197aaa62d5d64c6167742c3baf7514e8 100644 (file)
@@ -134,7 +134,7 @@ public class SupplementalDataViewerE4 extends AbstractCdmDataViewer {
 
         addPart(annotationSection);
         addPart(markerSection);
-        
+
     }
 
     private void createIdentifiableSections(RootElement parent) {
@@ -200,11 +200,9 @@ public class SupplementalDataViewerE4 extends AbstractCdmDataViewer {
 
        public void setEnabled(boolean doEnable){
            for (IFormPart section: this.managedForm.getParts()){
-               if (section instanceof CdmSectionPart && !((CdmSectionPart)section).getSection().isDisposed()){
-                   ((CdmSectionPart)section).getSection().setEnabled(doEnable);
+               if (section instanceof CdmSectionPart && !((CdmSectionPart<?>)section).getSection().isDisposed()){
+                   ((CdmSectionPart<?>)section).getSection().setEnabled(doEnable);
                }
            }
-
        }
-
-}
+}
\ No newline at end of file
index 46f922715036ee50187b1daf9ed03a81b03a9362..da662230c969476f08235b7c38c36d09db78cc3f 100644 (file)
@@ -18,7 +18,6 @@ import eu.etaxonomy.taxeditor.test.AbstractEditorTest;
  * should be handled by different tests.\r
  *\r
  * @author n.hoffmann\r
- *\r
  */\r
 public abstract class AbstractSelectionElementTest extends AbstractEditorTest{\r
 \r
@@ -26,5 +25,4 @@ public abstract class AbstractSelectionElementTest extends AbstractEditorTest{
        public void tearDown() {\r
                utils.cancel();\r
        }\r
-\r
-}\r
+}
\ No newline at end of file
index 6bb2f2df455b2c9bebecad00b21dac724614636d..3c7df0565011bdddd5d9cb32b0774741b2f84b20 100644 (file)
@@ -18,7 +18,6 @@ import org.junit.Test;
  * should be handled by different tests.\r
  *\r
  * @author n.hoffmann\r
- *\r
  */\r
 @Ignore\r
 public class ClassificationSelectionElementTest extends AbstractSelectionElementTest{\r
index da607b5c606c442df2c1cb7c0cffedd4ae068f57..83489273702b5ed4b52cf3d4091e43fa27423fe6 100644 (file)
@@ -14,7 +14,6 @@ import org.junit.Test;
 \r
 /**\r
  * @author n.hoffmann\r
- *\r
  */\r
 @Ignore\r
 public class NameSelectionElementTest extends AbstractSelectionElementTest {\r
index 89c6f01641cc9f8c768691675b2cd01f8aa1cfd6..9a54d3abf8679a067952b116a88d975094402735 100644 (file)
@@ -14,7 +14,6 @@ import org.junit.Test;
 \r
 /**\r
  * @author n.hoffmann\r
- *\r
  */\r
 @Ignore\r
 public class TaxonNodeSelectionElementTest extends AbstractSelectionElementTest {\r
@@ -30,5 +29,4 @@ public class TaxonNodeSelectionElementTest extends AbstractSelectionElementTest
                utils.openFilteredSelection(1, "Select parent taxon");\r
                utils.cancel();\r
        }\r
-\r
-}\r
+}
\ No newline at end of file