some small corrections, codecleaning

diff --git a/source/mir/core/model/Topic.java b/source/mir/core/model/Topic.java
index 3ab8249..872bae8 100755 (executable)
--- a/source/mir/core/model/Topic.java
+++ b/source/mir/core/model/Topic.java
@@ -41,10 +41,21 @@ import org.apache.commons.lang.builder.ToStringBuilder;
 /**
  * TopicStub
  * @author idefix
- * @version $Id: Topic.java,v 1.4 2003/09/30 19:26:02 idfx Exp $
+ * @version $Id: Topic.java,v 1.5 2003/09/30 19:52:03 idfx Exp $
  */
-public class Topic extends TopicCore implements Serializable {
-       
+public class Topic implements Serializable {
+       /** identifier field */
+       private Integer id;
+       /** persistent field */
+       private String title;
+       /** nullable persistent field */
+       private String description;
+       /** persistent field */
+       private String filename;
+       /** nullable persistent field */
+       private String mainUrl;
+       /** nullable persistent field */
+       private String archivUrl;
        private Set childTopics;
        private Topic parentTopic;
 
@@ -58,6 +69,90 @@ public class Topic extends TopicCore implements Serializable {
        /**
         * @return
         */
+       public String getArchivUrl() {
+               return archivUrl;
+       }
+
+       /**
+        * @return
+        */
+       public String getDescription() {
+               return description;
+       }
+
+       /**
+        * @return
+        */
+       public String getFilename() {
+               return filename;
+       }
+
+       /**
+        * @return
+        */
+       public Integer getId() {
+               return id;
+       }
+
+       /**
+        * @return
+        */
+       public String getMainUrl() {
+               return mainUrl;
+       }
+
+       /**
+        * @return
+        */
+       public String getTitle() {
+               return title;
+       }
+
+       /**
+        * @param string
+        */
+       public void setArchivUrl(String string) {
+               archivUrl = string;
+       }
+
+       /**
+        * @param string
+        */
+       public void setDescription(String string) {
+               description = string;
+       }
+
+       /**
+        * @param string
+        */
+       public void setFilename(String string) {
+               filename = string;
+       }
+
+       /**
+        * @param integer
+        */
+       public void setId(Integer integer) {
+               id = integer;
+       }
+
+       /**
+        * @param string
+        */
+       public void setMainUrl(String string) {
+               mainUrl = string;
+       }
+
+       /**
+        * @param string
+        */
+       public void setTitle(String string) {
+               title = string;
+       }
+
+       /**
+        * @return
+        */
        public Set getChildTopics() {
                return childTopics;
        }
@@ -68,7 +163,7 @@ public class Topic extends TopicCore implements Serializable {
        public void setChildTopics(Set set) {
                childTopics = set;
        }
-       
+
        /**
         * @return
         */
@@ -84,23 +179,22 @@ public class Topic extends TopicCore implements Serializable {
        }
 
        public String toString() {
-                       return new ToStringBuilder(this)
-                                       .append("id", getId())
-                                       .append("title", getTitle())
-                                       .toString();
+               return new ToStringBuilder(this)
+                       .append("id", getId())
+                       .append("title", getTitle())
+                       .toString();
        }
 
        public boolean equals(Object other) {
-                       if ( !(other instanceof Topic) ) return false;
-                       Topic castOther = (Topic) other;
-                       return new EqualsBuilder()
-                                       .append(this.getId(), castOther.getId())
-                                       .isEquals();
+               if (!(other instanceof Topic))
+                       return false;
+               Topic castOther = (Topic) other;
+               return new EqualsBuilder()
+                       .append(this.getId(), castOther.getId())
+                       .isEquals();
        }
 
        public int hashCode() {
-                       return new HashCodeBuilder()
-                                       .append(getId())
-                                       .toHashCode();
+               return new HashCodeBuilder().append(getId()).toHashCode();
        }
 }