cleanup

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/description/distribution/CondensedDistributionComposer.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/description/distribution/CondensedDistributionComposer.java
index e7528a71aae75128aeb8539167824538a7cdd62e..0873d82ef56ed31d9ae6a1ee4827d736ef10c7b0 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/description/distribution/CondensedDistributionComposer.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/format/description/distribution/CondensedDistributionComposer.java
@@ -117,8 +117,11 @@ public class CondensedDistributionComposer {
             PresenceAbsenceTerm areaOfScopeStatus = areaToStatusMap.get(areaOfScopeNode.area);
             DoubleResult<String, Boolean> areaOfScopeStatusSymbol = statusSymbol(areaOfScopeStatus, config, languages, NOT_HANDLED_BY_PARENT);
             String areaOfScopeLabel = config.showAreaOfScopeLabel? makeAreaLabel(languages, areaOfScopeNode.area, config, null):"";
-            result.addStatusAndAreaTaggedText(areaOfScopeStatusSymbol.getFirstResult(),
-                    areaOfScopeLabel, (areaOfScopeStatusSymbol.getSecondResult() || config.areasBold), config);
+            String statusStr = areaOfScopeStatusSymbol.getFirstResult();
+            boolean isBold = areaOfScopeStatusSymbol.getSecondResult() || config.areasBold;
+
+            result.addStatusAndAreaTaggedText(statusStr, areaOfScopeLabel,
+                    isBold, config);
 
             //subareas
             handleSubAreas(result, areaOfScopeNode, config, areaNodeComparator, languages, areaToStatusMap,

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImpl.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImpl.java
index ee192b78b2ce4c855005b43d6d23161524126b9c..f8da192a3b43c1e14551609a1feba24559477388 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImpl.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/geo/DistributionServiceImpl.java
@@ -145,7 +145,8 @@ public class DistributionServiceImpl implements IDistributionService {
         DistributionInfoDto dto = new DistributionInfoDto();
 
         if(omitLevels == null) {
-            @SuppressWarnings("unchecked") Set<NamedAreaLevel> emptySet = Collections.EMPTY_SET;
+            @SuppressWarnings("unchecked")
+            Set<NamedAreaLevel> emptySet = Collections.EMPTY_SET;
             omitLevels = emptySet;
         }
 

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoLoader.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoLoader.java
index b647f12093b67bd2fa3ccf8724644e72a05fde53..a77907a34b3da5ab91539a56c3d8106306913d89 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoLoader.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/portal/PortalDtoLoader.java
@@ -934,8 +934,6 @@ public class PortalDtoLoader {
         distributionConfig.setIgnoreDistributionStatusUndefined(ignoreDistributionStatusUndefined);
         boolean fallbackAsParent = true;  //may become a service parameter in future
 
-        DistributionInfoDto dto;
-
         //hiddenArea markers include markers for fully hidden areas and fallback areas. The later
         //are hidden markers on areas that have non-hidden subareas (#4408)
         Set<MarkerType> hiddenAreaMarkerTypes = distributionConfig.getHiddenAreaMarkerTypeList();
@@ -955,7 +953,7 @@ public class PortalDtoLoader {
             distributionStatusColors = null;
         }
 
-        dto = distributionService.composeDistributionInfoFor(distributionConfig, distributions,
+        DistributionInfoDto dto = distributionService.composeDistributionInfoFor(distributionConfig, distributions,
                 fallbackAsParent,
                 distributionStatusColors, LocaleContext.getLanguages());