From: idfx Date: Tue, 30 Sep 2003 19:26:01 +0000 (+0000) Subject: some corrections and parent-child-relation of topic X-Git-Tag: BEFORE_MERGE_1_1~50 X-Git-Url: http://erislabs.net/gitweb/?p=mir.git;a=commitdiff_plain;h=2ea0a55aacf85d6df9154c3af2e8ee321df0e873 some corrections and parent-child-relation of topic --- diff --git a/source/mir/core/model/Audio.hbm.xml b/source/mir/core/model/Audio.hbm.xml index 8592a017..b4e08d50 100755 --- a/source/mir/core/model/Audio.hbm.xml +++ b/source/mir/core/model/Audio.hbm.xml @@ -85,19 +85,13 @@ name="description" type="java.lang.String" column="description" - length="-1" - /> - - - comment_status_seq + comment_status_id_seq - - - - - - - - - rights_id_seq + media_id_seq diff --git a/source/mir/core/model/Topic.hbm.xml b/source/mir/core/model/Topic.hbm.xml index cb0d9f29..c2e0c68a 100755 --- a/source/mir/core/model/Topic.hbm.xml +++ b/source/mir/core/model/Topic.hbm.xml @@ -20,6 +20,7 @@ name="id" type="int" column="id" + unsaved-value="0" > topic_id_seq @@ -36,7 +37,7 @@ name="description" type="java.lang.String" column="description" - length="-1" + sql-type="text" /> - - - - - - diff --git a/source/mir/core/model/Topic.java b/source/mir/core/model/Topic.java index e6cbf74f..3ab82491 100755 --- a/source/mir/core/model/Topic.java +++ b/source/mir/core/model/Topic.java @@ -1,5 +1,5 @@ /* - * Topic.java + * TopicStub.java created on 30.08.2003 * * Copyright (C) 2001, 2002, 2003 The Mir-coders group * @@ -39,51 +39,68 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; /** - * - * Topic + * TopicStub * @author idefix - * @version $Id: Topic.java,v 1.3 2003/09/05 20:23:59 idfx Exp $ + * @version $Id: Topic.java,v 1.4 2003/09/30 19:26:02 idfx Exp $ */ -public class Topic extends TopicStub implements Serializable { - - private Set content; +public class Topic extends TopicCore implements Serializable { + + private Set childTopics; + private Topic parentTopic; + + /** + * + */ + public Topic() { + super(); + } - /** default constructor */ - public Topic() { - super(); - } - /** - * @return - */ - public Set getContent() { - return content; - } + /** + * @return + */ + public Set getChildTopics() { + return childTopics; + } - /** - * @param content - */ - public void setContent(Set content) { - this.content = content; - } + /** + * @param set + */ + public void setChildTopics(Set set) { + childTopics = set; + } + + /** + * @return + */ + public Topic getParentTopic() { + return parentTopic; + } - public String toString() { - return new ToStringBuilder(this) - .append("id", getId()) - .toString(); - } + /** + * @param topic + */ + public void setParentTopic(Topic topic) { + parentTopic = topic; + } - public boolean equals(Object other) { - if ( !(other instanceof Topic) ) return false; - Topic castOther = (Topic) other; - return new EqualsBuilder() - .append(this.getId(), castOther.getId()) - .isEquals(); - } + public String toString() { + return new ToStringBuilder(this) + .append("id", getId()) + .append("title", getTitle()) + .toString(); + } - public int hashCode() { - return new HashCodeBuilder() - .append(getId()) - .toHashCode(); - } + public boolean equals(Object other) { + 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(); + } } diff --git a/source/mir/core/model/TopicStub.java b/source/mir/core/model/TopicStub.java deleted file mode 100755 index cc9c1c89..00000000 --- a/source/mir/core/model/TopicStub.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * TopicStub.java created on 30.08.2003 - * - * Copyright (C) 2001, 2002, 2003 The Mir-coders group - * - * This file is part of Mir. - * - * Mir is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * Mir is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with Mir; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * In addition, as a special exception, The Mir-coders gives permission to link - * the code of this program with any library licensed under the Apache Software License, - * The Sun (tm) Java Advanced Imaging library (JAI), The Sun JIMI library - * (or with modified versions of the above that use the same license as the above), - * and distribute linked combinations including the two. You must obey the - * GNU General Public License in all respects for all of the code used other than - * the above mentioned libraries. If you modify this file, you may extend this - * exception to your version of the file, but you are not obligated to do so. - * If you do not wish to do so, delete this exception statement from your version. - */ -package mir.core.model; - -import java.io.Serializable; - -import org.apache.commons.lang.builder.EqualsBuilder; -import org.apache.commons.lang.builder.HashCodeBuilder; -import org.apache.commons.lang.builder.ToStringBuilder; - -/** - * TopicStub - * @author idefix - * @version $Id: TopicStub.java,v 1.1 2003/09/05 20:23:59 idfx Exp $ - */ -public class TopicStub 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; - - /** nullable persistent field */ - private mir.core.model.Topic parentTopic; - - /** - * - */ - public TopicStub() { - super(); - } - - public java.lang.Integer getId() { - return this.id; - } - - public void setId(java.lang.Integer id) { - this.id = id; - } - - public java.lang.String getTitle() { - return this.title; - } - - public void setTitle(java.lang.String title) { - this.title = title; - } - - public java.lang.String getDescription() { - return this.description; - } - - public void setDescription(java.lang.String description) { - this.description = description; - } - - public java.lang.String getFilename() { - return this.filename; - } - - public void setFilename(java.lang.String filename) { - this.filename = filename; - } - - public java.lang.String getMainUrl() { - return this.mainUrl; - } - - public void setMainUrl(java.lang.String mainUrl) { - this.mainUrl = mainUrl; - } - - public java.lang.String getArchivUrl() { - return this.archivUrl; - } - - public void setArchivUrl(java.lang.String archivUrl) { - this.archivUrl = archivUrl; - } - - public mir.core.model.Topic getParentTopic() { - return this.parentTopic; - } - - public void setParentTopic(mir.core.model.Topic parentTopic) { - this.parentTopic = parentTopic; - } - - public String toString() { - return new ToStringBuilder(this) - .append("id", getId()) - .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(); - } - - public int hashCode() { - return new HashCodeBuilder() - .append(getId()) - .toHashCode(); - } - - -} diff --git a/source/mir/core/model/UploadedMedia.hbm.xml b/source/mir/core/model/UploadedMedia.hbm.xml index 4944a742..aaedfed2 100755 --- a/source/mir/core/model/UploadedMedia.hbm.xml +++ b/source/mir/core/model/UploadedMedia.hbm.xml @@ -30,19 +30,19 @@ type="java.lang.String" column="title" not-null="true" - length="80" + length="255" /> - - - -