From 159e7b25a0744c59fb1d4fbde01d1c4f03b84c33 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andreas=20M=C3=BCller?= Date: Tue, 31 May 2022 18:12:13 +0200 Subject: [PATCH] cleanup --- .../application/CdmApplicationException.java | 3 +- .../api/application/ICdmChangeListener.java | 3 +- .../application/ICdmDataChangeService.java | 2 +- .../matrix/CharacterMatrixPart.java | 3 +- .../matrix/handler/AggregationHandler.java | 20 +---- .../server/RemotingLoginDialogLocal.java | 7 +- .../e4/handler/MoveTaxonNodeHandlerE4.java | 2 - .../selection/CollectorSelectionDialog.java | 15 ++-- .../ui/element/MultilanguageTextElement.java | 81 +------------------ .../feature/TermTreeDetailElement.java | 6 -- .../taxon/TaxonRelationshipDetailElement.java | 12 +-- .../util/TaxonTreeNodeContentProvider.java | 10 +-- .../view/e4/details/DetailsPartE4.java | 5 -- .../view/e4/details/DetailsViewerE4.java | 22 ++--- .../SupplementalDataPartE4.java | 6 +- .../SupplementalDataViewerE4.java | 10 +-- .../AbstractSelectionElementTest.java | 4 +- .../ClassificationSelectionElementTest.java | 1 - .../selection/NameSelectionElementTest.java | 1 - .../TaxonNodeSelectionElementTest.java | 4 +- 20 files changed, 36 insertions(+), 181 deletions(-) diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationException.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationException.java index 36acd3dad..690ebb607 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationException.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationException.java @@ -19,5 +19,4 @@ public class CdmApplicationException extends Exception { public CdmApplicationException(Exception ex) { super(ex); } - -} +} \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmChangeListener.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmChangeListener.java index 8351dcbc8..3a3f9e4f4 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmChangeListener.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmChangeListener.java @@ -15,5 +15,4 @@ package eu.etaxonomy.cdm.api.application; public interface ICdmChangeListener { public void onChange(CdmChangeEvent event); - -} +} \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmDataChangeService.java b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmDataChangeService.java index 279b49d8b..dbcca3971 100644 --- a/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmDataChangeService.java +++ b/eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/ICdmDataChangeService.java @@ -26,4 +26,4 @@ public interface ICdmDataChangeService { public abstract void clear(); -} +} \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java index 04440bcaa..d7928f70a 100644 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/CharacterMatrixPart.java @@ -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); - + } } diff --git a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java index 3a1713e86..1130d242b 100755 --- a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java +++ b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/descriptiveDataSet/matrix/handler/AggregationHandler.java @@ -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 diff --git a/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java index da718cca5..41c634fb0 100755 --- a/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java +++ b/eu.etaxonomy.taxeditor.local/src/main/java/eu/etaxonomy/taxeditor/local/server/RemotingLoginDialogLocal.java @@ -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; diff --git a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveTaxonNodeHandlerE4.java b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveTaxonNodeHandlerE4.java index a4803d9e8..59192fe14 100644 --- a/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveTaxonNodeHandlerE4.java +++ b/eu.etaxonomy.taxeditor.navigation/src/main/java/eu/etaxonomy/taxeditor/navigation/navigator/e4/handler/MoveTaxonNodeHandlerE4.java @@ -175,8 +175,6 @@ public class MoveTaxonNodeHandlerE4 extends CdmHandlerE4 { } } - - if(parentTaxonNode != null){ if(NavigationUtil.isDirty(parentTaxonNode, partService)){ MessageDialog.openWarning(shell, diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectorSelectionDialog.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectorSelectionDialog.java index ab17e7ff7..7acb7c9b3 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectorSelectionDialog.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/dialog/selection/CollectorSelectionDialog.java @@ -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> super(shell, title, multi, settings, agent, selectTeamMember); if (selectTeamMember && agent instanceof Team){ this.collectorTeam = (Team)agent; - + } } public static 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> 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> else{ throw new IllegalArgumentException("Could not determine the desired wizard."); } - } public class CollectorLabelProvider extends LabelProvider { @@ -116,9 +114,8 @@ public class CollectorSelectionDialog extends AgentSelectionDialog> return title; } - - } + @Override protected void callService(String pattern) { Class clazz = AgentBase.class; @@ -128,10 +125,10 @@ public class CollectorSelectionDialog extends AgentSelectionDialog> Set memberUuids = new HashSet<>(); if (collectorTeam != null && selectTeamMember){ List teamMembers = this.collectorTeam.getTeamMembers(); - + teamMembers.forEach(member -> memberUuids.add(member.getUuid())); } - + model = CdmStore.getService(IAgentService.class).getUuidAndTitleCacheWithCollectorTitleCache(clazz, limitOfInitialElements, pattern); if (collectorTeam == null){ return; diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java index d147e6d42..0c9a1d31f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.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.element; import java.util.ArrayList; @@ -37,13 +36,9 @@ import eu.etaxonomy.taxeditor.ui.combo.term.TermComboElement; import eu.etaxonomy.taxeditor.ui.translation.TranslationWizard; /** - *

- * MultilanguageTextElement class. - *

* * @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 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 multilanguageText; - /** - *

- * Constructor for MultilanguageTextElement. - *

- * - * @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 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) { } - /** - *

- * Setter for the field multilanguageText. - *

- * - * @param multilanguageText - * the multilanguageText to set - */ public void setMultilanguageText( Map 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 } } - /** - *

- * Getter for the field multilanguageText. - *

- * - * @return the multilanguageText - */ public Map 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 diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/TermTreeDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/TermTreeDetailElement.java index a60b1e41c..fdf19ed5f 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/TermTreeDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/feature/TermTreeDetailElement.java @@ -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 { @@ -40,7 +38,6 @@ public class TermTreeDetailElement extends AbstractCdmDetailElement 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 if (entity.containsSubtrees()){ isFlat.setEnabled(false); } - - } @Override @@ -87,6 +82,5 @@ public class TermTreeDetailElement extends AbstractCdmDetailElement getEntity().setFlat(isFlat.getSelection()); } EventUtility.postEvent(WorkbenchEventConstants.ADD_SAVE_CANDIDATE, getEntity()); - } } \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java index 8e92ff33b..3862e0bf9 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/section/taxon/TaxonRelationshipDetailElement.java @@ -34,7 +34,6 @@ import eu.etaxonomy.taxeditor.ui.selection.EntitySelectionElement; /** * @author n.hoffmann * @date Dec 1, 2011 - * */ public class TaxonRelationshipDetailElement extends AbstractSingleSourceElement {//TODO: use AbstractSingleSourcedElement @@ -48,7 +47,6 @@ public class TaxonRelationshipDetailElement extends AbstractSingleSourceElement< private EntitySelectionElement 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 diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeContentProvider.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeContentProvider.java index d91957832..b657f6800 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeContentProvider.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/util/TaxonTreeNodeContentProvider.java @@ -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 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) { diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java index cf8d57439..e3fbf613e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsPartE4.java @@ -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() { diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java index fb9c0cda1..a1474bd1d 100755 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/details/DetailsViewerE4.java @@ -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){ diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java index 565b3c7e4..6c066be0e 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataPartE4.java @@ -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 diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataViewerE4.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataViewerE4.java index 20fff4d48..4e7a21341 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataViewerE4.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/e4/supplementaldata/SupplementalDataViewerE4.java @@ -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 diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElementTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElementTest.java index 46f922715..da662230c 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElementTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/AbstractSelectionElementTest.java @@ -18,7 +18,6 @@ import eu.etaxonomy.taxeditor.test.AbstractEditorTest; * should be handled by different tests. * * @author n.hoffmann - * */ public abstract class AbstractSelectionElementTest extends AbstractEditorTest{ @@ -26,5 +25,4 @@ public abstract class AbstractSelectionElementTest extends AbstractEditorTest{ public void tearDown() { utils.cancel(); } - -} +} \ No newline at end of file diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElementTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElementTest.java index 6bb2f2df4..3c7df0565 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElementTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/ClassificationSelectionElementTest.java @@ -18,7 +18,6 @@ import org.junit.Test; * should be handled by different tests. * * @author n.hoffmann - * */ @Ignore public class ClassificationSelectionElementTest extends AbstractSelectionElementTest{ diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElementTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElementTest.java index da607b5c6..834892737 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElementTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/NameSelectionElementTest.java @@ -14,7 +14,6 @@ import org.junit.Test; /** * @author n.hoffmann - * */ @Ignore public class NameSelectionElementTest extends AbstractSelectionElementTest { diff --git a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElementTest.java b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElementTest.java index 89c6f0164..9a54d3abf 100644 --- a/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElementTest.java +++ b/eu.etaxonomy.taxeditor.test/src/test/java/eu/etaxonomy/taxeditor/ui/selection/TaxonNodeSelectionElementTest.java @@ -14,7 +14,6 @@ import org.junit.Test; /** * @author n.hoffmann - * */ @Ignore public class TaxonNodeSelectionElementTest extends AbstractSelectionElementTest { @@ -30,5 +29,4 @@ public class TaxonNodeSelectionElementTest extends AbstractSelectionElementTest utils.openFilteredSelection(1, "Select parent taxon"); utils.cancel(); } - -} +} \ No newline at end of file -- 2.34.1