change inReference interfaces

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 d7fef7635645b08909cf496f2597a96455ac6385..a63edb38cba187bf973f140a2ea39543dc601717 100644 (file)
--- 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;
 \r
 import eu.etaxonomy.cdm.strategy.cache.reference.ArticleDefaultCacheStrategy;\r
 \r
-public interface IArticle extends IVolumeReference, INomenclaturalReference{\r
+public interface IArticle extends IVolumeReference, IReferenceBase,  INomenclaturalReference{\r
        \r
        public void setSeries(String series);\r
        \r
        public String getSeries();\r
 \r
+       \r
+       /**\r
+        * Same as {@link #getJournal()}.\r
+        * @deprecated use {@link #getJournal()} instead\r
+        * @return\r
+        */\r
+       @Deprecated\r
        public IJournal getInJournal();\r
        \r
+       /**\r
+        * Same as {@link #setJournal(IJournal)}\r
+        * @deprecated use {@link #setJournal(IJournal)} instead\r
+        * @param journal\r
+        */\r
+       @Deprecated()\r
        public void setInJournal(IJournal journal);\r
+\r
+       \r
+       /**\r
+        * Returns the articles journal.\r
+        * @return\r
+        */\r
+       public IJournal getJournal();\r
+       \r
+       \r
+       /**\r
+        * Sets the articles journal \r
+        * @param journal\r
+        */\r
+       public void setJournal(IJournal journal);\r
+\r
        \r
        void setCacheStrategy(ArticleDefaultCacheStrategy cacheStrategy);\r
 }\r

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 a9e48c6dd37cc1fddff31bb9739ff570913e1fcc..9803ddb4efe1a0f583c2886fe829ec101afe6678 100644 (file)
--- 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;\r
 \r
 import eu.etaxonomy.cdm.strategy.cache.reference.BookSectionDefaultCacheStrategy;\r
-import eu.etaxonomy.cdm.strategy.cache.reference.GenericDefaultCacheStrategy;\r
 \r
 \r
 public interface IBookSection extends ISectionBase, INomenclaturalReference{\r
 \r
+       /**\r
+        * Same as {@link #getBook()}.\r
+        * @deprecated use {@link #getBook()} instead\r
+        * @return\r
+        */\r
+       @Deprecated\r
        public IBook getInBook();\r
        \r
+       /**\r
+        * Same as {@link #setBook(IBook)}\r
+        * @deprecated use {@link #setBook(IBook)} instead\r
+        * @param book\r
+        */\r
+       @Deprecated\r
        public void setInBook (IBook book);\r
        \r
+       /**\r
+        * Returns the book sections book\r
+        * @return\r
+        */\r
+       public IBook getBook();\r
+       \r
+       /**\r
+        * Sets the book sections book.\r
+        * @param book\r
+        */\r
+       public void setBook (IBook book);\r
+\r
+       \r
+       \r
        void setCacheStrategy(BookSectionDefaultCacheStrategy cacheStratefy);\r
 \r
 }\r

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 68d903ee8f0ea69dad14dcc59ba7f044052c00d8..67bc490480a2371907faee5a4ac8682db4eff63b 100644 (file)
--- 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;
 \r
 public interface IPrintedUnitBase extends IPublicationBase, IVolumeReference {\r
 \r
+       /**\r
+        * Same as {@link #getSeries()}\r
+        * @deprecated use {@link #getSeries()} instead\r
+        * @return\r
+        */\r
+       @Deprecated\r
        public IPrintSeries getInSeries();\r
        \r
-       public void setInSeries(IPrintSeries inSeries);\r
+       /**\r
+        * Same as {@link #setInSeries(IPrintSeries)}\r
+        * @deprecated use {@link #setInSeries(IPrintSeries)} instead\r
+        * @param series\r
+        */\r
+       @Deprecated\r
+       public void setInSeries(IPrintSeries series);\r
 \r
+       \r
+       /**\r
+        * Returns the print series of this printed unit\r
+        * @return\r
+        */\r
+       public IPrintSeries getSeries();\r
+       \r
+       /**\r
+        * Sets the pritn series of this printed unit\r
+        * @param series\r
+        */\r
+       public void setSeries(IPrintSeries series);\r
+\r
+       \r
        public String getEditor();\r
        \r
        public void setEditor(String editor);\r