changed parameters of ImageFile setter and getter methods from int to Integer. Rework...

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ImageFile.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ImageFile.java
index 4b9d650df614b80849930cdf2e07b692234f1aef..34eeeffe4f3feaa63a98996d6e672c0786fd34fc 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ImageFile.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/ImageFile.java
@@ -106,7 +106,7 @@ public class ImageFile extends MediaRepresentationPart {
                }
        }
        
                }
        }
        

-       public int getHeight(){
+       public Integer getHeight(){

                return this.height;
        }
 
                return this.height;
        }
 


@@ -114,11 +114,11 @@ public class ImageFile extends MediaRepresentationPart {
         * 
         * @param height    height
         */
         * 
         * @param height    height
         */

-       public void setHeight(int height){
+       public void setHeight(Integer height){

                this.height = height;
        }
 
                this.height = height;
        }
 

-       public int getWidth(){
+       public Integer getWidth(){

                return this.width;
        }
 
                return this.width;
        }
 


@@ -126,7 +126,7 @@ public class ImageFile extends MediaRepresentationPart {
         * 
         * @param width    width
         */
         * 
         * @param width    width
         */

-       public void setWidth(int width){
+       public void setWidth(Integer width){

                this.width = width;
        }
 
                this.width = width;
        }
 

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java
index 4b34a3d42907ce8a3043a3c285fb803d7ee0d9fc..afe9ab61ef345d71954b366f065064ddadba930c 100644 (file)
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/media/Media.java
@@ -10,6 +10,7 @@
 package eu.etaxonomy.cdm.model.media;
 
 import java.util.ArrayList;
 package eu.etaxonomy.cdm.model.media;
 
 import java.util.ArrayList;

+import java.util.Arrays;

 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;


@@ -56,6 +57,7 @@ import eu.etaxonomy.cdm.model.agent.AgentBase;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;
 import eu.etaxonomy.cdm.model.common.IdentifiableEntity;
 import eu.etaxonomy.cdm.model.common.Language;
 import eu.etaxonomy.cdm.model.common.LanguageString;

+import eu.etaxonomy.cdm.model.common.MultilanguageTextHelper;

 import eu.etaxonomy.cdm.validation.Level2;
 
 /**
 import eu.etaxonomy.cdm.validation.Level2;
 
 /**


@@ -390,4 +392,33 @@ public class Media extends IdentifiableEntity implements Cloneable {
                return prefRepr;
        }
        
                return prefRepr;
        }
        

+       /*
+        * Overriding the title cache methods here to avoid confusion with the title field
+        */
+       
+       /*
+        * (non-Javadoc)
+        * @see eu.etaxonomy.cdm.model.common.IdentifiableEntity#getTitleCache()
+        */
+       @Override
+       public String getTitleCache() {
+               List<Language> languages = Arrays.asList(new Language[]{Language.DEFAULT()});
+               LanguageString languageString = MultilanguageTextHelper.getPreferredLanguageString(title, languages);
+               return languageString != null ? languageString.getText() : null;
+       }
+       
+       @Override
+       public String generateTitle() {
+               return getTitleCache();
+       }
+       
+       /*
+        * (non-Javadoc)
+        * @see eu.etaxonomy.cdm.model.common.IdentifiableEntity#setTitleCache(java.lang.String)
+        */
+       @Override
+       public void setTitleCache(String titleCache) {
+               addTitle(LanguageString.NewInstance(titleCache, Language.DEFAULT()));
+       }
+       

 }
\ No newline at end of file
 }
\ No newline at end of file