/ - Diff - EDIT - EDIT Project Management

+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     */
     package eu.etaxonomy.cdm.model.reference;
     import eu.etaxonomy.cdm.model.agent.TeamOrPersonBase;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.ArticleDefaultCacheStrategy;
     /**
      * This interface represents articles in a {@link IJournal journal}. An article is an independent
-...
      * </ul>
      */
     public interface IArticle extends ISection, IVolumeReference, INomenclaturalReference{
     	/**
     	 * Returns the series information for this article
     	 */
-...
     	 * @param series
     	 */
     	public void setSeriesPart(String series);
     	/**
     	 * Returns this articles journal.
     	 * @return
     	 */
     	public IJournal getInJournal();
     	/**
     	 * Sets this articles journal
     	 * Sets this articles journal
     	 * @param journal
     	 */
     	public void setInJournal(IJournal journal);
     	void setCacheStrategy(ArticleDefaultCacheStrategy cacheStrategy);
+    }

+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     */
     package eu.etaxonomy.cdm.model.reference;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.BookDefaultCacheStrategy;
     /**
      * This interface represents books. A book is a  {@link IPrintedUnitBase printed unit}
      * This interface represents books. A book is a  {@link IPrintedUnitBase printed unit}
      * usually published by a publishing company.
      * <P>
      * This class corresponds, according to the TDWG ontology, to the publication type
-...
      * </ul>
      */
     public interface IBook extends IPrintedUnitBase, INomenclaturalReference{
     	/**
     	 * Returns this books edition
     	 */
-...
     	 * @param edition
     	 */
     	public void setEdition(String edition);
     	/**
     	 * Returns this books isbn (international standard book number)
     	 */
     	public String getIsbn();
     	/**
     	 * Sets this books isbn (international standard book number)
     	 * @param isbn
     	 */
     	public void setIsbn(String isbn);
     	void setCacheStrategy(BookDefaultCacheStrategy cacheStrategy);
+    }

+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     */
     package eu.etaxonomy.cdm.model.reference;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.BookSectionDefaultCacheStrategy;
     /**
      * This interface represents isolated sections (parts or chapters) within a
      * This interface represents isolated sections (parts or chapters) within a
      * {@link IBook book} or {@link IProceedings proceedings}.
      * <P>
      * This class corresponds, according to the TDWG ontology, to the publication type
-...
     	 * @return
     	 */
     	public IBook getInBook();
     	/**
     	 * Sets this book sections book.
     	 * @param book
     	 */
     	public void setInBook (IBook book);
     	void setCacheStrategy(BookSectionDefaultCacheStrategy cacheStratefy);
+    }

+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     */
     package eu.etaxonomy.cdm.model.reference;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.GenericDefaultCacheStrategy;
     /**
      * This interface represents all references which cannot be clearly assigned to a
      * particular {@link StrictReferenceBase reference} subclass. Therefore attributes which are
-...
     	 * Returns the editor of this generic reference
     	 */
     	public String getEditor();
     	/**
     	 * Sets the editor for this generic reference
     	 * @param editor
     	 */
     	public void setEditor(String editor);
     	/**
     	 * Returns the series of this generic reference
     	 */
     	public String getSeriesPart();
     	/**
     	 * Sets the series for this generic reference
     	 * @param series
     	 */
     	public void setSeriesPart(String series);
     	/**
     	 * Returns the pages (page span this reference covers in its in-reference)
     	 * Returns the pages (page span this reference covers in its in-reference)
     	 */
     	public String getPages();
     	/**
     	 * Sets the pages (page span this reference covers in its in-reference)
     	 * Sets the pages (page span this reference covers in its in-reference)
     	 * @param pages
     	 */
     	public void setPages(String pages);
-...
     	 * Returns the inreference of this generic reference
     	 */
     	public IGeneric getInReference();
     	/**
     	 * Sets the inreference.
     	 * @param inReference
     	 */
     	public void setInReference(Reference inReference);
     	void setCacheStrategy(GenericDefaultCacheStrategy cacheStratefy);
+    }

+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     */
     package eu.etaxonomy.cdm.model.reference;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.JournalDefaultCacheStrategy;
     /**
      * This interface represents journals. A journal is a periodical
      * This interface represents journals. A journal is a periodical
      * {@link IPublicationBase publication} containing several {@link IArticle articles}.
      * <P>
      * This class corresponds, according to the TDWG ontology, to the publication type
-...
     	 * Returns the ISSN (International Standard Serial Number)
     	 */
     	public String getIssn();
     	/**
     	 * Sets the ISSN (International Standard Serial Number)
     	 * @param issn
     	 */
     	public void setIssn(String issn);
     	void setCacheStrategy(JournalDefaultCacheStrategy cacheStrategy);
+    }

     /**
     * Copyright (C) 2007 EDIT
     * European Distributed Institute of Taxonomy
     * European Distributed Institute of Taxonomy
     * http://www.e-taxonomy.eu
+    *
+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
-...
     package eu.etaxonomy.cdm.model.reference;
     import eu.etaxonomy.cdm.model.common.IIdentifiableEntity;
     import eu.etaxonomy.cdm.model.common.TimePeriod;
     import eu.etaxonomy.cdm.model.name.TaxonNameBase;
      /**
      * Interface providing methods for nomenclatural references.
+     *
      * Interface providing methods for nomenclatural references.
+     *
      * @author m.doering
      * @created 08-Nov-2007 13:06:29
      */
     public interface INomenclaturalReference extends IReference{
     public interface INomenclaturalReference  extends IReference{
     	public final String MICRO_REFERENCE_TOKEN = "@@MicroReference";
     	/**
     	 * Returns a formatted string containing the reference citation excluding
     	 * authors but including the details as used in a {@link TaxonNameBase taxon name}.
     	 */
     	public String getNomenclaturalCitation(String  microReference);
          * Returns the citation string including the details (micro reference) information
          * from {@link TaxonNameBase taxon name}.
          * E.g. if the references title cache is <i>L., Sp. Pl. 3. 1757</i> the nomenclatural citation
          * may be something like <i>L., Sp. Pl. 3: 45. 1757</i>
+         *
          * @param microReference the detail, e.g. a page number, a figure, ...
          * @return String
          */
         public String getNomenclaturalCitation(String microReference);
     	/**
     	 * Returns a string representation for the year of publication / creation
-...
     	 */
     	public String getYear();
     	public void setDatePublished(TimePeriod datePublished);
     	/**
     	 * Returns the cached value for the abbreviated representation of this reference.
     	 * The abbreviated representation will normally use the {@link #getAbbrevTitle()
     	 * The abbreviated representation will normally use the {@link #getAbbrevTitle()
     	 * abbreviated title } instead of the {@link Reference#getTitle() full title}.
     	 * The cache may be protected.
     	 * @see #getAbbrevTitle()
-...
     	 * @see #isProtectedAbbrevTitleCache()
     	 * @return the abbreviated representation of this reference
     	 */
     	//TODO discuss if we move all the abbreviated title methods to another interface, e.g. IReference
     	//TODO discuss if we move all the abbreviated title methods to another interface, e.g. IReference
     	public String getAbbrevTitleCache();
     	/**
     	 * Sets the {@link #getAbbrevTitleCache() abbreviated title cache}
+    	 *
+    	 *
     	 * @param abbrevTitleCache
     	 * @deprecated this method exists only for compliance with the java bean standard.
     	 * It usually has little effect as it will not protect the cache.
     	 * It usually has little effect as it will not protect the cache.
     	 * Use {@link #setAbbrevTitleCache(String, boolean)} instead to protect the cache.
     	 */
     	public void setAbbrevTitleCache(String abbrevTitleCache);
     	@Deprecated
         public void setAbbrevTitleCache(String abbrevTitleCache);
     	/**
     	 * Sets the {@link #getAbbrevTitleCache() abbreviated title cache}.
+    	 *
+    	 *
     	 * @param abbrevTitleCache
     	 * @param isProtected wether or not the cache should be protected. Usually one may
     	 * want to set isProtected to <code>true</code>
     	 */
     	public void setAbbrevTitleCache(String abbrevTitleCache, boolean isProtected);
     	/**
     	 * If true the {@link #getAbbrevTitleCache() abbreviated title cache} is not computed
     	 * If true the {@link #getAbbrevTitleCache() abbreviated title cache} is not computed
     	 * on the fly but set by {@link #setAbbrevTitleCache(String)}.
     	 * @see IIdentifiableEntity#isProtectedTitleCache()
     	 * @return true if cache is protected
     	 */
     	public boolean isProtectedAbbrevTitleCache();
     	/**
     	 * Sets the protected flag for the {@link #getAbbrevTitleCache() abbreviated title cache}.
     	 * @param protectedAbbrevTitleCache
     	 */
     	public void setProtectedAbbrevTitleCache(boolean protectedAbbrevTitleCache);
     	/**
     	 * The abbreviated title is the short form for the titlle. It is usually used
     	 * as a representation of the title of references used in a nomenclatural
     	 * context.
     	 * @return
     	 */
     	public String getAbbrevTitle();
     	/**
     	 * Sets the {@link #getAbbrevTitle() abbreviated title}.
     	 * @param abbrevTitle
     	 */
     	public void setAbbrevTitle(String abbrevTitle);
+    }

+    *
     * The contents of this file are subject to the Mozilla Public License Version 1.1
     * See LICENSE.TXT at the top of this package for the full license terms.
     */
     */
     package eu.etaxonomy.cdm.model.reference;
-...
     /**
      * The upmost interface for references (information sources).
      * The upmost interface for references (information sources).
      * <P>
      * This class corresponds to: <ul>
      * <li> PublicationCitation according to the TDWG ontology
-...
      * <li> Reference according to the ABCD schema
      * </ul>
      */
     public interface IReference extends IIdentifiableEntity, IParsable, IMergable, IMatchable, Cloneable {
     public interface IReference
                 extends IIdentifiableEntity,
                        IParsable, IMergable, IMatchable, Cloneable {
     	/**
     	 * Returns the reference type
     	 */
     	public ReferenceType getType() ;
     	/**
     	 * Sets the reference type
     	 * @param type
     	 */
     	public void setType(ReferenceType type) ;
     	/**
     	 * Returns true if the type of the reference is the same as the passed parameter
     	 * @param type
     	 * @return boolean
     	 */
     	public boolean isOfType(ReferenceType type);
     	/**
     	 * Returns the references author(s)
     	 */
     	public TeamOrPersonBase getAuthorship();
     	/**
     	 * Sets the references author(s)
     	 */
     	public void setAuthorship(TeamOrPersonBase authorship);
     	/**
     	 * Returns the references title
     	 */
     	public String getTitle();
     	/**
     	 * Returns the references title
     	 */
     	public String getAbbrevTitle();
     	/**
     	 * Sets the references title
     	 * @param title
     	 */
     	public void setTitle(String title);
     	/**
     	 * Sets the references abbreviated title
     	 * @param title
     	 */
     	public void setAbbrevTitle(String abbrevTitle);
         /**
          * The abbreviated title is the short form for the titlle. It is usually used
          * as a representation of the title of references used in a nomenclatural
          * context.
          * @return
          */
         public String getAbbrevTitle();
         /**
          * Sets the {@link #getAbbrevTitle() abbreviated title}.
          * @param abbrevTitle
          */
         public void setAbbrevTitle(String abbrevTitle);
     	/**
     	 * Returns the date when the reference was published as a {@link TimePeriod}
     	 */
     	public TimePeriod getDatePublished();
     	/**
     	 * Sets the date when the reference was published.
     	 */
     	public void setDatePublished(TimePeriod datePublished);
         public void setDatePublished(TimePeriod datePublished);
     	/**
     	 * Returns the Uniform Resource Identifier (URI) corresponding to <i>this</i>
     	 * reference. An URI is a string of characters used to identify a resource
     	 * on the Internet.
+    	 *
+    	 *
     	 * @return  the URI of <i>this</i> reference
     	 */
     	public URI getUri();
-...
     	 */
     	public void setUri(URI uri);
     	/**
     	 * Returns the references abstract which is a summary of the content
     	 */
     	public String getReferenceAbstract();
     	/**
     	 * Sets the references abstract which is a summary of the content
     	 * @param referenceAbstract
     	 */
     	public void setReferenceAbstract(String referenceAbstract);
     	/**
     	 * Returns the citation string including the detail (micro reference) information.
     	 * E.g. if the references title cache is <i>L., Sp. Pl. 3. 1757</i> the nomenclatural citation
     	 * may be something like <i>L., Sp. Pl. 3: 45. 1757</i>
     	 * @param microReference the detail, e.g. a page number, a figure, ...
     	 * @return String
     	 */
     	public String getNomenclaturalCitation(String microReference);
     	/**
     	 * Sets the cache strategy for this reference
     	 * @param cacheStrategy
     	 */
     	void setCacheStrategy(IReferenceCacheStrategy cacheStrategy);
         /**
          * @param defaultStrategy
          */
         public void setCacheStrategy(IReferenceCacheStrategy defaultStrategy);
     	/**
     	 * @see Cloneable
     	 * @return

     import eu.etaxonomy.cdm.strategy.cache.reference.INomenclaturalReferenceCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.IReferenceCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.NewDefaultReferenceCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.ArticleDefaultCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.BookDefaultCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.BookSectionDefaultCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.GenericDefaultCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.JournalDefaultCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.ReferenceDefaultCacheStrategy;
     import eu.etaxonomy.cdm.strategy.match.Match;
     import eu.etaxonomy.cdm.strategy.match.MatchMode;
     import eu.etaxonomy.cdm.strategy.merge.Merge;
-...
     import eu.etaxonomy.cdm.validation.annotation.ReferenceCheck;
     /**
      * The upmost (abstract) class for references (information sources).
      * The class for references (information sources). Originally
      * an abstract class with many subclasses. Not it is only
      * one class implementing many interfaces for safe use.
      * <P>
      * This class corresponds to: <ul>
      * <li> PublicationCitation according to the TDWG ontology
-...
     @InReference(groups=Level3.class)
     @NoRecursiveInReference(groups=Level3.class)  //may become Level1 in future  #
     public class Reference
     //        <S extends IReferenceBaseCacheStrategy>
             extends IdentifiableMediaEntity<IReferenceCacheStrategy>
             implements INomenclaturalReference, IArticle, IBook, IPatent, IDatabase, IJournal, IBookSection,ICdDvd,IGeneric,IInProceedings, IProceedings, IPrintSeries, IReport, IThesis,IWebPage, IPersonalCommunication, IReference, Cloneable {
             implements IArticle, IBook, IPatent, IDatabase, IJournal, IBookSection,ICdDvd,
                        IGeneric,IInProceedings, IProceedings, IPrintSeries, IReport,
                        IThesis,IWebPage, IPersonalCommunication,
                        INomenclaturalReference, IReference,
                        Cloneable {
         private static final long serialVersionUID = -2034764545042691295L;
     	private static final Logger logger = Logger.getLogger(Reference.class);
-...
     		if (protectedAbbrevTitleCache){
                 return this.abbrevTitleCache;
+            }
             // is title dirty, i.e. equal NULL?
             // is reference dirty, i.e. equal NULL?
             if (abbrevTitleCache == null){
                 this.abbrevTitleCache = generateAbbrevTitle();
                 this.abbrevTitleCache = getTruncatedCache(this.abbrevTitleCache) ;
-...
     	@Override
         @Transient
     	public String getNomenclaturalCitation(String microReference) {
         public String getNomenclaturalCitation(String microReference) {
     		rectifyCacheStrategy();
     		String typeName = this.getType()== null ? "(no type defined)" : this.getType().getMessage();
     		if (getCacheStrategy() == null){
     			logger.warn("No CacheStrategy defined for "+ typeName + ": " + this.getUuid());
     			return null;
     		}else{
     			if (getCacheStrategy() instanceof INomenclaturalReferenceCacheStrategy){
     		    if (getCacheStrategy() instanceof INomenclaturalReferenceCacheStrategy){
     				return ((INomenclaturalReferenceCacheStrategy)cacheStrategy).getNomenclaturalCitation(this, microReference);
     			}else {
     				logger.warn("No INomenclaturalReferenceCacheStrategy defined for "+ typeName + ": " + this.getUuid());
-...
+    	}
     	@Override
         public void setCacheStrategy(ArticleDefaultCacheStrategy cacheStrategy) {
     		this.cacheStrategy = cacheStrategy;
+    	}
     	@Override
         public void setCacheStrategy(BookDefaultCacheStrategy cacheStrategy) {
     		this.cacheStrategy = cacheStrategy;
+    	}
     	@Override
         public void setCacheStrategy(JournalDefaultCacheStrategy cacheStrategy) {
     		this.cacheStrategy = cacheStrategy;
+    	}
     	@Override
         public void setCacheStrategy(BookSectionDefaultCacheStrategy cacheStrategy) {
     		this.cacheStrategy = cacheStrategy;
+    	}
     	@Override
         public void setCacheStrategy(GenericDefaultCacheStrategy cacheStrategy) {
     		this.cacheStrategy = cacheStrategy;
+    	}
     	public void setCacheStrategy(ReferenceDefaultCacheStrategy cacheStrategy) {
     		this.cacheStrategy = cacheStrategy;
+    	}

     import eu.etaxonomy.cdm.model.common.EnumeratedTermVoc;
     import eu.etaxonomy.cdm.model.common.IEnumTerm;
     import eu.etaxonomy.cdm.model.common.Language;
     import eu.etaxonomy.cdm.strategy.cache.reference.INomenclaturalReferenceCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.IReferenceCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.NewDefaultReferenceCacheStrategy;
     import eu.etaxonomy.cdm.strategy.cache.reference.old.ArticleDefaultCacheStrategy;
-...
+    	}
     	public IReferenceCacheStrategy getCacheStrategy(){
     	public INomenclaturalReferenceCacheStrategy getCacheStrategy(){
     //		if (true){
     		    return NewDefaultReferenceCacheStrategy.NewInstance();
     //		}

     import eu.etaxonomy.cdm.model.name.Rank;
     import eu.etaxonomy.cdm.model.name.TaxonNameBase;
     import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
     import eu.etaxonomy.cdm.model.reference.Reference;
     import eu.etaxonomy.cdm.strategy.cache.HTMLTagRules;
     import eu.etaxonomy.cdm.strategy.cache.TagEnum;
     import eu.etaxonomy.cdm.strategy.cache.TaggedCacheHelper;
-...
             //reference
             String microReference = nonViralName.getNomenclaturalMicroReference();
             INomenclaturalReference ref = nonViralName.getNomenclaturalReference();
             String referenceBaseCache = null;
             String referenceCache = null;
             if (ref != null){
                 INomenclaturalReference nomenclaturalReference = HibernateProxyHelper.deproxy(ref, INomenclaturalReference.class);
                 nomenclaturalReference.setCacheStrategy(nomenclaturalReference.getType().getCacheStrategy());
                 referenceBaseCache = nomenclaturalReference.getNomenclaturalCitation(microReference);
                 Reference reference = HibernateProxyHelper.deproxy(ref, Reference.class);
                 //FIXME #5833 not needed anymore
                 reference.setCacheStrategy(reference.getType().getCacheStrategy());
                 referenceCache = reference.getNomenclaturalCitation(microReference);
+            }
                 //add to tags
             if (StringUtils.isNotBlank(referenceBaseCache)){
                 if (! referenceBaseCache.trim().startsWith("in ")){
             if (StringUtils.isNotBlank(referenceCache)){
                 if (! referenceCache.trim().startsWith("in ")){
                     String refConcat = ", ";
                     tags.add(new TaggedText(TagEnum.separator, refConcat));
+                }
                 tags.add(new TaggedText(TagEnum.reference, referenceBaseCache));
                 tags.add(new TaggedText(TagEnum.reference, referenceCache));
+            }
             //nomenclatural status

     // ********************************** WEB PAGE ********************************************/
         @Test
     //    @Ignore //under development
         @Ignore //under development
         public void testWebPageGetTitleCache(){
             webPage1.setTitle("Flora of Israel Online");
             webPage1.setUri(URI.create("http://flora.huji.ac.il"));

     import eu.etaxonomy.cdm.model.reference.IBookSection;
     import eu.etaxonomy.cdm.model.reference.IJournal;
     import eu.etaxonomy.cdm.model.reference.INomenclaturalReference;
     import eu.etaxonomy.cdm.model.reference.IReference;
     import eu.etaxonomy.cdm.model.reference.IVolumeReference;
     import eu.etaxonomy.cdm.model.reference.Reference;
     import eu.etaxonomy.cdm.model.reference.ReferenceType;
-...
             assertFalse(multipleAuthorRefName.hasProblem());
             assertTrue("Combination author should be a person", multipleAuthorRefName.getCombinationAuthorship() instanceof Person);
             assertEquals("Combination author should be L.", "L.", ((Person)multipleAuthorRefName.getCombinationAuthorship()).getNomenclaturalTitle());
             INomenclaturalReference nomRef = multipleAuthorRefName.getNomenclaturalReference();
             IReference nomRef = multipleAuthorRefName.getNomenclaturalReference();
             Assert.assertNotNull("nomRef must have inRef", ((Reference)nomRef).getInReference());
             Reference inRef = ((Reference)nomRef).getInReference();
             String title = inRef.getTitle();

Project

General

Profile

EDIT

Revision bc556475

Added by Andreas Müller almost 8 years ago