commit d07e9e4a85ec128dfccc3e5f8b8e5cac4b5d0a85
Author: Andreas Kohlbecker <a.kohlbecker@bgbm.org>
Date:   Mon Apr 4 13:52:42 2016 +0200

    removing depreceted controller methods

diff --git a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
index e7d52a79b3..247828bd2b 100644
--- a/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
+++ b/cdmlib-remote/src/main/java/eu/etaxonomy/cdm/remote/controller/DescriptionPortalController.java
@@ -9,15 +9,11 @@
 
 package eu.etaxonomy.cdm.remote.controller;
 
-import java.awt.Color;
+import io.swagger.annotations.Api;
+
 import java.io.IOException;
 import java.util.Arrays;
-import java.util.Collection;
-import java.util.EnumSet;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.UUID;
 
 import javax.servlet.http.HttpServletRequest;
@@ -31,38 +27,22 @@ import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.servlet.ModelAndView;
 
-import com.fasterxml.jackson.core.JsonParseException;
-import com.fasterxml.jackson.databind.JsonMappingException;
-
-import eu.etaxonomy.cdm.api.service.DistributionTree;
 import eu.etaxonomy.cdm.api.service.IDescriptionService;
 import eu.etaxonomy.cdm.api.service.ITermService;
 import eu.etaxonomy.cdm.api.service.IVocabularyService;
-import eu.etaxonomy.cdm.api.service.dto.DistributionInfoDTO;
-import eu.etaxonomy.cdm.api.service.dto.DistributionInfoDTO.InfoPart;
 import eu.etaxonomy.cdm.api.service.pager.Pager;
-import eu.etaxonomy.cdm.api.utility.DescriptionUtility;
-import eu.etaxonomy.cdm.ext.geo.CondensedDistributionRecipe;
-import eu.etaxonomy.cdm.ext.geo.EditGeoServiceUtilities;
 import eu.etaxonomy.cdm.ext.geo.IEditGeoService;
 import eu.etaxonomy.cdm.model.common.Annotation;
-import eu.etaxonomy.cdm.model.common.Marker;
 import eu.etaxonomy.cdm.model.common.MarkerType;
 import eu.etaxonomy.cdm.model.description.DescriptionBase;
 import eu.etaxonomy.cdm.model.description.DescriptionElementBase;
-import eu.etaxonomy.cdm.model.description.PresenceAbsenceTerm;
-import eu.etaxonomy.cdm.model.description.TaxonDescription;
 import eu.etaxonomy.cdm.model.location.NamedAreaLevel;
 import eu.etaxonomy.cdm.remote.editor.DefinedTermBaseList;
 import eu.etaxonomy.cdm.remote.editor.NamedAreaLevelPropertyEditor;
 import eu.etaxonomy.cdm.remote.editor.TermBaseListPropertyEditor;
 import eu.etaxonomy.cdm.remote.editor.UUIDListPropertyEditor;
 import eu.etaxonomy.cdm.remote.editor.UuidList;
-import eu.etaxonomy.cdm.remote.l10n.LocaleContext;
-import io.swagger.annotations.Api;
 
 /**
  *
@@ -156,112 +136,4 @@ public class DescriptionPortalController extends BaseController<DescriptionBase,
         return annotations;
     }
 
-    /**
-     * NOTICE: required to have a TreeNodeBeanProcessor configured which suppresses the
-     * redundant output of distribution.area
-     *
-     * @param descriptionUuidList
-     * @param subAreaPreference
-     *            enables the <b>Sub area preference rule</b> if set to true,
-     *            see {@link DescriptionUtility#filterDistributions(Collection, boolean, boolean}
-     * @param statusOrderPreference
-     *            enables the <b>Status order preference rule</b> if set to true,
-     *            see {@link DescriptionUtility#filterDistributions(Collection, boolean, boolean}
-     * @param hideMarkedAreas
-     *            distributions where the area has a {@link Marker} with one of
-     *            the specified {@link MarkerType}s will be skipped, see
-     *            {@link DescriptionUtility#filterDistributions(Collection, boolean, boolean, Set)}
-     * @param omitLevels
-     * @param request
-     * @param response
-     * @return
-     */
-    @RequestMapping(value = "//portal/description/{uuid_list}/DistributionTree", method = RequestMethod.GET) // mapped as absolute path, see CdmAntPathMatcher
-    public DistributionTree doGetOrderedDistributionsB(
-            @PathVariable("uuid_list") UuidList descriptionUuidList,
-            @RequestParam(value = "subAreaPreference", required = false) boolean subAreaPreference,
-            @RequestParam(value = "statusOrderPreference", required = false) boolean statusOrderPreference,
-            @RequestParam(value = "hideMarkedAreas", required = false) DefinedTermBaseList<MarkerType> hideMarkedAreasList,
-            @RequestParam(value = "omitLevels", required = false) Set<NamedAreaLevel> omitLevels,
-            HttpServletRequest request,
-            HttpServletResponse response) {
-
-        logger.info("getOrderedDistributionsB() - " + requestPathAndQuery(request) );
-
-        Set<TaxonDescription> taxonDescriptions = new HashSet<TaxonDescription>();
-        TaxonDescription description;
-        for (UUID descriptionUuid : descriptionUuidList) {
-            logger.debug("  loading description " + descriptionUuid.toString() );
-            description = (TaxonDescription) service.load(descriptionUuid, null);
-            taxonDescriptions.add(description);
-        }
-
-        Set<MarkerType> hideMarkedAreas = null;
-        if(hideMarkedAreasList != null){
-            hideMarkedAreas = hideMarkedAreasList.asSet();
-        }
-
-        logger.debug("  get ordered distributions ");
-        DistributionTree distTree = service.getOrderedDistributions(taxonDescriptions, subAreaPreference, statusOrderPreference,
-                hideMarkedAreas, omitLevels, ORDERED_DISTRIBUTION_INIT_STRATEGY);
-        if (logger.isDebugEnabled()){ logger.debug("done");}
-        return distTree;
-    }
-
-    /**
-     * @param taxonUuid
-     * @param parts
-     *            possible values: condensedStatus, tree, mapUriParams,
-     *            elements,
-     * @param subAreaPreference
-     * @param statusOrderPreference
-     * @param hideMarkedAreasList
-     * @param recipe
-     *  The recipe for creating the condensed distribution status
-     * @param omitLevels
-     * @param request
-     * @param response
-     * @return
-     * @throws IOException
-     * @throws JsonMappingException
-     * @throws JsonParseException
-     */
-    @RequestMapping(value = "//portal/description/distributionInfoFor/{uuid}", method = RequestMethod.GET) // mapped as absolute path, see CdmAntPathMatcher
-    public ModelAndView doGetDistributionInfo(
-            @PathVariable("uuid") UUID taxonUuid,
-            @RequestParam("part") Set<InfoPart> partSet,
-            @RequestParam(value = "subAreaPreference", required = false) boolean subAreaPreference,
-            @RequestParam(value = "statusOrderPreference", required = false) boolean statusOrderPreference,
-            @RequestParam(value = "hiddenAreaMarkerType", required = false) DefinedTermBaseList<MarkerType> hideMarkedAreasList,
-            @RequestParam(value = "omitLevels", required = false) Set<NamedAreaLevel> omitLevels,
-            @RequestParam(value = "statusColors", required = false) String statusColorsString,
-            @RequestParam(value = "recipe", required = false, defaultValue="EuroPlusMed") CondensedDistributionRecipe recipe,
-
-            HttpServletRequest request,
-            HttpServletResponse response) throws JsonParseException, JsonMappingException, IOException {
-
-            logger.info("doGetDistributionInfo() - " + requestPathAndQuery(request));
-
-            ModelAndView mv = new ModelAndView();
-
-            Set<MarkerType> hideMarkedAreas = null;
-            if(hideMarkedAreasList != null){
-                hideMarkedAreas = hideMarkedAreasList.asSet();
-            }
-
-            EnumSet<InfoPart> parts = EnumSet.copyOf(partSet);
-
-            Map<PresenceAbsenceTerm, Color> presenceAbsenceTermColors = EditGeoServiceUtilities.buildStatusColorMap(statusColorsString, termService, vocabularyService);
-
-            DistributionInfoDTO dto = geoService.composeDistributionInfoFor(parts, taxonUuid,
-                    subAreaPreference, statusOrderPreference, hideMarkedAreas, omitLevels,
-                    presenceAbsenceTermColors, LocaleContext.getLanguages(),
-                    DISTRIBUTION_INFO_INIT_STRATEGY, recipe, null);
-
-            mv.addObject(dto);
-
-            return mv;
-    }
-
-
 }
