Merge branch 'master' into abcd

[cdmlib.git] / cdmlib-services / src / main / java / eu / etaxonomy / cdm / api / service / MicroFormatCategoricalDescriptionBuilder.java

diff --git a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MicroFormatCategoricalDescriptionBuilder.java b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MicroFormatCategoricalDescriptionBuilder.java
index 0b6c2831c893564ca4aaaa9492b3afc926edbdc8..f4613e29b61e3b4a10604a00b82ea98233d78b13 100644 (file)
--- a/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MicroFormatCategoricalDescriptionBuilder.java
+++ b/cdmlib-services/src/main/java/eu/etaxonomy/cdm/api/service/MicroFormatCategoricalDescriptionBuilder.java
@@ -8,52 +8,65 @@ import org.apache.commons.lang.StringUtils;
 
 import eu.etaxonomy.cdm.model.common.DefinedTerm;
 import eu.etaxonomy.cdm.model.common.Language;
+import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.description.Feature;
 import eu.etaxonomy.cdm.model.description.State;
 import eu.etaxonomy.cdm.model.description.StateData;
 import eu.etaxonomy.cdm.model.description.TextData;
 
 public class MicroFormatCategoricalDescriptionBuilder extends AbstractCategoricalDescriptionBuilder{
-       
-       private String spanEnd = "</span>";
-       
-       protected TextData doBuild(List<StateData> states, List<Language> languages){
+
+       private final String spanEnd = "</span>";
+
+       @Override
+    protected TextData doBuild(List<StateData> states, List<Language> languages){
                TextData textData = TextData.NewInstance();// TextData that will contain the description and the language corresponding
-               StringBuilder CategoricalDescription = new StringBuilder();
+               StringBuilder categoricalDescription = new StringBuilder();
                Language language = null;
                for (Iterator<StateData> sd = states.iterator() ; sd.hasNext() ;){
                        StateData stateData = sd.next();
                        State s = stateData.getState();
+                       if(s != null && language==null) {
+                language = s.getPreferredRepresentation(languages).getLanguage();
+            }
+            if (language==null) {
+                language = Language.DEFAULT();
+            }
+            if(stateData.getModifyingText()!=null && stateData.getModifyingText().get(language)!=null){
+                LanguageString modyfingText = stateData.getModifyingText().get(language);
+                categoricalDescription.append(spanClass("modifier") + modyfingText.getText() + spanEnd);
+            }
                        Set<DefinedTerm> modifiers = stateData.getModifiers(); // the states and their according modifiers are simply written one after the other
                        for (Iterator<DefinedTerm> mod = modifiers.iterator() ; mod.hasNext() ;){
                                DefinedTerm modifier = mod.next();
-                               CategoricalDescription.append(" " + spanClass("modifier") + modifier.getPreferredRepresentation(languages).getLabel() + spanEnd);
+                               categoricalDescription.append(" " + spanClass("modifier") + modifier.getPreferredRepresentation(languages).getLabel() + spanEnd);
                        }
-                       CategoricalDescription.append(" " + spanClass("state") + s.getPreferredRepresentation(languages).getLabel() + spanEnd);
-                       if (sd.hasNext()) CategoricalDescription.append(',');
+                       categoricalDescription.append(" " + spanClass("state") + s.getPreferredRepresentation(languages).getLabel() + spanEnd);
+                       if (sd.hasNext()) {
+                categoricalDescription.append(',');
+            }
                        if (language==null) {
                                language = s.getPreferredRepresentation(languages).getLanguage(); // TODO What if there are different languages ?
                        }
                }
-               if (language==null) {
-                       language = Language.DEFAULT();
-               }
-               textData.putText(language, CategoricalDescription.toString());
-               
+               textData.putText(language, categoricalDescription.toString());
+
                return textData;
        }
 
        protected String buildFeature(Feature feature, boolean doItBetter){
-               if (feature==null || feature.getLabel()==null) return "";
-               else {
+               if (feature==null || feature.getLabel()==null) {
+            return "";
+        } else {
                        if (doItBetter) {
                                String betterString = StringUtils.substringBefore(feature.getLabel(), "<");
                                return (spanClass("feature") + StringUtils.removeEnd(betterString, " ") + spanEnd);
-                       }
-                       else    return (spanClass("feature") + feature.getLabel() + spanEnd);
+                       } else {
+                return (spanClass("feature") + feature.getLabel() + spanEnd);
+            }
                }
        }
-       
+
        private String spanClass(String classString){
                return("<span class=\""+classString+"\">");
        }