From 142b5e104cd306cf202796c57a1c2616c7d2f2d1 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Fri, 9 Jul 2010 13:37:29 +0000
Subject: [PATCH] bugfixes for ReferenceFactory

---
 .../cdm/model/reference/ReferenceFactory.java | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceFactory.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceFactory.java
index abb04c7336..04ad690e1b 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceFactory.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/ReferenceFactory.java
@@ -9,6 +9,8 @@
 
 package eu.etaxonomy.cdm.model.reference;
 
+import org.apache.log4j.Logger;
+
 import eu.etaxonomy.cdm.model.agent.Person;
 import eu.etaxonomy.cdm.model.common.TimePeriod;
 import eu.etaxonomy.cdm.strategy.cache.reference.ArticleDefaultCacheStrategy;
@@ -21,6 +23,7 @@ import eu.etaxonomy.cdm.strategy.cache.reference.ReferenceBaseDefaultCacheStrate
 import eu.etaxonomy.cdm.strategy.cache.reference.ThesisDefaultCacheStrategy;
 
 public class ReferenceFactory {
+	private static final Logger logger = Logger.getLogger(ReferenceFactory.class);
 	
 	
 	/**
@@ -62,7 +65,7 @@ public class ReferenceFactory {
 	}
 	
 	public static ReferenceBase newProceedings(){
-		ReferenceBase<ReferenceBaseDefaultCacheStrategy<ReferenceBase>> proceedings = new ReferenceBase<ReferenceBaseDefaultCacheStrategy<ReferenceBase>>(ReferenceType.InProceedings);
+		ReferenceBase<ReferenceBaseDefaultCacheStrategy<ReferenceBase>> proceedings = new ReferenceBase<ReferenceBaseDefaultCacheStrategy<ReferenceBase>>(ReferenceType.Proceedings);
 		proceedings.setCacheStrategy(ReferenceType.Proceedings.getCacheStrategy());
 		return proceedings;
 	}
@@ -151,8 +154,16 @@ public class ReferenceFactory {
 		return article;
 	}
 
+	/**
+	 * Returns a new reference for the according reference type. If reference type is <code>null</code>,
+	 * <code>null</code> is returned.
+	 * @param referenceType
+	 * @return
+	 */
 	public static ReferenceBase newReference(ReferenceType referenceType) {
-		
+		if (referenceType == null){
+			return null;
+		}
 		switch(referenceType){
 			case Article:
 				return newArticle();
@@ -180,7 +191,14 @@ public class ReferenceFactory {
 				return newReport();
 			case Thesis:
 				return newThesis();
+			case WebPage:
+				return newWebPage();
+			case Book:
+				return newBook();
+			case Generic:
+				return newGeneric();
 			default:
+				logger.warn("Unknown reference type " + referenceType.getMessage() + ". Created generic reference instead.");
 				return newGeneric();	
 		}
 	}
-- 
2.34.1