[Jboss-svn-commits] JBL Code SVN: r4693 - in labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags: dal service

[<jbo...@li...>]

Author: adamw
Date: 2006-06-09 12:18:16 -0400 (Fri, 09 Jun 2006)
New Revision: 4693

Removed:
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/ShotokuTagEntity.java
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/WebsiteTagEntity.java
Modified:
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/TagEntity.java
   labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
Log:
http://jira.jboss.com/jira/browse/JBSHOTOKU-86


Deleted: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/ShotokuTagEntity.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/ShotokuTagEntity.java	2006-06-09 15:51:28 UTC (rev 4692)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/ShotokuTagEntity.java	2006-06-09 16:18:16 UTC (rev 4693)
@@ -1,25 +0,0 @@
-package org.jboss.shotoku.tags.dal;
-
-import org.jboss.shotoku.tags.AbstractTag;
-import org.jboss.shotoku.tags.ShotokuTag;
-import org.jboss.shotoku.tags.Tag;
-
-import javax.persistence.*;
-
-/**
- * @author Adam Warski (ad...@as...)
- */
-@Entity
-@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-@DiscriminatorColumn(discriminatorType = DiscriminatorType.STRING)
-@DiscriminatorValue("shotoku")
-public class ShotokuTagEntity extends TagEntity {
-    public ShotokuTagEntity() {
-
-    }
-
-    @Transient
-    public AbstractTag getTag() {
-        return new ShotokuTag(getName(), getAuthor(), getResourceId(), getData(), getDateCreated());
-    }
-}

Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/TagEntity.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/TagEntity.java	2006-06-09 15:51:28 UTC (rev 4692)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/TagEntity.java	2006-06-09 16:18:16 UTC (rev 4693)
@@ -1,6 +1,9 @@
 package org.jboss.shotoku.tags.dal;
 
 import org.jboss.shotoku.tags.AbstractTag;
+import org.jboss.shotoku.tags.ShotokuTag;
+import org.jboss.shotoku.tags.WebsiteTag;
+import org.jboss.shotoku.tags.tools.Constants;
 
 import javax.persistence.*;
 import java.util.Date;
@@ -11,14 +14,14 @@
  */
 @Entity
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-@DiscriminatorColumn(name = "type", discriminatorType = DiscriminatorType.STRING, length = 255)
 @Table(name = "ShotokuTags")
 @IdClass(IdEntity.class)
-public abstract class TagEntity implements Serializable {
+public class TagEntity implements Serializable {
     private String name;
     private String author;
     private String resourceId;
     private String data;
+    private String type;
 
     private Date dateCreated;
 
@@ -73,10 +76,28 @@
         this.dateCreated = dateCreated;
     }
 
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+
     /*
      * Other methods.
      */
 
     @Transient
-    public abstract AbstractTag getTag();
+    public AbstractTag getTag() {
+        if (Constants.SHOTOKU_TAG.equals(getType())) {
+            return new ShotokuTag(getName(), getAuthor(), getResourceId(),
+                    getData(), getDateCreated());
+        } else if (Constants.WEBSITE_TAG.equals(getType())) {
+            return new WebsiteTag(getName(), getAuthor(), getResourceId(),
+                    getData(), getDateCreated());
+        } else {
+            return null;
+        }
+    }
 }

Deleted: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/WebsiteTagEntity.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/WebsiteTagEntity.java	2006-06-09 15:51:28 UTC (rev 4692)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/dal/WebsiteTagEntity.java	2006-06-09 16:18:16 UTC (rev 4693)
@@ -1,25 +0,0 @@
-package org.jboss.shotoku.tags.dal;
-
-import org.jboss.shotoku.tags.AbstractTag;
-import org.jboss.shotoku.tags.WebsiteTag;
-import org.jboss.shotoku.tags.Tag;
-
-import javax.persistence.*;
-
-/**
- * @author Adam Warski (ad...@as...)
- */
-@Entity
-@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-@DiscriminatorColumn(discriminatorType = DiscriminatorType.STRING)
-@DiscriminatorValue("website")
-public class WebsiteTagEntity extends TagEntity {
-    public WebsiteTagEntity() {
-
-    }
-
-    @Transient
-    public AbstractTag getTag() {
-        return new WebsiteTag(getName(), getAuthor(), getResourceId(), getData(), getDateCreated());
-    }
-}

Modified: labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java
===================================================================
--- labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java	2006-06-09 15:51:28 UTC (rev 4692)
+++ labs/shotoku/trunk/shotoku-tags/src/java/org/jboss/shotoku/tags/service/TagServiceImpl.java	2006-06-09 16:18:16 UTC (rev 4693)
@@ -45,8 +45,6 @@
 import org.jboss.shotoku.tags.exceptions.TagAddException;
 import org.jboss.shotoku.tags.exceptions.TagDeleteException;
 import org.jboss.shotoku.tags.dal.TagEntity;
-import org.jboss.shotoku.tags.dal.ShotokuTagEntity;
-import org.jboss.shotoku.tags.dal.WebsiteTagEntity;
 
 /**
  * @author Adam Warski (ad...@as...)
@@ -148,20 +146,14 @@
     private EntityManager manager;
 
     private TagEntity getTagEntity(Tag t) {
-        TagEntity te = null;
-        if (org.jboss.shotoku.tags.tools.Constants.SHOTOKU_TAG.equals(t.getType())) {
-            te =  new ShotokuTagEntity();
-        } else if (org.jboss.shotoku.tags.tools.Constants.WEBSITE_TAG.equals(t.getType())) {
-            te =  new WebsiteTagEntity();
-        }
+        TagEntity te = new TagEntity();
 
-        if (te != null) {
-            te.setAuthor(t.getAuthor());
-            te.setData(t.getData());
-            te.setDateCreated(t.getDateCreated());
-            te.setName(t.getName());
-            te.setResourceId(t.getResourceId());
-        }
+        te.setAuthor(t.getAuthor());
+        te.setData(t.getData());
+        te.setDateCreated(t.getDateCreated());
+        te.setName(t.getName());
+        te.setResourceId(t.getResourceId());
+        te.setType(t.getType());
 
         return te;
     }