/ - Diff - EDIT - EDIT Project Management

                 (configurator.getPageNumber(), numberOfResults, configurator.getPageSize(), results);
+        }
         public List<UuidAndTitleCache<TaxonBase>> getTaxonUuidAndTitleCache(){
             return dao.getUuidAndTitleCache();
         public List<UuidAndTitleCache<TaxonBase>> getTaxonUuidAndTitleCache(Integer limit, String pattern){
             return dao.getUuidAndTitleCache(limit, pattern);
+        }
         @Override
-...
+                    }
                 } else{
                     TaxonDeletionConfigurator configRelTaxon = new TaxonDeletionConfigurator();
                     configRelTaxon.setDeleteTaxonNodes(false);
                     configRelTaxon.setDeleteConceptRelationships(true);
                     for (TaxonRelationship taxRel: taxon.getTaxonRelations()){
                         if (config.isDeleteMisappliedNamesAndInvalidDesignations()){
                             if (taxRel.getType().equals(TaxonRelationshipType.MISAPPLIED_NAME_FOR()) || taxRel.getType().equals(TaxonRelationshipType.INVALID_DESIGNATION_FOR())){
                                 if (taxon.equals(taxRel.getToTaxon())){
                                     this.deleteTaxon(taxRel.getFromTaxon().getUuid(), config, classificationUuid);
+                                }
+                            }
                         } else if (config.isDeleteConceptRelationships() && taxRel.getType().isConceptRelationship()){
                             if (taxon.equals(taxRel.getToTaxon()) && isDeletable(taxRel.getFromTaxon(), configRelTaxon).isOk()){
                                 this.deleteTaxon(taxRel.getFromTaxon().getUuid(), configRelTaxon, classificationUuid);
                             }else if (isDeletable(taxRel.getToTaxon(), configRelTaxon).isOk()){
                                 this.deleteTaxon(taxRel.getToTaxon().getUuid(), configRelTaxon, classificationUuid);
+                            }
+                        }
                         taxon.removeTaxonRelation(taxRel);
-...
                     taxon.setName(null);
+                }
                 if ((taxon.getTaxonNodes() == null || taxon.getTaxonNodes().size()== 0)  && result.isOk()){
                 	try{
                 		UUID uuid = dao.delete(taxon);
-...
+        }
         @Override
         public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheTaxon() {
             return dao.getUuidAndTitleCacheTaxon();
         public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheTaxon(Integer limit, String pattern) {
             return dao.getUuidAndTitleCacheTaxon(limit, pattern);
+        }
         @Override
         public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheSynonym() {
             return dao.getUuidAndTitleCacheSynonym();
         public List<UuidAndTitleCache<TaxonBase>> getUuidAndTitleCacheSynonym(Integer limit, String pattern) {
             return dao.getUuidAndTitleCacheSynonym(limit, pattern);
+        }
         @Override

     // $Id$
     /**
     * Copyright (C) 2009 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.cdm.api.service.config;
     import eu.etaxonomy.cdm.api.service.ITaxonService;
     /**
      * This class is used to configure synonym deletion.
+     *
      * @see  ITaxonService#deleteSynonym(eu.etaxonomy.cdm.model.taxon.Synonym)
+     *
+     *
      * @see  ITaxonService#deleteSynonym(eu.etaxonomy.cdm.model.taxon.Synonym)
+     *
      * @author k.luther
      * @date 09.11.2011
+     *
-...
     	public void setNewHomotypicGroupIfNeeded(boolean newHomotypicGroupIfNeeded) {
     		this.newHomotypicGroupIfNeeded = newHomotypicGroupIfNeeded;
+    	}
+    }

     // $Id$
     /**
     * Copyright (C) 2009 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.cdm.api.service.config;
     import eu.etaxonomy.cdm.api.service.ITaxonService;
     import eu.etaxonomy.cdm.model.taxon.SynonymRelationship;
     /**
      * This class is used to configure taxonbase deletion.
+     *
      * @see ITaxonService#deleteTaxon(eu.etaxonomy.cdm.model.taxon.Taxon) and ITaxonService#deleteSynonym(eu.etaxonomy.cdm.model.taxon.Synonym)
+     *
+     *
      * @see ITaxonService#deleteTaxon(eu.etaxonomy.cdm.model.taxon.Taxon) and ITaxonService#deleteSynonym(eu.etaxonomy.cdm.model.taxon.Synonym)
+     *
      * @author k.luther
      * @date 09.11.2011
+     *
-...
     public class TaxonBaseDeletionConfigurator extends DeleteConfiguratorBase{
     	private boolean deleteNameIfPossible = true;
     	private boolean deleteSynonymRelations = true;
     	private NameDeletionConfigurator nameDeletionConfig = new NameDeletionConfigurator();
     	/**
     	 * If true the taxons name will be deleted if this is possible.
     	 * It is possible if the name is not linked in a way that it can not be deleted.
-...
     	public void setDeleteNameIfPossible(boolean deleteNameIfPossible) {
     		this.deleteNameIfPossible = deleteNameIfPossible;
+    	}
     	/**
     	 * The configurator for name deletion. Only evaluated if {@link #isDeleteNameIfPossible()}
     	 * is <code>true</code>.
-...
     	public void setNameDeletionConfig(NameDeletionConfigurator nameDeletionConfig) {
     		this.nameDeletionConfig = nameDeletionConfig;
+    	}
     	/**
+        *
         * If <code>true</code> all {@link SynonymRelationship relations from taxon to synonyms} will be
         * removed.
         * Synonyms itself will be removed depending on {@link #deleteSynonymsIfPossible}.
         * @return
         */
         public boolean isDeleteSynonymRelations() {
             return deleteSynonymRelations;
+        }
         /**
          * @param deleteSynonymRelations the deleteSynonymRelations to set
          */
         public void setDeleteSynonymRelations(boolean deleteSynonymRelations) {
             this.deleteSynonymRelations = deleteSynonymRelations;
+        }
+    }

         @SuppressWarnings("unused")
         private static final Logger logger = Logger.getLogger(TaxonDeletionConfigurator.class);
         private boolean deleteSynonymRelations = true;
         private boolean deleteSynonymsIfPossible = true;
         private boolean deleteMisappliedNamesAndInvalidDesignations = true;
        // private boolean deleteNameIfPossible = true;
         private boolean deleteConceptRelationships = false;
         //private NameDeletionConfigurator nameDeletionConfig = new NameDeletionConfigurator();
-...
+        }
         /**
+         *
          * If <code>true</code> all {@link SynonymRelationship relations to synonyms} will be
          * removed.
          * Synonyms itself will be removed depending on {@link #deleteSynonymsIfPossible}.
          * @return
          */
         public boolean isDeleteSynonymRelations() {
             return deleteSynonymRelations;
+        }
         public void setDeleteSynonymRelations(boolean deleteSynonymRelations) {
             this.deleteSynonymRelations = deleteSynonymRelations;
+        }
         /**
-...
+        }
         /**
          * @return the deleteConceptRelationships
          */
         public boolean isDeleteConceptRelationships() {
             return deleteConceptRelationships;
+        }
         /**
          * @param deleteConceptRelationships the deleteConceptRelationships to set
          */
         public void setDeleteConceptRelationships(boolean deleteConceptRelationships) {
             this.deleteConceptRelationships = deleteConceptRelationships;
+        }
+    }

Project

General

Profile

EDIT

Revision 0e1aa80c

Added by Katja Luther almost 7 years ago