From caddd4f34f4f67433307fff5420e85826c5029f9 Mon Sep 17 00:00:00 2001 From: Patrick Plitzner Date: Mon, 24 Aug 2015 07:10:32 +0200 Subject: [PATCH] Trim code --- .../taxeditor/bulkeditor/BulkEditorQuery.java | 25 ++--- .../bulkeditor/BulkEditorSearch.java | 6 +- .../bulkeditor/input/AgentEditorInput.java | 92 +++++-------------- .../taxeditor/store/SearchManager.java | 46 ---------- 4 files changed, 33 insertions(+), 136 deletions(-) diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorQuery.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorQuery.java index 96b0cbed6..e65805b9d 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorQuery.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorQuery.java @@ -1,9 +1,9 @@ // $Id$ /** * 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. */ @@ -24,10 +24,10 @@ import eu.etaxonomy.cdm.model.common.IdentifiableEntity; * @version 1.0 */ public class BulkEditorQuery { - - private String searchString; - private Comparator comparator; - private IIdentifiableEntityServiceConfigurator searchConfigurator; + + private final String searchString; + private final Comparator comparator; + private final IIdentifiableEntityServiceConfigurator searchConfigurator; public BulkEditorQuery (String searchString, Comparator comparator) { this.searchString = searchString; @@ -38,30 +38,21 @@ public class BulkEditorQuery { searchConfigurator.setTitleSearchString(searchString); searchConfigurator.setMatchMode(null); searchConfigurator.setPropertyPaths(propertyPath); - + if(searchString != null && searchString.trim().equals("*")){ searchConfigurator.setPageSize(1000); } - + } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorQuery#getComparator() - */ public Comparator getComparator() { return comparator; } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorQuery#getSearchString() - */ public String getSearchString() { return searchString; } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorQuery#getSearchConfigurator() - */ public IIdentifiableEntityServiceConfigurator getSearchConfigurator() { return searchConfigurator; } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorSearch.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorSearch.java index 238df83c8..552a9d0df 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorSearch.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/BulkEditorSearch.java @@ -148,18 +148,18 @@ public class BulkEditorSearch { } - /* + /** * Shows the results of the search. */ private void updateEditorInput() { String searchString = getSearchString().trim(); - if(DEFAULT_TEXT.equals(searchString) || CdmUtils.isEmpty(searchString)){ + if(DEFAULT_TEXT.equals(searchString) || CdmUtils.isBlank(searchString)){ return; } - BulkEditorQuery query = new BulkEditorQuery(getSearchString(), getComparator()); + BulkEditorQuery query = new BulkEditorQuery(searchString, getComparator()); editor.performSearch(query); } diff --git a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java index 2a739544f..bae14730a 100644 --- a/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java +++ b/eu.etaxonomy.taxeditor.bulkeditor/src/main/java/eu/etaxonomy/taxeditor/bulkeditor/input/AgentEditorInput.java @@ -1,23 +1,18 @@ // $Id$ /** * 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.bulkeditor.input; -import java.util.Arrays; import java.util.List; -import java.util.UUID; - -import org.eclipse.core.commands.ExecutionException; import eu.etaxonomy.cdm.api.service.IAgentService; import eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator; -import eu.etaxonomy.cdm.api.service.exception.DataChangeNoRollbackException; import eu.etaxonomy.cdm.api.service.exception.ReferencedObjectUndeletableException; import eu.etaxonomy.cdm.model.agent.AgentBase; import eu.etaxonomy.cdm.model.agent.Person; @@ -29,7 +24,6 @@ import eu.etaxonomy.cdm.strategy.merge.MergeException; import eu.etaxonomy.cdm.strategy.merge.MergeMode; import eu.etaxonomy.taxeditor.annotatedlineeditor.IEntityCreator; import eu.etaxonomy.taxeditor.bulkeditor.IBulkEditorSortProvider; -import eu.etaxonomy.taxeditor.bulkeditor.handler.MergeGroupHandler; import eu.etaxonomy.taxeditor.bulkeditor.input.entitycreator.AgentCreator; import eu.etaxonomy.taxeditor.bulkeditor.input.sortprovider.IdentifiableEntitySortProvider; import eu.etaxonomy.taxeditor.bulkeditor.internal.TaxeditorBulkeditorPlugin; @@ -38,62 +32,32 @@ import eu.etaxonomy.taxeditor.store.CdmStore; /** - *

AgentEditorInput class.

- * * @author p.ciardelli * @created 25.06.2009 * @version 1.0 */ public class AgentEditorInput extends AbstractBulkEditorInput { - /** - * - */ private static final long serialVersionUID = 3387950621617078479L; - /** Constant ID="bulkeditor.input.author" */ public static final String ID = "bulkeditor.input.author"; - + private static AgentEditorInput instance; - /** - *

getID

- * - * @return the iD - */ public static String getID() { return ID; } - - /* (non-Javadoc) - * @see org.eclipse.ui.IEditorInput#getName() - */ - /** - *

getName

- * - * @return a {@link java.lang.String} object. - */ - public String getName() { + + @Override + public String getName() { return BulkEditorInputType.AGENT.label; } - /* (non-Javadoc) - * @see org.eclipse.ui.IEditorInput#getToolTipText() - */ - /** - *

getToolTipText

- * - * @return a {@link java.lang.String} object. - */ - public String getToolTipText() { + @Override + public String getToolTipText() { return getName(); } - /** - *

Getter for the field instance.

- * - * @return a {@link eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput} object. - */ public static AbstractBulkEditorInput getInstance() { if (instance == null) { instance = new AgentEditorInput(); @@ -101,24 +65,18 @@ public class AgentEditorInput extends AbstractBulkEditorInput return instance; } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInput#isMergingEnabled() - */ /** {@inheritDoc} */ @Override public boolean isMergingEnabled() { return true; } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.bulkeditor.input.BulkEditorInput#isMergingEnabled() - */ + /** {@inheritDoc} */ @Override public boolean isConvertingEnabled() { return true; } - + /** {@inheritDoc} */ @Override public boolean merge(TeamOrPersonBase entity, TeamOrPersonBase mergeTarget) { @@ -126,7 +84,7 @@ public class AgentEditorInput extends AbstractBulkEditorInput try { IMergeStrategy strategy = DefaultMergeStrategy.NewInstance(Person.class); strategy.setMergeMode("institutionalMemberships", MergeMode.FIRST); - CdmStore.getCommonService().merge((IMergable)mergeTarget, (IMergable)entity, strategy); + CdmStore.getCommonService().merge((IMergable)mergeTarget, (IMergable)entity, strategy); } catch (MergeException e) { MessagingUtils.errorDialog("Bulk Editor Merge Error", this, @@ -144,42 +102,36 @@ public class AgentEditorInput extends AbstractBulkEditorInput public List listEntities(IIdentifiableEntityServiceConfigurator configurator) { return CdmStore.getSearchManager().findTeamOrPersons(configurator); } - - /** {@inheritDoc} + + /** {@inheritDoc} @Override public AgentBase loadEntity(UUID uuid) { - List propertyPaths = Arrays.asList(new String[]{}); + List propertyPaths = Arrays.asList(new String[]{}); return CdmStore.getService(IAgentService.class).load(uuid, propertyPaths); }*/ - + public boolean delete(AgentBase entity) throws ReferencedObjectUndeletableException { - - return CdmStore.getService(IAgentService.class).delete(entity) != null; - + + return CdmStore.getService(IAgentService.class).delete(entity) != null; + } /** {@inheritDoc} */ public boolean save(AgentBase entity) { - + return CdmStore.getService(IAgentService.class).saveOrUpdate(entity) != null; } - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#getSortProviders() - */ @Override public List> getSortProviders() { List> sortProviders = super.getSortProviders(); - + sortProviders.add(0, new IdentifiableEntitySortProvider()); - + return sortProviders; } - - /* (non-Javadoc) - * @see eu.etaxonomy.taxeditor.bulkeditor.input.AbstractBulkEditorInput#createEntityCreator() - */ + @Override protected IEntityCreator createEntityCreator() { return new AgentCreator(); diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java index 0eb45b3dd..cf673e87a 100644 --- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java +++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/SearchManager.java @@ -59,12 +59,6 @@ public class SearchManager { // TODO make this configurable via preferences private static final int MAX_RESULTS_BEFORE_WARNING = 500; - /** - *

findNames

- * - * @param configurator a {@link eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator} object. - * @return a {@link java.util.List} object. - */ public List findNames(IIdentifiableEntityServiceConfigurator configurator){ if(checkLargeResult(CdmStore.getService(INameService.class).countByTitle(configurator))){ return CdmStore.getService(INameService.class).findByTitle(configurator).getRecords(); @@ -86,31 +80,13 @@ public class SearchManager { relationships.add((NameRelationship) relationship); } } - - return relationships; - } - /** - *

findTaxaAndNames

- * - * @param configurator a {@link eu.etaxonomy.cdm.api.service.config.ITaxonServiceConfigurator} object. - * @return a {@link java.util.List} object. - */ public List> findTaxaAndNames(IFindTaxaAndNamesConfigurator configurator){ return CdmStore.getService(ITaxonService.class).findTaxaAndNamesForEditor(configurator); } - - - - /** - *

findReferences

- * - * @param configurator a {@link eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator} object. - * @return a {@link java.util.List} object. - */ public List findReferences(IIdentifiableEntityServiceConfigurator configurator){ if(checkLargeResult(CdmStore.getService(IReferenceService.class).countByTitle(configurator))){ return CdmStore.getService(IReferenceService.class).findByTitle(configurator).getRecords(); @@ -118,13 +94,6 @@ public class SearchManager { return NO_RESULTS; } - - /** - *

findAgents

- * - * @param configurator a {@link eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator} object. - * @return a {@link java.util.List} object. - */ public List findAgents(IIdentifiableEntityServiceConfigurator configurator){ if(checkLargeResult(CdmStore.getService(IAgentService.class).countByTitle(configurator))){ return CdmStore.getService(IAgentService.class).findByTitle(configurator).getRecords(); @@ -132,12 +101,6 @@ public class SearchManager { return NO_RESULTS; } - /** - *

findTeamOrPersons

- * - * @param configurator a {@link eu.etaxonomy.cdm.api.service.config.IIdentifiableEntityServiceConfigurator} object. - * @return a {@link java.util.List} object. - */ @SuppressWarnings("unchecked") public List findTeamOrPersons(IIdentifiableEntityServiceConfigurator configurator){ configurator.setClazz(TeamOrPersonBase.class); @@ -214,10 +177,6 @@ public class SearchManager { } - /** - * @param count - * @return - */ private boolean checkLargeResult(int count) { if(count > MAX_RESULTS_BEFORE_WARNING){ return MessageDialog.openConfirm(Display.getDefault().getActiveShell(), "Large result expected", @@ -228,11 +187,6 @@ public class SearchManager { } } - /** - * - * @param configurator - * @return - */ private String sqlizeTitleSearchString(IIdentifiableEntityServiceConfigurator configurator){ return configurator.getTitleSearchString().replace(WILDCARD, "%"); } -- 2.34.1