From b8076596218ff8eeaad5869ea976ade829f13d9b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20M=C3=BCller?= <a.mueller@bgbm.org>
Date: Tue, 22 Jun 2010 15:28:25 +0000
Subject: [PATCH] change inReference interfaces

---
 .../cdm/model/reference/IArticle.java         | 30 ++++++++++++++++++-
 .../cdm/model/reference/IBookSection.java     | 27 ++++++++++++++++-
 .../cdm/model/reference/IPrintedUnitBase.java | 28 ++++++++++++++++-
 3 files changed, 82 insertions(+), 3 deletions(-)

diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IArticle.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IArticle.java
index d7fef76356..a63edb38cb 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IArticle.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IArticle.java
@@ -11,15 +11,43 @@ package eu.etaxonomy.cdm.model.reference;
 
 import eu.etaxonomy.cdm.strategy.cache.reference.ArticleDefaultCacheStrategy;
 
-public interface IArticle extends IVolumeReference, INomenclaturalReference{
+public interface IArticle extends IVolumeReference, IReferenceBase,  INomenclaturalReference{
 	
 	public void setSeries(String series);
 	
 	public String getSeries();
 
+	
+	/**
+	 * Same as {@link #getJournal()}.
+	 * @deprecated use {@link #getJournal()} instead
+	 * @return
+	 */
+	@Deprecated
 	public IJournal getInJournal();
 	
+	/**
+	 * Same as {@link #setJournal(IJournal)}
+	 * @deprecated use {@link #setJournal(IJournal)} instead
+	 * @param journal
+	 */
+	@Deprecated()
 	public void setInJournal(IJournal journal);
+
+	
+	/**
+	 * Returns the articles journal.
+	 * @return
+	 */
+	public IJournal getJournal();
+	
+	
+	/**
+	 * Sets the articles journal 
+	 * @param journal
+	 */
+	public void setJournal(IJournal journal);
+
 	
 	void setCacheStrategy(ArticleDefaultCacheStrategy cacheStrategy);
 }
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IBookSection.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IBookSection.java
index a9e48c6dd3..9803ddb4ef 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IBookSection.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IBookSection.java
@@ -10,15 +10,40 @@
 package eu.etaxonomy.cdm.model.reference;
 
 import eu.etaxonomy.cdm.strategy.cache.reference.BookSectionDefaultCacheStrategy;
-import eu.etaxonomy.cdm.strategy.cache.reference.GenericDefaultCacheStrategy;
 
 
 public interface IBookSection extends ISectionBase, INomenclaturalReference{
 
+	/**
+	 * Same as {@link #getBook()}.
+	 * @deprecated use {@link #getBook()} instead
+	 * @return
+	 */
+	@Deprecated
 	public IBook getInBook();
 	
+	/**
+	 * Same as {@link #setBook(IBook)}
+	 * @deprecated use {@link #setBook(IBook)} instead
+	 * @param book
+	 */
+	@Deprecated
 	public void setInBook (IBook book);
 	
+	/**
+	 * Returns the book sections book
+	 * @return
+	 */
+	public IBook getBook();
+	
+	/**
+	 * Sets the book sections book.
+	 * @param book
+	 */
+	public void setBook (IBook book);
+
+	
+	
 	void setCacheStrategy(BookSectionDefaultCacheStrategy cacheStratefy);
 
 }
diff --git a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IPrintedUnitBase.java b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IPrintedUnitBase.java
index 68d903ee8f..67bc490480 100644
--- a/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IPrintedUnitBase.java
+++ b/cdmlib-model/src/main/java/eu/etaxonomy/cdm/model/reference/IPrintedUnitBase.java
@@ -12,10 +12,36 @@ package eu.etaxonomy.cdm.model.reference;
 
 public interface IPrintedUnitBase extends IPublicationBase, IVolumeReference {
 
+	/**
+	 * Same as {@link #getSeries()}
+	 * @deprecated use {@link #getSeries()} instead
+	 * @return
+	 */
+	@Deprecated
 	public IPrintSeries getInSeries();
 	
-	public void setInSeries(IPrintSeries inSeries);
+	/**
+	 * Same as {@link #setInSeries(IPrintSeries)}
+	 * @deprecated use {@link #setInSeries(IPrintSeries)} instead
+	 * @param series
+	 */
+	@Deprecated
+	public void setInSeries(IPrintSeries series);
 
+	
+	/**
+	 * Returns the print series of this printed unit
+	 * @return
+	 */
+	public IPrintSeries getSeries();
+	
+	/**
+	 * Sets the pritn series of this printed unit
+	 * @param series
+	 */
+	public void setSeries(IPrintSeries series);
+
+	
 	public String getEditor();
 	
 	public void setEditor(String editor);
-- 
2.34.1