merged 1.1 branch into head

[mir.git] / source / org / codecoop / mir / core / model / TypedCategory.java

diff --git a/source/org/codecoop/mir/core/model/TypedCategory.java b/source/org/codecoop/mir/core/model/TypedCategory.java
deleted file mode 100755 (executable)
index c605e9f..0000000
--- a/source/org/codecoop/mir/core/model/TypedCategory.java
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * $Id: TypedCategory.java,v 1.1 2004/11/06 16:20:48 idfx Exp $
- * 
- * Copyright (C) 2001, 2002, 2003, 2004 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 org.codecoop.mir.core.model;
-
-import java.io.Serializable;
-
-import org.apache.commons.lang.builder.ToStringBuilder;
-import org.apache.commons.lang.builder.ToStringStyle;
-
-/**
- * TypedCategory
- * @author idefix
- * @version $Revision: 1.1 $
- */
-public class TypedCategory implements Serializable {
-  private ArticleType _articleType;
-  private Category _category;
-  
-  private transient int hashCode;
-  
-  /**
-   * @return Returns the articleType.
-   */
-  public ArticleType getArticleType() {
-    return _articleType;
-  }
-  
-  /**
-   * @param articleType The articleType to set.
-   */
-  public void setArticleType(ArticleType articleType) {
-    _articleType = articleType;
-  }
-  
-  /**
-   * @return Returns the category.
-   */
-  public Category getCategory() {
-    return _category;
-  }
-  
-  /**
-   * @param category The category to set.
-   */
-  public void setCategory(Category category) {
-    _category = category;
-  }
-    
-  /**
-   * 
-   */
-  public boolean equals(Object obj) {
-    if (null == obj) {
-      return false;
-    }
-    if (!(obj instanceof TypedCategory)) {
-      return false;
-    } else {
-      TypedCategory mObj = (TypedCategory) obj;
-      if ((null == this.getArticleType() || null == mObj.getArticleType()) 
-          && (null == this.getCategory() || null == mObj.getCategory())) {
-        return false;
-      } else {
-        return 
-          (this.getArticleType().equals(mObj.getArticleType()) 
-              & this.getCategory().equals(mObj.getCategory()));
-      }
-    }
-  }
-  
-  /**
-   * 
-   */
-  public int hashCode() {
-    if (Integer.MIN_VALUE == this.hashCode) {
-      if (null == this.getArticleType() || null == this.getCategory()){
-        return super.hashCode();
-      } else {
-        String hashStr = this.getClass().getName() + ":"
-            + this.getArticleType().hashCode()
-            + this.getCategory().hashCode();
-        this.hashCode = hashStr.hashCode();
-      }
-    }
-    return this.hashCode;
-  }
-  
-  /**
-   * 
-   */
-  public String toString() {
-    return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE)
-      .append("articleType", this.getArticleType())
-      .append("category", this.getCategory())
-      .toString();
-  }
-}