Changeset 226 for VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/Resource.java

Timestamp:

03/15/10 18:10:30 (14 years ago)

Author:

oschonef

Message:

• remove preliminary support for copied metadata

HEADS UP: internal XML format and database layout has changed!

File:

• VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/Resource.java (modified) (2 diffs)

VirtualCollectionRegistry/trunk/VirtualCollectionRegistry/src/main/java/eu/clarin/cmdi/virtualcollectionregistry/model/Resource.java

@@ -2 +2 @@
 
 import javax.persistence.Column;
-import javax.persistence.DiscriminatorColumn;
-import javax.persistence.DiscriminatorType;
 import javax.persistence.Entity;
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
-import javax.persistence.Inheritance;
-import javax.persistence.InheritanceType;
 import javax.persistence.Table;
 import javax.xml.bind.annotation.XmlAccessType;
 import javax.xml.bind.annotation.XmlAccessorType;
 import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSeeAlso;
+import javax.xml.bind.annotation.XmlType;
+
+import org.apache.commons.lang.builder.HashCodeBuilder;
 
 @Entity
 @Table(name = "resource")
-@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-@DiscriminatorColumn(discriminatorType=DiscriminatorType.STRING, length=1)
 @XmlAccessorType(XmlAccessType.NONE)
-@XmlSeeAlso({ ResourceProxy.class, ResourceMetadata.class })
-public abstract class Resource {
+@XmlType(propOrder = { "type", "ref" })
+public class Resource {
         @Id
         @GeneratedValue(strategy = GenerationType.AUTO)
         @Column(name = "id", nullable = false, updatable = false, insertable = true)
         private long id = -1;
+        @Column(name = "type", nullable = false)
+        @Enumerated(EnumType.ORDINAL)
+        private ResourceType type;
+        @Column(name = "ref", nullable = false)
+        private String ref;
 
-        protected Resource() {
+        private Resource() {
                 super();
+        }
+
+        public Resource(ResourceType type, String ref) {
+                this();
+                this.setType(type);
+                this.setRef(ref);
         }
 
@@ -42 +52 @@
                 return "r" + id;
         }
-        
-        public abstract ResourceType getType();
 
-        public abstract String getRef();
+        public void setType(ResourceType type) {
+                if (type == null) {
+                        throw new NullPointerException("type == null");
+                }
+                this.type = type;
+        }
 
-        abstract int getSignature();
+        @XmlElement(name = "ResourceType")
+        public ResourceType getType() {
+                return type;
+        }
 
-} // abstract class Resource
+        public void setRef(String ref) {
+                if (ref == null) {
+                        throw new NullPointerException("ref == null");
+                }
+                this.ref = ref;
+        }
+
+        @XmlElement(name = "ResourceRef")
+        public String getRef() {
+                return ref;
+        }
+
+        protected int getSignature() {
+                return new HashCodeBuilder(799, 51)
+                        .append(type)
+                        .append(ref)
+                        .toHashCode();
+        }
+
+} // class Resource