cleanup

diff --git a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java
index 9b82db43ae6e276ff23db815e9237a9f01779766..21238c35598cc65e4ff58d189ce3c4d83bc85121 100755 (executable)
--- a/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java
+++ b/cdmlib-persistence/src/main/java/eu/etaxonomy/cdm/persistence/dao/hibernate/taxon/TaxonNodeDaoHibernateImpl.java
@@ -872,7 +872,6 @@ public class TaxonNodeDaoHibernateImpl extends AnnotatableDaoImpl<TaxonNode>
     public int countPublishForSubtreeAcceptedTaxa(TreeIndex subTreeIndex, boolean publish, boolean includeSharedTaxa, boolean includeHybrids) {\r
         String queryStr = forSubtreeAcceptedQueryStr(includeSharedTaxa, subTreeIndex, !includeHybrids, SelectMode.COUNT);\r
         queryStr += " AND t.publish != :publish ";\r
     public int countPublishForSubtreeAcceptedTaxa(TreeIndex subTreeIndex, boolean publish, boolean includeSharedTaxa, boolean includeHybrids) {\r
         String queryStr = forSubtreeAcceptedQueryStr(includeSharedTaxa, subTreeIndex, !includeHybrids, SelectMode.COUNT);\r
         queryStr += " AND t.publish != :publish ";\r

-        System.out.println(queryStr);\r

         Query query = getSession().createQuery(queryStr);\r
         query.setBoolean("publish", publish);\r
         return ((Long)query.uniqueResult()).intValue();\r
         Query query = getSession().createQuery(queryStr);\r
         query.setBoolean("publish", publish);\r
         return ((Long)query.uniqueResult()).intValue();\r

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/DistributionAggregation.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/DistributionAggregation.java
index b3cc5c201f9e5911b8c00124d603a5ad3006987a..d82701c3014cab4427cc50a8f2ccfa94e3b6eb2b 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/DistributionAggregation.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/description/DistributionAggregation.java
@@ -67,6 +67,7 @@ import eu.etaxonomy.cdm.model.term.VocabularyEnum;
  *
  * @author Anton Güntsch (author of original Transmission Engine Occurrence version 14 written in Visual Basic)
  * @author Andreas Kohlbecker (2013, porting Transmission Engine Occurrence to Java)
  *
  * @author Anton Güntsch (author of original Transmission Engine Occurrence version 14 written in Visual Basic)
  * @author Andreas Kohlbecker (2013, porting Transmission Engine Occurrence to Java)

+ * @author a.mueller (refactoring and merge with Structured Description Aggregation)

  * @since Feb 22, 2013
  */
 public class DistributionAggregation
  * @since Feb 22, 2013
  */
 public class DistributionAggregation


@@ -74,7 +75,6 @@ public class DistributionAggregation
 
     public static final Logger logger = Logger.getLogger(DistributionAggregation.class);
 
 
     public static final Logger logger = Logger.getLogger(DistributionAggregation.class);
 

-

     protected static final List<String> TAXONDESCRIPTION_INIT_STRATEGY = Arrays.asList(new String [] {
             "description.elements.area",
             "description.elements.status",
     protected static final List<String> TAXONDESCRIPTION_INIT_STRATEGY = Arrays.asList(new String [] {
             "description.elements.area",
             "description.elements.status",


@@ -84,7 +84,6 @@ public class DistributionAggregation
 //            "name.status.type",
     });
 
 //            "name.status.type",
     });
 

-

     /**
      * A map which contains the status terms as key and the priority as value
      * The map will contain both, the PresenceTerms and the AbsenceTerms
     /**
      * A map which contains the status terms as key and the priority as value
      * The map will contain both, the PresenceTerms and the AbsenceTerms

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/longrunningService/LongRunningTasksService.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/longrunningService/LongRunningTasksService.java
index ae0a74b99e086992a2c7f7e9567e654a19790d28..0fe5f21145c126a812bb1edf23e8522fc1204aa6 100755 (executable)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/longrunningService/LongRunningTasksService.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/longrunningService/LongRunningTasksService.java
@@ -77,7 +77,6 @@ public class LongRunningTasksService implements ILongRunningTasksService{
         return uuid;
     }
 
         return uuid;
     }
 

-

     @Override
     public <T extends DescriptionAggregationBase<T,C>, C extends DescriptionAggregationConfigurationBase<T>>
                 UUID invoke(C config){
     @Override
     public <T extends DescriptionAggregationBase<T,C>, C extends DescriptionAggregationConfigurationBase<T>>
                 UUID invoke(C config){


@@ -106,7 +105,6 @@ public class LongRunningTasksService implements ILongRunningTasksService{
         return uuid;
     }
 
         return uuid;
     }
 

-

     @Override
     public UUID addRowWrapperToDataset(Collection<SpecimenRowWrapperDTO> wrapper, UUID datasetUuid){
         RemotingProgressMonitorThread monitorThread = new RemotingProgressMonitorThread() {
     @Override
     public UUID addRowWrapperToDataset(Collection<SpecimenRowWrapperDTO> wrapper, UUID datasetUuid){
         RemotingProgressMonitorThread monitorThread = new RemotingProgressMonitorThread() {


@@ -137,7 +135,6 @@ public class LongRunningTasksService implements ILongRunningTasksService{
                 }
                 monitor.setResult(updateResult);
                 return updateResult;
                 }
                 monitor.setResult(updateResult);
                 return updateResult;

-

             }
         };
         UUID uuid = progressMonitorService.registerNewRemotingMonitor(monitorThread);
             }
         };
         UUID uuid = progressMonitorService.registerNewRemotingMonitor(monitorThread);


@@ -157,7 +154,6 @@ public class LongRunningTasksService implements ILongRunningTasksService{
                 }
                 monitor.setResult(updateResult);
                 return updateResult;
                 }
                 monitor.setResult(updateResult);
                 return updateResult;

-

             }
         };
         UUID uuid = progressMonitorService.registerNewRemotingMonitor(monitorThread);
             }
         };
         UUID uuid = progressMonitorService.registerNewRemotingMonitor(monitorThread);


@@ -263,4 +259,4 @@ public class LongRunningTasksService implements ILongRunningTasksService{
         monitorThread.start();
         return uuid;
     }
         monitorThread.start();
         return uuid;
     }

-}
+}
\ No newline at end of file